james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r1525515 [5/13] - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ioc/ cli...
Date Mon, 23 Sep 2013 07:04:13 GMT
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java Mon Sep 23 07:04:08 2013
@@ -19,11 +19,6 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.client.place.SettingPlace;
-
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 
 public interface HupaLayoutable extends Layoutable {
@@ -65,118 +60,4 @@ public interface HupaLayoutable extends 
 	AcceptsOneWidget getSearchBoxView();
 
 	AcceptsOneWidget getSettingNavView();
-<<<<<<< HEAD
-
-	void arrangeSettingLayout(SettingPlace sp);
-=======
-import com.google.gwt.user.client.ui.LayoutPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
-
-public interface HupaLayoutable {
-	LayoutPanel get();
-<<<<<<< HEAD
->>>>>>> refactoring
-=======
-
-	SimplePanel getLoginView();
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-
-public interface HupaLayoutable extends Layoutable{
->>>>>>> integrate them as a whole one - first: make the default place work
-=======
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-
-public interface HupaLayoutable extends Layoutable {
-	AcceptsOneWidget getTopBarView();
-
-	AcceptsOneWidget getLogoView();
-
-	AcceptsOneWidget getNavigationView();
-
-	AcceptsOneWidget getToolBarView();
-
-	AcceptsOneWidget getFolderListView();
-
-	AcceptsOneWidget getMessageListView();
-
-	AcceptsOneWidget getMessageListFooterView();
-
-	AcceptsOneWidget getMessageContentView();
-
-	AcceptsOneWidget getStatusView();
-<<<<<<< HEAD
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-
-<<<<<<< HEAD
-	void switchToCompose();
-
-	void switchToMessage();
-<<<<<<< HEAD
->>>>>>> could change main panel dynamically currently by clicking the compose button
-=======
-
-<<<<<<< HEAD
-	AcceptsOneWidget getComposeHeader();
-
-	AcceptsOneWidget getComposeContent();
-
-	AcceptsOneWidget getComposeStatus();
-<<<<<<< HEAD
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-=======
-
-	AcceptsOneWidget getComposeToolBarView();
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-=======
-=======
->>>>>>> make layout can be arranged by clicking the navigation buttons; make the layout changing by set their sizes to zero rather than remove/add from their parent widgets; merge to the master branch.
-	AcceptsOneWidget getComposeToolBarView();
-
-	AcceptsOneWidget getComposeView();
-<<<<<<< HEAD
->>>>>>> make send text mail work excellently
-=======
-
-	AcceptsOneWidget getNotificationView();
-<<<<<<< HEAD
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
-=======
-
-<<<<<<< HEAD
-	void switchToSetting();
-<<<<<<< HEAD
->>>>>>> attempt to add label setting feature
-=======
-
-	AcceptsOneWidget getLabelListView();
-<<<<<<< HEAD
->>>>>>> make label settings prototype
-=======
-
-	AcceptsOneWidget getLabelPropertiesView();
->>>>>>> add rename RF to label setting feature
-=======
-	AcceptsOneWidget getLabelListView();
-	AcceptsOneWidget getContactListView();
-
-	AcceptsOneWidget getLabelPropertiesView();
-
-	void switchTo(int layout);
-<<<<<<< HEAD
->>>>>>> make layout can be arranged by clicking the navigation buttons; make the layout changing by set their sizes to zero rather than remove/add from their parent widgets; merge to the master branch.
-=======
-
-	AcceptsOneWidget getContactPropertiesView();
-
-	AcceptsOneWidget getContactsListView();
-<<<<<<< HEAD
->>>>>>> prepared for issue#73, established the UI layout
-=======
-
-	AcceptsOneWidget getSearchBoxView();
->>>>>>> prepare to add search feature
-=======
->>>>>>> make a skeleton in the setting place, for more setting items
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java Mon Sep 23 07:04:08 2013
@@ -19,14 +19,11 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hupa.client.activity.LabelListActivity;
 import org.apache.hupa.client.activity.LabelPropertiesActivity;
-<<<<<<< HEAD
 import org.apache.hupa.client.rf.HupaRequestFactory;
 import org.apache.hupa.shared.domain.ImapFolder;
 
@@ -181,183 +178,10 @@ public class LabelListView extends Compo
 	}
 
 	interface LabelListUiBinder extends UiBinder<DockLayoutPanel, LabelListView> {
-=======
-import java.util.Arrays;
-=======
-import java.util.ArrayList;
->>>>>>> pull all folders for label settings
-import java.util.List;
-
-import org.apache.hupa.client.activity.LabelListActivity;
-=======
->>>>>>> add rename RF to label setting feature
-import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.shared.domain.ImapFolder;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.user.cellview.client.CellList;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.ScrollPanel;
-import com.google.gwt.view.client.AsyncDataProvider;
-import com.google.gwt.view.client.HasData;
-import com.google.gwt.view.client.ProvidesKey;
-import com.google.gwt.view.client.SelectionChangeEvent;
-import com.google.gwt.view.client.SingleSelectionModel;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
-
-public class LabelListView extends Composite implements LabelListActivity.Displayable {
-
-	@Inject LabelPropertiesActivity.Displayable labelProperties;
-	@UiField ScrollPanel thisView;
-
-	@UiField Button add;
-	@UiField Button delete;
-
-	public interface Resources extends CellList.Resources {
-
-		Resources INSTANCE = GWT.create(Resources.class);
-
-		@Source("res/CssLabelListView.css")
-		public CellList.Style cellListStyle();
-	}
-	@UiHandler("add")
-	public void handleAdd(ClickEvent e) {
-		labelProperties.cascade(selectionModel.getSelectedObject(), data.getDataList(), CASCADE_TYPE_ADD);
-	}
-
-	private final ImapLabelListDataProvider data;
-
-	@Inject
-	public LabelListView(final HupaRequestFactory rf) {
-		initWidget(binder.createAndBindUi(this));
-		data = new ImapLabelListDataProvider(rf);
-		CellList<LabelNode> cellList = new CellList<LabelNode>(new LabelCell(), Resources.INSTANCE);
-		cellList.setPageSize(100);// assume one's labels are under one hundred, otherwise we need a pager
-		cellList.setSelectionModel(selectionModel);
-		selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
-			public void onSelectionChange(SelectionChangeEvent event) {
-				labelProperties.cascade(selectionModel.getSelectedObject(), data.getDataList(), CASCADE_TYPE_RENAME);
-			}
-		});
-		data.addDataDisplay(cellList);
-		thisView.setWidget(cellList);
-	}
-
-	@Override
-	public SingleSelectionModel<LabelNode> getSelectionModel() {
-		return this.selectionModel;
-	}
-
-	public final SingleSelectionModel<LabelNode> selectionModel = new SingleSelectionModel<LabelNode>(
-			new ProvidesKey<LabelNode>() {
-				@Override
-				public Object getKey(LabelNode item) {
-					return item == null ? null : item.getPath();
-				}
-			});
-
-	public class ImapLabelListDataProvider extends AsyncDataProvider<LabelNode> implements HasRefresh {
-
-		private HupaRequestFactory rf;
-		private List<LabelNode> folderNodes = new ArrayList<LabelNode>();
-		HasData<LabelNode> display;
-
-		public List<LabelNode> getDataList() {
-			return folderNodes;
-		}
-
-		public ImapLabelListDataProvider(HupaRequestFactory rf) {
-			this.rf = rf;
-		}
-
-		@Override
-		public void addDataDisplay(HasData<LabelNode> display) {
-			super.addDataDisplay(display);
-			this.display = display;
-		}
-
-		@Override
-		protected void onRangeChanged(HasData<LabelNode> display) {
-
-			final int start = display.getVisibleRange().getStart();
-
-			rf.fetchFoldersRequest().fetch(null, Boolean.TRUE).fire(new Receiver<List<ImapFolder>>() {
-
-				private String INTENTS = "&nbsp;&nbsp;&nbsp;&nbsp;";
-
-				@Override
-				public void onSuccess(List<ImapFolder> response) {
-					folderNodes.clear();
-					if (response == null || response.size() == 0) {
-						updateRowCount(-1, true);
-					} else {
-						for (ImapFolder folder : response) {
-							fillCellList(folderNodes, folder, LabelNode.ROOT, "");
-						}
-						updateRowData(start, folderNodes);
-					}
-				}
-
-				private void fillCellList(List<LabelNode> folderNodes, ImapFolder curFolder, LabelNode parent,
-						String intents) {
-					LabelNode labelNode = new LabelNode();
-					labelNode.setFolder(curFolder);
-					labelNode.setName(curFolder.getName());
-					labelNode.setNameForDisplay(intents + curFolder.getName());
-					labelNode.setParent(parent);
-					labelNode.setPath(curFolder.getFullName());
-					folderNodes.add(labelNode);
-					if("inbox".equalsIgnoreCase(curFolder.getName())){
-						if(selectionModel.getSelectedObject() == null){
-							selectionModel.setSelected(labelNode, true);
-						}
-					}
-					if (curFolder.getHasChildren()) {
-						for (ImapFolder subFolder : curFolder.getChildren()) {
-							fillCellList(folderNodes, subFolder, labelNode, intents + INTENTS);
-						}
-					}
-				}
-
-				@Override
-				public void onFailure(ServerFailure error) {
-					if (error.isFatal()) {
-						throw new RuntimeException(error.getMessage());
-					}
-				}
-
-			});
-		}
-
-		@Override
-		public void refresh() {
-			this.onRangeChanged(display);
-		}
-	}
-
-<<<<<<< HEAD
-	interface LabelListUiBinder extends UiBinder<SimplePanel, LabelListView> {
->>>>>>> make label settings prototype
-=======
-	interface LabelListUiBinder extends UiBinder<DockLayoutPanel, LabelListView> {
->>>>>>> make delete label in label setting work(backend now)
 	}
 
 	private static LabelListUiBinder binder = GWT.create(LabelListUiBinder.class);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> make delete label in label setting work(backend now)
 	@Override
 	public HasClickHandlers getAdd() {
 		return add;
@@ -368,20 +192,9 @@ public class LabelListView extends Compo
 		return delete;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> refresh labels list when create/remove label in the setting place, while remove label can not refresh now
 	@Override
 	public void refresh() {
 		data.refresh();
 	}
 
-<<<<<<< HEAD
-=======
->>>>>>> make label settings prototype
-=======
->>>>>>> make delete label in label setting work(backend now)
-=======
->>>>>>> refresh labels list when create/remove label in the setting place, while remove label can not refresh now
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml Mon Sep 23 07:04:08 2013
@@ -11,20 +11,9 @@
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-<<<<<<< HEAD
-<<<<<<< HEAD
 	<g:DockLayoutPanel>
 		<g:center>
 			<g:ScrollPanel ui:field="thisView" />
-=======
-	<g:DockLayoutPanel>
-		<g:center>
-<<<<<<< HEAD
-			<g:SimplePanel ui:field="thisView" />
->>>>>>> make delete label in label setting work(backend now)
-=======
-			<g:ScrollPanel ui:field="thisView" />
->>>>>>> replace Label List View in setting place to use ScrollPanel
 		</g:center>
 		<g:south size="43">
 			<g:FlowPanel ui:field="folderOpButtons">
@@ -33,10 +22,4 @@
 			</g:FlowPanel>
 		</g:south>
 	</g:DockLayoutPanel>
-<<<<<<< HEAD
-=======
-	<g:SimplePanel ui:field="thisView" />
->>>>>>> make label settings prototype
-=======
->>>>>>> make delete label in label setting work(backend now)
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java Mon Sep 23 07:04:08 2013
@@ -3,10 +3,6 @@ package org.apache.hupa.client.ui;
 import org.apache.hupa.shared.domain.ImapFolder;
 
 public class LabelNode implements Comparable<LabelNode> {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#65, while this should be improved to add some cache or something like
 	
 	public static LabelNode ROOT = new LabelNode("---"); 
 	
@@ -26,16 +22,6 @@ public class LabelNode implements Compar
 	public void setNameForDisplay(String nameForDisplay) {
 		this.nameForDisplay = nameForDisplay;
 	}
-<<<<<<< HEAD
-=======
-	private ImapFolder folder;
-	private String name;
-	private String path;
-	private LabelNode parent;
-
->>>>>>> add rename RF to label setting feature
-=======
->>>>>>> add intents to labels list
 	public ImapFolder getFolder() {
 		return folder;
 	}
@@ -61,22 +47,10 @@ public class LabelNode implements Compar
 		this.parent = parent;
 	}
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#65, while this should be improved to add some cache or something like
 	public int compareTo(LabelNode o) {
 		if(name == null) return -1;
 		if(o == null) return 1;
 		return name.compareTo(o.name);
-<<<<<<< HEAD
-=======
-	public int compareTo(LabelNode arg0) {
-		// TODO Auto-generated method stub
-		return 0;
->>>>>>> add rename RF to label setting feature
-=======
->>>>>>> fixed issue#65, while this should be improved to add some cache or something like
 	}
 
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java Mon Sep 23 07:04:08 2013
@@ -21,17 +21,8 @@ package org.apache.hupa.client.ui;
 
 import java.util.List;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.activity.LabelListActivity;
-=======
->>>>>>> make layout can be arranged by clicking the navigation buttons; make the layout changing by set their sizes to zero rather than remove/add from their parent widgets; merge to the master branch.
-=======
-import org.apache.hupa.client.HupaController;
-import org.apache.hupa.client.activity.LabelListActivity;
->>>>>>> make add of label setting work in backend
 import org.apache.hupa.client.activity.LabelPropertiesActivity;
 import org.apache.hupa.client.rf.CreateFolderRequest;
 import org.apache.hupa.client.rf.HupaRequestFactory;
@@ -45,148 +36,26 @@ import org.apache.hupa.shared.events.Ref
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.HasClickHandlers;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import com.google.gwt.event.shared.EventBus;
-=======
-import org.apache.hupa.client.activity.LabelListActivity;
-import org.apache.hupa.client.activity.LabelPropertiesActivity;
-import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.rf.RenameFolderRequest;
-import org.apache.hupa.shared.domain.GenericResult;
-import org.apache.hupa.shared.domain.ImapFolder;
-import org.apache.hupa.shared.domain.RenameFolderAction;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
->>>>>>> add rename RF to label setting feature
-=======
->>>>>>> make add of label setting work in backend
-=======
-import com.google.gwt.event.shared.EventBus;
->>>>>>> refresh labels list when create/remove label in the setting place, while remove label can not refresh now
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.Button;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.CaptionPanel;
-=======
->>>>>>> add rename RF to label setting feature
-=======
-import com.google.gwt.user.client.ui.CaptionPanel;
->>>>>>> make add of label setting work in backend
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DecoratorPanel;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.TextBox;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.inject.Inject;
 import com.google.web.bindery.requestfactory.shared.Receiver;
 import com.google.web.bindery.requestfactory.shared.ServerFailure;
-=======
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
->>>>>>> add rename RF to label setting feature
-=======
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
->>>>>>> make add of label setting work in backend
 
 public class LabelPropertiesView extends Composite implements LabelPropertiesActivity.Displayable {
 
 	@Inject HupaRequestFactory rf;
-<<<<<<< HEAD
-<<<<<<< HEAD
 	@Inject HupaController hc;
 	@Inject EventBus eventBus;
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-	
->>>>>>> refresh labels list when create/remove label in the setting place, while remove label can not refresh now
-	@UiField TextBox name;
-	private String path;
-
-	@UiField ListBox parent;
-	@UiField Button save;
-
-	@UiField VerticalPanel propContainer;
-	@UiField CaptionPanel information;
-	private static final String ROOT_PATH = "imap_root";
-
-	private int state;
-
-	ImapFolder folder;
-
-	@UiHandler("save")
-	void handleSave(ClickEvent e) {
-		hc.showTopLoading("Saving...");
-		if (state == LabelListActivity.Displayable.CASCADE_TYPE_RENAME) {
-			RenameFolderRequest req = rf.renameFolderRequest();
-			RenameFolderAction action = req.create(RenameFolderAction.class);
-			final ImapFolder f = req.create(ImapFolder.class);
-			f.setFullName(folder.getFullName());
-			action.setFolder(f);
-
-			if (ROOT_PATH.equals(parent.getValue(parent.getSelectedIndex()))) {
-				action.setNewName(name.getText());
-			} else {
-				action.setNewName(parent.getValue(parent.getSelectedIndex()) + "/" + name.getText());
-			}
-			req.rename(action).fire(new Receiver<GenericResult>() {
-				@Override
-				public void onSuccess(GenericResult response) {
-					hc.hideTopLoading();
-					eventBus.fireEvent(new RefreshLabelListEvent());
-					hc.showNotice("The label \"" + f.getFullName() + "\" has been renamed to " + name.getText(), 10000);
-				}
-				@Override
-				public void onFailure(ServerFailure error) {
-					hc.hideTopLoading();
-					hc.showNotice(error.getMessage(), 10000);
-				}
-			});
-		} else if (state == LabelListActivity.Displayable.CASCADE_TYPE_ADD) {
-			CreateFolderRequest req = rf.createFolderRequest();
-			CreateFolderAction action = req.create(CreateFolderAction.class);
-			final ImapFolder f = req.create(ImapFolder.class);
-			f.setFullName(path + "/" + name.getText());
-			action.setFolder(f);
-			req.create(action).fire(new Receiver<GenericResult>() {
-				@Override
-				public void onSuccess(GenericResult response) {
-					hc.hideTopLoading();
-					eventBus.fireEvent(new RefreshLabelListEvent());
-					hc.showNotice("The label \"" + f.getName() + "\" was created.", 10000);
-				}
-				@Override
-				public void onFailure(ServerFailure error) {
-					hc.hideTopLoading();
-					hc.showNotice(error.getMessage(), 10000);
-				}
-			});
-
-		}
-=======
-	
-	@UiField TextBox _name;
-	@UiField ListBox _parent;
-=======
-	@Inject HupaController hc;
-
-	@UiField TextBox name;
-	@UiField ListBox parent;
->>>>>>> make add of label setting work in backend
-	@UiField Button save;
-	
-=======
 
 	@UiField TextBox name;
 	private String path;
@@ -194,7 +63,6 @@ public class LabelPropertiesView extends
 	@UiField ListBox parent;
 	@UiField Button save;
 
->>>>>>> fixed issue#77, the reason is that the arguement passed to server was not the selected value in the list box
 	@UiField VerticalPanel propContainer;
 	@UiField CaptionPanel information;
 	private static final String ROOT_PATH = "imap_root";
@@ -204,21 +72,6 @@ public class LabelPropertiesView extends
 	ImapFolder folder;
 
 	@UiHandler("save")
-<<<<<<< HEAD
-	void handleCompose(ClickEvent e){
-		RenameFolderRequest req = rf.renameFolderRequest();
-		RenameFolderAction action = req.create(RenameFolderAction.class);
-		action.setFolder(folder);
-		action.setNewName(_name.getText());
-		req.rename(action).fire(new Receiver<GenericResult>() {
-			@Override
-			public void onSuccess(GenericResult response) {
-//				afterSend(response);
-				System.out.println("success to rename");
-			}
-		});
->>>>>>> add rename RF to label setting feature
-=======
 	void handleSave(ClickEvent e) {
 		hc.showTopLoading("Saving...");
 		if (state == LabelListActivity.Displayable.CASCADE_TYPE_RENAME) {
@@ -267,7 +120,6 @@ public class LabelPropertiesView extends
 			});
 
 		}
->>>>>>> make add of label setting work in backend
 	}
 	public LabelPropertiesView() {
 		initWidget(binder.createAndBindUi(this));
@@ -279,86 +131,24 @@ public class LabelPropertiesView extends
 	private static Binder binder = GWT.create(Binder.class);
 
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> make add of label setting work in backend
 	public void cascade(LabelNode labelNode, List<LabelNode> wholeList, int type) {
 		state = type;
 		switch (type) {
 		case LabelListActivity.Displayable.CASCADE_TYPE_ADD:
 			makeParentList(labelNode, true, wholeList);
 			name.setText("");
-<<<<<<< HEAD
-<<<<<<< HEAD
 			path = labelNode.getPath();
-=======
->>>>>>> make add of label setting work in backend
-=======
-			path = labelNode.getPath();
->>>>>>> fixed issue#77, the reason is that the arguement passed to server was not the selected value in the list box
 			information.setVisible(false);
 			break;
 		case LabelListActivity.Displayable.CASCADE_TYPE_RENAME:
 			name.setText(labelNode.getName());
-<<<<<<< HEAD
-<<<<<<< HEAD
-			path = labelNode.getPath();
-=======
->>>>>>> make add of label setting work in backend
-=======
 			path = labelNode.getPath();
->>>>>>> fixed issue#77, the reason is that the arguement passed to server was not the selected value in the list box
 			makeParentList(labelNode, false, wholeList);
 			information.setVisible(true);
 			break;
 		default:
 			name.setText("");
 		}
-<<<<<<< HEAD
-		folder = labelNode.getFolder();
-		if (!(labelNode.getFolder().getSubscribed())) {
-			name.setEnabled(false);
-		} else {
-			name.setEnabled(true);
-		}
-	}
-	private void makeParentList(LabelNode labelNode, boolean isParent, List<LabelNode> wholeList) {
-		parent.clear();
-		parent.addItem("---", ROOT_PATH);
-		for (LabelNode folderNode : wholeList) {
-			if (isItself(labelNode, isParent, folderNode) || isItsDecendant(labelNode, isParent, folderNode)) {
-				continue;
-			}
-			parent.addItem(folderNode.getNameForDisplay().replace("&nbsp;&nbsp;", ". "), folderNode.getPath());
-		}
-
-		int parentIndex = wholeList.indexOf(isParent ? labelNode : labelNode.getParent());
-		parent.setSelectedIndex(parentIndex < 0 ? 0 : parentIndex + 1);
-	}
-	private boolean isItself(LabelNode labelNode, boolean isParent, LabelNode folderNode) {
-		return !isParent && labelNode.compareTo(folderNode) == 0;
-	}
-	private boolean isItsDecendant(LabelNode labelNode, boolean isParent, LabelNode folderNode) {
-		return !isParent && isKinship(labelNode, folderNode);
-	}
-
-	private boolean isKinship(LabelNode labelNode, LabelNode folderNode) {
-		if (folderNode == null) {
-			return false;
-		}
-		if (labelNode.compareTo(folderNode.getParent()) == 0)
-			return true;
-		return isKinship(labelNode, folderNode.getParent());
-	}
-	@Override
-	public HasClickHandlers getSave() {
-		return save;
-=======
-	public void cascade(LabelNode labelNode, List<LabelNode> list) {
-		_name.setText(labelNode.getName());
-=======
->>>>>>> make add of label setting work in backend
 		folder = labelNode.getFolder();
 		if (!(labelNode.getFolder().getSubscribed())) {
 			name.setEnabled(false);
@@ -375,14 +165,7 @@ public class LabelPropertiesView extends
 			}
 			parent.addItem(folderNode.getNameForDisplay().replace("&nbsp;&nbsp;", ". "), folderNode.getPath());
 		}
-<<<<<<< HEAD
-<<<<<<< HEAD
-		_parent.setSelectedIndex(list.indexOf(labelNode.getParent()));
->>>>>>> add rename RF to label setting feature
-=======
-=======
 
->>>>>>> fixed issue#77, the reason is that the arguement passed to server was not the selected value in the list box
 		int parentIndex = wholeList.indexOf(isParent ? labelNode : labelNode.getParent());
 		parent.setSelectedIndex(parentIndex < 0 ? 0 : parentIndex + 1);
 	}
@@ -404,7 +187,6 @@ public class LabelPropertiesView extends
 	@Override
 	public HasClickHandlers getSave() {
 		return save;
->>>>>>> make add of label setting work in backend
 	}
 
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java Mon Sep 23 07:04:08 2013
@@ -31,8 +31,6 @@ import com.google.gwt.user.client.ui.Wid
 public class LoginLayout implements LoginLayoutable {
 
 	@UiField SimplePanel loginContainer;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 	private LayoutPanel loginMainPanel;
 
@@ -46,39 +44,10 @@ public class LoginLayout implements Logi
 			@Override
 			public void setWidget(IsWidget w) {
 				loginContainer.setWidget(Widget.asWidgetOrNull(w));
-<<<<<<< HEAD
 			}
 		};
 	}
 
-=======
-	
-=======
-
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-	private LayoutPanel loginMainPanel;
-
-	public LoginLayout() {
-		this.loginMainPanel = binder.createAndBindUi(this);
-	}
-
-	@Override
-	public AcceptsOneWidget getLoginView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				loginContainer.add(Widget.asWidgetOrNull(w));
-=======
->>>>>>> integrate all of the views to their corresponding activities and mappers
-			}
-		};
-	}
-<<<<<<< HEAD
-	
->>>>>>> integrate them as a whole one - first: make the default place work
-=======
-
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
 	@Override
 	public LayoutPanel get() {
 		return loginMainPanel;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java Mon Sep 23 07:04:08 2013
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -22,80 +17,21 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.activity.LoginActivity;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.client.ui;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-=======
->>>>>>> Change to new mvp framework - first step
-import org.apache.hupa.client.HupaCSS;
-=======
->>>>>>> refactoring theme 1 - login page
-import org.apache.hupa.client.HupaConstants;
-=======
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-import org.apache.hupa.client.activity.LoginActivity;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
-package org.apache.hupa.client.ui;
-
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> Change to new mvp framework - first step
-=======
-import com.google.gwt.core.client.GWT;
-<<<<<<< HEAD
->>>>>>> replace with uibinder
-=======
-import com.google.gwt.dom.client.Document;
->>>>>>> refactoring theme 1 - login page
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.event.dom.client.KeyUpEvent;
 import com.google.gwt.event.dom.client.KeyUpHandler;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.CssResource.NotStrict;
-=======
-import com.google.gwt.resources.client.CssResource;
->>>>>>> prepare for places and do something for loading related to issue #18
-=======
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.resources.client.CssResource.NotStrict;
->>>>>>> scrub login view code, use css by a unique way 
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
->>>>>>> replace with uibinder
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
@@ -103,10 +39,6 @@ import com.google.gwt.user.client.ui.Fle
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Focusable;
 import com.google.gwt.user.client.ui.FormPanel;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.HasValue;
@@ -126,7 +58,6 @@ public class LoginView extends Composite
 	 * define by ourselves
 	 */
 	public interface Style extends CssResource {
-<<<<<<< HEAD
 		String loading();
 
 		String hidden();
@@ -203,268 +134,28 @@ public class LoginView extends Composite
 
 		formPanel.add(flexTable);
 		innerBox.add(formPanel);
-=======
-=======
-import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
->>>>>>> Change to new mvp framework - first step
-=======
-import com.google.gwt.user.client.ui.HTMLPanel;
->>>>>>> prepare for places and do something for loading related to issue #18
-import com.google.gwt.user.client.ui.HasValue;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PasswordTextBox;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.SubmitButton;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.Widget;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import com.google.inject.Inject;
-
-<<<<<<< HEAD
-public class LoginView extends Composite implements KeyUpHandler, LoginActivity.Displayable {
-=======
-import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
-import com.google.inject.Inject;
-
-import org.apache.hupa.client.HupaCSS;
-import org.apache.hupa.client.HupaConstants;
-import org.apache.hupa.client.activity.LoginActivity;
-import org.apache.hupa.widgets.ui.Loading;
-import org.apache.hupa.widgets.ui.RndPanel;
-
-public class LoginView extends Composite implements KeyUpHandler, LoginActivity.Display {
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-import com.google.inject.Inject;
-
-public class LoginView extends Composite implements KeyUpHandler, LoginActivity.Displayable {
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
-	@UiField VerticalPanel mainContainer;
->>>>>>> replace with uibinder
-	private Button loginButton = new Button();
-	private SubmitButton submitButton;
-	private Button resetButton;
-	private Loading loading;
-//	FlowPanel rPanel = new FlowPanel();
-	@UiField FlexTable flexTable;
-	Panel buttonBar = new FlowPanel();
-	// We wrap login/password boxes with a form which must be in the html
-	// document,
-	// in this way, the browser knows that we are sending a login form and
-	// offers the save password dialog to the user
-	private TextBox usernameTextBox = TextBox.wrap(DOM.getElementById("email"));
-	private PasswordTextBox passwordTextBox = PasswordTextBox.wrap(DOM.getElementById("password"));
-	// wrap the form after inputs so as they are in the dom when are wrapped
-	@UiField FormPanel formPanel;
-=======
-public class LoginView extends Composite implements KeyUpHandler,
-		LoginActivity.Displayable {
->>>>>>> refactoring theme 1 - login page
-
-	@UiField Style style;
-
-	interface Style extends CssResource {
-=======
->>>>>>> scrub login view code, use css by a unique way 
-		String loading();
-
-		String hidden();
-
-		String display();
-	}
-
-	@UiField Style style;
-	@UiField FlowPanel mainContainer;
-	@UiField FlowPanel innerBox;
-	@UiField Button loginButton;
-	@UiField FlexTable flexTable;
-	@UiField FlowPanel boxBottom;
-	@UiField FlowPanel messageBox;
-	@UiField FlowPanel bottomLine;
-	@UiField FormPanel formPanel;
-	@UiField HTMLPanel message;
-	Resources.Css css = Resources.INSTANCE.stylesheet();
-	private SubmitButton submitButton;
-	PPanel buttonBar = new PPanel();
-
-	/*
-	 * We wrap login/password boxes with a form which must be in the html
-	 * document, in this way, the browser knows that we are sending a login form
-	 * and offers the save password dialog to the user
-	 */
-	private TextBox usernameTextBox = TextBox.wrap(DOM.getElementById("email"));
-	private PasswordTextBox passwordTextBox = PasswordTextBox.wrap(DOM
-			.getElementById("password"));
-
-	public interface Resources extends ClientBundle {
-
-		Resources INSTANCE = GWT.create(Resources.class);
-
-		@NotStrict
-		@Source("res/CssLoginView.css")
-		public Css stylesheet();
-
-		public interface Css extends CssResource {
-			String loginForm();
-
-			String boxInner();
-
-			String tdTitle();
-
-			String tdInput();
-
-			String pFormbuttons();
-
-			String submitButton();
-
-			String boxBottom();
-
-			String messageBox();
-
-			String bottomLine();
-		}
-	}
-
-	@Inject
-	public LoginView() {
-		initWidget(binder.createAndBindUi(this));
-		mainContainer.addStyleName(css.loginForm());
-		innerBox.addStyleName(css.boxInner());
-		formPanel = FormPanel.wrap(DOM.getElementById("loginForm"), true);
-		submitButton = new SubmitButton("Login");
-		submitButton.setStyleName(css.submitButton());
-		bottomLine.addStyleName(css.bottomLine());
-		buttonBar.add(submitButton);
-		buttonBar.addStyleName(css.pFormbuttons());
-		createLoginPrompt();
-		flexTable.getFlexCellFormatter().setColSpan(2, 0, 2);
-		flexTable.setWidget(2, 0, buttonBar);
-
-		formPanel.add(flexTable);
-<<<<<<< HEAD
-		mainContainer.add(formPanel);
-		mainContainer.add(loading);
-<<<<<<< HEAD
-		initWidget(mainContainer);
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> make login form available
-=======
-		innerBox.add(formPanel);
->>>>>>> refactoring theme 1 - login page
 
 		usernameTextBox.addKeyUpHandler(this);
 		usernameTextBox.setFocus(true);
 		passwordTextBox.addKeyUpHandler(this);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> scrub login view code, use css by a unique way 
 		/*
 		 * The user submits the form so as the browser detect it and displays
 		 * the save password dialog. Then we click on the hidden loginButton
 		 * which stores the presenter clickHandler.
 		 */
-<<<<<<< HEAD
 		formPanel.addSubmitHandler(new FormPanel.SubmitHandler() {
 			public void onSubmit(SubmitEvent event) {
 				if (!usernameTextBox.getValue().trim().isEmpty()
 						&& !passwordTextBox.getValue().trim().isEmpty()) {
-=======
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-		loading.hide();
-
-=======
->>>>>>> refactoring theme 1 - login page
-		// The user submits the form so as the browser detect it and displays
-		// the save password dialog. Then we click on the hidden loginButton
-		// which
-		// stores the presenter clickHandler.
-=======
->>>>>>> scrub login view code, use css by a unique way 
-		formPanel.addSubmitHandler(new FormPanel.SubmitHandler() {
-			public void onSubmit(SubmitEvent event) {
-<<<<<<< HEAD
-				if (!usernameTextBox.getValue().trim().isEmpty() && !passwordTextBox.getValue().trim().isEmpty()) {
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-				if (!usernameTextBox.getValue().trim().isEmpty()
-						&& !passwordTextBox.getValue().trim().isEmpty()) {
->>>>>>> refactoring theme 1 - login page
 					loginButton.click();
 				}
 				// event.cancel();
 			}
 		});
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		innerBox.add(loginButton);
-		loginButton.setVisible(false);
-		setLoading(false);
-	}
-
-	private void createLoginPrompt() {
-		Label userNameLabel = new Label("username");
-		Label passWordLabel = new Label("password");
-		userNameLabel.addStyleName(css.tdTitle());
-		passWordLabel.addStyleName(css.tdTitle());
-		flexTable.setWidget(0, 0, userNameLabel);
-		flexTable.setWidget(0, 1, usernameTextBox);
-		flexTable.setWidget(1, 0, passWordLabel);
-		flexTable.setWidget(1, 1, passwordTextBox);
-		flexTable.getCellFormatter().addStyleName(0, 0, css.tdTitle());
-		flexTable.getCellFormatter().addStyleName(1, 0, css.tdTitle());
-		flexTable.getCellFormatter().addStyleName(0, 1, css.tdInput());
-		flexTable.getCellFormatter().addStyleName(1, 1, css.tdInput());
-	}
-
-	public class PPanel extends SimplePanel {
-		public PPanel() {
-			super(Document.get().createPElement());
-		}
-=======
-		// loginButton must be in the document to handle the click() method
-		mainContainer.add(loginButton);
-		loginButton.setVisible(false);
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-		// loginButton must be in the document to handle the click() method
-=======
->>>>>>> scrub login view code, use css by a unique way 
 		innerBox.add(loginButton);
 		loginButton.setVisible(false);
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-		initWidget(mainContainer);
->>>>>>> make login form available
-=======
->>>>>>> replace with uibinder
-=======
 		setLoading(false);
->>>>>>> dealing with login panel's loading progress ajax loader
 	}
 
 	private void createLoginPrompt() {
@@ -507,23 +198,6 @@ public class LoginView extends Composite
 	}
 
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-	public HasClickHandlers getResetClick() {
-		return resetButton;
-	}
-
-	@Override
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> refactoring theme 1 - login page
 	public HasValue<String> getUserNameValue() {
 		return usernameTextBox;
 	}
@@ -538,11 +212,6 @@ public class LoginView extends Composite
 		return usernameTextBox;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> scrub login view code, use css by a unique way 
 	// FIXME the ajax loader will not hidden after normal logout
 	@Override
 	public void setLoading(boolean load) {
@@ -551,36 +220,9 @@ public class LoginView extends Composite
 			message.addStyleName(style.display());
 		} else {
 			message.removeStyleName(style.loading());
-<<<<<<< HEAD
-<<<<<<< HEAD
 			message.removeStyleName(style.display());
 			message.addStyleName(style.hidden());
-=======
-			message.removeStyleName(style.hidden());
->>>>>>> add logout support
 		}
-=======
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-	@Override
-	public void setLoading(boolean load) {
-<<<<<<< HEAD
-
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-		if (load) {
-			message.addStyleName(style.loading());
-		} else {
-			message.removeStyleName(style.loading());
-=======
-			message.removeStyleName(style.display());
-			message.addStyleName(style.hidden());
->>>>>>> dealing with login panel's loading progress ajax loader
-		}
->>>>>>> prepare for places and do something for loading related to issue #18
 	}
 
 	@Override
@@ -588,53 +230,10 @@ public class LoginView extends Composite
 		return this;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	interface LoginViewUiBinder extends UiBinder<FlowPanel, LoginView> {
 	}
 
 	private static LoginViewUiBinder binder = GWT
 			.create(LoginViewUiBinder.class);
 
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-	interface LoginViewUiBinder extends UiBinder<VerticalPanel, LoginView> {
-=======
-	interface LoginViewUiBinder extends UiBinder<FlowPanel, LoginView> {
->>>>>>> refactoring theme 1 - login page
-	}
-
-	private static LoginViewUiBinder binder = GWT
-			.create(LoginViewUiBinder.class);
-
-<<<<<<< HEAD
-	Css css = HupaResources.INSTANCE.stylesheet();
-	@UiField FlowPanel mainContainer;
-	@UiField FlowPanel innerBox;
-	@UiField Button loginButton;
-	private SubmitButton submitButton;
-	@UiField FlexTable flexTable;
-	@UiField FlowPanel boxBottom;
-	@UiField FlowPanel messageBox;
-	@UiField FlowPanel bottomLine;
-	PPanel buttonBar = new PPanel();
-	// We wrap login/password boxes with a form which must be in the html
-	// document,
-	// in this way, the browser knows that we are sending a login form and
-	// offers the save password dialog to the user
-	private TextBox usernameTextBox = TextBox.wrap(DOM.getElementById("email"));
-	private PasswordTextBox passwordTextBox = PasswordTextBox.wrap(DOM
-			.getElementById("password"));
-	// wrap the form after inputs so as they are in the dom when are wrapped
-	@UiField FormPanel formPanel;
-	@UiField HTMLPanel message;
-
->>>>>>> replace with uibinder
-=======
->>>>>>> scrub login view code, use css by a unique way 
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> make login page as one part of the overall layout & splite layout to little one
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
 	license agreements. See the NOTICE file distributed with this work for additional 
 	information regarding copyright ownership. The ASF licenses this file to 
@@ -12,7 +8,6 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
 	OF ANY KIND, either express or implied. See the License for the specific 
 	language governing permissions and limitations under the License. -->
-<<<<<<< HEAD
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
@@ -86,112 +81,4 @@
 			</g:HTML>
 		</g:FlowPanel>
 	</g:FlowPanel>
-=======
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-<<<<<<< HEAD
-	<g:VerticalPanel ui:field="mainContainer">
-		<g:FormPanel ui:field="formPanel">
-			<g:FlexTable ui:field="flexTable"></g:FlexTable>
-		</g:FormPanel>
-	</g:VerticalPanel>
->>>>>>> replace with uibinder
-=======
-	<ui:with field='res' type='org.apache.hupa.client.bundles.HupaResources'/>
-	
-=======
-
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-	<ui:image field='logo' src='res/hupa-logo-64-transparent.png' />
-	<ui:image field="shadow" src="res/loginShadow.png" />
-	<ui:image field="messages" src="res/messages.png" />
-	<ui:image field="loading" src="res/ajaxloader.gif" />
-	<ui:style type="org.apache.hupa.client.ui.LoginView.Style">
-		@sprite .boxBottom {
-			gwt-image: 'shadow';
-			background-position: top center;
-			width: auto;
-			height: auto;
-			margin-top: -3px;
-			padding-top: 10px;
-		}
-		
-		.message {
-			min-height: 40px;
-			padding: 5px 25px;
-			text-align: center;
-		}
-		
-		@sprite .notice {
-			gwt-image: 'messages';
-			background-position: 0 5px;
-			width: auto;
-			height: auto;
-			color: #555;
-			font-weight: bold;
-			padding: 6px 30px 6px 25px;
-			display: inline-block;
-			white-space: nowrap;
-			text-align: center;
-			cursor: default;
-		}
-		
-		.hidden {
-			display: none;
-		}
-		
-		.display {
-			display: inline-block;
-		}
-		
-		@sprite .loading {
-			gwt-image: 'loading';
-		}
-	</ui:style>
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-	<g:FlowPanel ui:field="mainContainer">
-		<g:FlowPanel ui:field="innerBox">
-			<g:Image resource='{logo}'></g:Image>
-			<g:FormPanel ui:field="formPanel">
-				<g:FlexTable ui:field="flexTable" />
-			</g:FormPanel>
-			<g:Button ui:field="loginButton"></g:Button>
-		</g:FlowPanel>
-		<g:FlowPanel ui:field="boxBottom" styleName="{style.boxBottom}">
-			<g:FlowPanel ui:field="messageBox" addStyleNames="{style.message}">
-				<g:HTMLPanel ui:field="message" addStyleNames="{style.notice}{style.hidden}">
-				</g:HTMLPanel>
-			</g:FlowPanel>
-		</g:FlowPanel>
-		<g:FlowPanel ui:field="bottomLine">
-			<g:HTML>
-				You're using
-				<b>Hupa</b>
-				WebMail which is part of the
-				<a target='_blank' href='http://james.apache.org'>Apache-James</a>
-				project.
-			</g:HTML>
-		</g:FlowPanel>
-	</g:FlowPanel>
->>>>>>> refactoring theme 1 - login page
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java Mon Sep 23 07:04:08 2013
@@ -19,30 +19,14 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.activity.LogoActivity;
 
-=======
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-import org.apache.hupa.client.activity.LogoActivity;
-
->>>>>>> integrate all of the views to their corresponding activities and mappers
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.SimplePanel;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class LogoView extends Composite implements LogoActivity.Displayable {
-=======
-public class LogoView extends Composite {
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
 public class LogoView extends Composite implements LogoActivity.Displayable {
->>>>>>> integrate all of the views to their corresponding activities and mappers
 
 	public LogoView() {
 		initWidget(binder.createAndBindUi(this));

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java Mon Sep 23 07:04:08 2013
@@ -19,11 +19,6 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.util.List;
 
 import org.apache.hupa.client.HupaCSS;
@@ -50,358 +45,24 @@ import com.google.gwt.user.client.ui.Hor
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
-<<<<<<< HEAD
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.SimplePanel;
-=======
->>>>>>> change the message content view with scrollbar
-=======
-import com.google.gwt.user.client.ui.SimplePanel;
->>>>>>> hide the show raw message button when not displaying a message and remove deprecated code
 import com.google.inject.Inject;
 
 public class MessageContentView extends Composite implements MessageContentActivity.Displayable {
 	@UiField ScrollPanel messageContent;
 	HTML messageContentHTML = new HTML();
-<<<<<<< HEAD
 
 	//TODO should use a scrolled panel which can contain multiple children
 	@UiField FlowPanel attachments;
 	@UiField DockLayoutPanel thisPanel;
-<<<<<<< HEAD
-<<<<<<< HEAD
 	@UiField Anchor rawButton;
 	@UiField SimplePanel rawPanel;
-<<<<<<< HEAD
-=======
->>>>>>> show/hide attachment's panel according to the attachments size
-=======
-	@UiField Anchor rawButton;
->>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window
-
-	@Inject
-=======
-=======
-=======
-import java.util.List;
-
-import org.apache.hupa.client.HupaCSS;
->>>>>>> fixed issue#64, add attachments region in message content view
-import org.apache.hupa.client.activity.MessageContentActivity;
-import org.apache.hupa.shared.SConsts;
-import org.apache.hupa.shared.domain.MessageAttachment;
-
->>>>>>> integrate all of the views to their corresponding activities and mappers
-import com.google.gwt.core.client.GWT;
-<<<<<<< HEAD
-=======
-import java.util.List;
-
-import org.apache.hupa.client.HupaCSS;
-import org.apache.hupa.client.HupaConstants;
-=======
->>>>>>> make message content work as expected partly
-import org.apache.hupa.client.activity.MessageContentActivity;
-
-import com.google.gwt.core.client.GWT;
-<<<<<<< HEAD
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.HasClickHandlers;
->>>>>>> prepare for message content panel
-=======
->>>>>>> make message content work as expected partly
-=======
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
->>>>>>> fixed issue#64, add attachments region in message content view
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Anchor;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.google.inject.Inject;
 
-<<<<<<< HEAD
-public class MessageContentView extends Composite implements
-		MessageContentActivity.Displayable {
-
-<<<<<<< HEAD
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-    public final static int DELETE_BUTTON = 0;
-    public final static int REPLY_BUTTON = 1;
-    public final static int REPLY_ALL_BUTTON = 2;
-    
-    private HupaImageBundle imageBundle;
-
-    @UiField
-    VerticalPanel messageContainer;
-    private MessageHeaders headers;
-    private CommandsBar buttonsBar = new CommandsBar();
-    private HTML msgArea = new HTML();
-    
-    private Label from = new Label();
-    private Label cc = new Label();
-    private Label to = new Label();
-    private Label subject = new Label();
-    
-    private Button deleteMsgButton = new Button();
-    private Button replyMsgButton = new Button();
-    private Button replyAllMsgButton = new Button();
-    private Button forwardMsgButton = new Button();
-    private Anchor showRawButton;
-    private Anchor backButton;
-    private FlowPanel attachments = new FlowPanel();
-    
-    private Loading loading;
-
-    @Inject
-    public MessageContentView(HupaConstants constants, HupaImageBundle imageBundle) {
-        this.imageBundle = imageBundle;
-        
-        loading = new Loading(constants.loading());
-        showRawButton = new Anchor(constants.rawButton());
-        backButton = new Anchor(constants.backButton());
-        headers = new MessageHeaders(constants);
-        deleteMsgButton.setText(constants.deleteMailButton());
-        replyMsgButton.setText(constants.replyMailButton());
-        replyAllMsgButton.setText(constants.replyAllMailButton());
-        forwardMsgButton.setText(constants.forwardMailButton());    
-        
-        messageContainer.addStyleName(HupaCSS.C_msgview_container);
-        
-        buttonsBar.add(replyMsgButton);
-        buttonsBar.add(replyAllMsgButton);
-        buttonsBar.add(deleteMsgButton);
-        buttonsBar.add(forwardMsgButton);
-        buttonsBar.add(loading);
-//        buttonsBar.add(showRawButton); TODO
-        buttonsBar.add(backButton);
-        
-        ScrollPanel scrollPanel = new ScrollPanel();
-        scrollPanel.addStyleName(HupaCSS.C_msgview_content);
-        scrollPanel.setAlwaysShowScrollBars(false);
-        scrollPanel.add(msgArea);
-        
-        messageContainer.add(headers);
-        messageContainer.add(buttonsBar);
-        messageContainer.add(scrollPanel);
-        
-        loading.hide();
-        
-        initWidget(messageContainer);
-    }
-
-    public Widget asWidget() {
-        return this;
-    }
-
-    public void startProcessing() {
-        loading.show();
-    }
-
-    public void stopProcessing() {
-        loading.show();
-    }
-
-    public HasClickHandlers getDeleteButtonClick() {
-        return deleteMsgButton;
-    }
-
-    public void setAttachments(List<MessageAttachment> attachements,
-            final String folder,
-            final long uid) {
-        
-        attachments.clear();
-        final Element downloadIframe = RootPanel.get("__download").getElement();
-        if (attachements != null) {
-            for (final MessageAttachment messageAttachment : attachements) {
-                Label link = new Label(messageAttachment.getName() + " (" + messageAttachment.getSize() / 1024 + "kB)");
-                link.setStyleName(HupaCSS.C_hyperlink);
-                link.addClickHandler(new ClickHandler() {
-                    public void onClick(ClickEvent event) {
-                        String url = GWT.getModuleBaseURL() + SConsts.SERVLET_DOWNLOAD 
-                                    + "?" + SConsts.PARAM_NAME + "=" + messageAttachment.getName() 
-                                    + "&" + SConsts.PARAM_FOLDER + "=" + folder
-                                    + "&" + SConsts.PARAM_UID + "=" + uid;
-                        if (downloadIframe == null)
-                            Window.open(url,"_blank", "");
-                        else
-                            DOM.setElementAttribute(downloadIframe, "src", url);
-                    }
-                });
-                HorizontalPanel aPanel = new HorizontalPanel();
-                aPanel.addStyleName(HupaCSS.C_attachment);
-                aPanel.add(new Image(imageBundle.attachmentIcon()));
-                aPanel.add(link);
-                attachments.add(aPanel);
-            }
-        }
-    }
-
-    public HasClickHandlers getForwardButtonClick() {
-        return forwardMsgButton;
-    }
-
-    public HasClickHandlers getReplyAllButtonClick() {
-        return replyAllMsgButton;
-    }
-
-    public HasClickHandlers getReplyButtonClick() {
-        return replyMsgButton;
-    }
-
-    public HasClickHandlers getBackButtonClick() {
-        return backButton;
-    }
-=======
->>>>>>> hide the show raw message button when not displaying a message and remove deprecated code
-
-    public HasClickHandlers getShowRawMessageClick() {
-        return showRawButton;
-    }
-
-    public void setHeaders(Message message) {
-        from.setText(message.getFrom());
-        cc.setText(Util.listToString(message.getCc()));
-        to.setText(Util.listToString(message.getTo()));
-        subject.setText(message.getSubject());
-        headers.setValues(from, to, cc, null, subject, attachments);
-    }
-    
-    public void setContent(String content) {
-        msgArea.setHTML(content);
-    }
-    
-=======
-public class MessageContentView extends Composite implements MessageContentActivity.Displayable {
->>>>>>> make message content work as expected partly
-=======
->>>>>>> change the message content view with scrollbar
-
-	//TODO should use a scrolled panel which can contain multiple children
-	@UiField FlowPanel attachments;
-
-<<<<<<< HEAD
->>>>>>> prepare for message content panel
-=======
 	@Inject
->>>>>>> make message content work as expected partly
 	public MessageContentView() {
 		initWidget(binder.createAndBindUi(this));
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	public void fillMessageContent(String messageDetail) {
-		messageContentHTML.setHTML(messageDetail);
-		messageContent.add(messageContentHTML);
-	}
-	
-	@Override
-	public void showAttachmentPanel(boolean is){
-		if(is){
-			thisPanel.setWidgetSize(attachments, 216);
-		}else{
-			thisPanel.setWidgetSize(attachments, 0);
-		}
-	}
-
-	@Override
-	public void setAttachments(List<MessageAttachment> attachements, final String folder, final long uid) {
-		attachments.clear();
-		final Element downloadIframe = RootPanel.get("__download").getElement();
-		if (attachements != null) {
-			for (final MessageAttachment messageAttachment : attachements) {
-				Label link = new Label(messageAttachment.getName() + " (" + messageAttachment.getSize() / 1024 + "kB)");
-				link.setStyleName(HupaCSS.C_hyperlink);
-				link.addClickHandler(new ClickHandler() {
-					public void onClick(ClickEvent event) {
-						String url = getUrl(messageAttachment, folder, uid, false);
-						if (downloadIframe == null)
-							Window.open(url, "_blank", "");
-						else
-							DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url);
-					}
-				});
-				HorizontalPanel aPanel = new HorizontalPanel();
-				aPanel.addStyleName(HupaCSS.C_attachment);
-				// aPanel.add(new Image(imageBundle.attachmentIcon()));
-				aPanel.add(link);
-				if (messageAttachment.isImage()) {
-					Anchor viewImageLink = new Anchor("View", getUrl(messageAttachment, folder, uid, true), "_blank");
-					viewImageLink.setStyleName(HupaCSS.C_attachment_view);
-					aPanel.add(viewImageLink);
-				}
-				attachments.add(aPanel);
-			}
-		}
-	}
-
-	private String getUrl(MessageAttachment messageAttachment, String folder, long uid, boolean inline) {
-		return GWT.getModuleBaseURL() + SConsts.SERVLET_DOWNLOAD + "?" + SConsts.PARAM_NAME + "="
-				+ messageAttachment.getName() + "&" + SConsts.PARAM_FOLDER + "=" + folder + "&" + SConsts.PARAM_UID
-				+ "=" + uid + (inline ? "&" + SConsts.PARAM_MODE + "=inline" : "");
-	}
-
-	@Override
-	public void clearContent() {
-		messageContentHTML.setHTML("");
-	}
-
-
-	interface Binder extends UiBinder<DockLayoutPanel, MessageContentView> {
-	}
-
-	private static Binder binder = GWT.create(Binder.class);
-
-	@Override
-	public HasClickHandlers getRaw() {
-		return rawButton;
-	}
-
-	@Override
-	public HasVisibility getRawPanel() {
-		return rawPanel;
-	}
-=======
-	interface MessageContentUiBinder extends UiBinder<HTMLPanel, MessageContentView> {
-=======
-	interface MessageContentUiBinder extends
-<<<<<<< HEAD
-			UiBinder<HTMLPanel, MessageContentView> {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-			UiBinder<VerticalPanel, MessageContentView> {
->>>>>>> prepare for message content panel
-=======
-	interface MessageContentUiBinder extends UiBinder<ScrollPanel, MessageContentView> {
->>>>>>> make message content work as expected partly
-=======
-	interface MessageContentUiBinder extends UiBinder<SimplePanel, MessageContentView> {
->>>>>>> beautify message list and content
-=======
-	interface MessageContentUiBinder extends UiBinder<DockLayoutPanel, MessageContentView> {
->>>>>>> fixed issue#64, add attachments region in message content view
-	}
-
-	private static MessageContentUiBinder binder = GWT.create(MessageContentUiBinder.class);
-
-=======
->>>>>>> show/hide attachment's panel according to the attachments size
 	@Override
 	public void fillMessageContent(String messageDetail) {
 		messageContentHTML.setHTML(messageDetail);
@@ -417,9 +78,6 @@ public class MessageContentView extends 
 		}
 	}
 
-<<<<<<< HEAD
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
 	@Override
 	public void setAttachments(List<MessageAttachment> attachements, final String folder, final long uid) {
 		attachments.clear();
@@ -457,37 +115,24 @@ public class MessageContentView extends 
 				+ "=" + uid + (inline ? "&" + SConsts.PARAM_MODE + "=inline" : "");
 	}
 
-<<<<<<< HEAD
->>>>>>> fixed issue#64, add attachments region in message content view
-=======
 	@Override
 	public void clearContent() {
 		messageContentHTML.setHTML("");
 	}
 
-<<<<<<< HEAD
->>>>>>> fixed issue#76 with adding delete handler event
-=======
 
 	interface Binder extends UiBinder<DockLayoutPanel, MessageContentView> {
 	}
 
 	private static Binder binder = GWT.create(Binder.class);
-<<<<<<< HEAD
->>>>>>> show/hide attachment's panel according to the attachments size
-=======
 
 	@Override
 	public HasClickHandlers getRaw() {
 		return rawButton;
 	}
-<<<<<<< HEAD
->>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window
-=======
 
 	@Override
 	public HasVisibility getRawPanel() {
 		return rawPanel;
 	}
->>>>>>> hide the show raw message button when not displaying a message and remove deprecated code
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml Mon Sep 23 07:04:08 2013
@@ -11,25 +11,11 @@
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	<ui:image field="buttons" src="res/buttons.png" />
-=======
->>>>>>> beautify message list and content
-=======
-	<ui:image field="buttons" src="res/buttons.png" />
->>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window
 	<ui:style>
 		.messageContent {
 			display: block;
 			background-color: white;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#64, add attachments region in message content view
 			width: 100%;
 			height: 100%;
 		}
@@ -61,74 +47,6 @@
 			min-height: 200px;
 			background: #f0f0f0;
 			padding: 8px;
-<<<<<<< HEAD
-		}
-		
-		.moreHeaders {
-			position: absolute;
-			top: 8px;
-            cursor: pointer;
-			right: 18px;
-			width: 18em;
-			text-align: right;
-			white-space: nowrap;
-		}
-		
-		@sprite  .inner {
-			gwt-image: 'buttons';
-			background-position: -29px -271px;
-			display: inline-block;
-			width: 16px;
-			height: 13px;
-			text-indent: 1000px;
-			overflow: hidden;
-		}
-	</ui:style>
-	<g:DockLayoutPanel unit="PX">
-		<g:center>
-			<g:DockLayoutPanel unit="PX" ui:field="thisPanel">
-				<g:north size="30">
-					<g:FlowPanel addStyleNames="{style.previewheader} {style.messageheader}">
-						<g:SimplePanel ui:field="rawPanel" addStyleNames="{style.moreHeaders}">
-
-							<g:Anchor ui:field="rawButton" addStyleNames="{style.inner}">Raw
-							</g:Anchor>
-						</g:SimplePanel>
-					</g:FlowPanel>
-				</g:north>
-				<g:center>
-					<g:ScrollPanel ui:field="messageContent"
-						addStyleNames="{style.messageContent}" />
-				</g:center>
-				<g:east size="0">
-					<g:FlowPanel ui:field="attachments" addStyleNames="{style.attachBox}">
-					</g:FlowPanel>
-				</g:east>
-			</g:DockLayoutPanel>
-		</g:center>
-	</g:DockLayoutPanel>
-=======
-	<g:HTMLPanel>MessageContent
-	</g:HTMLPanel>
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-	<g:VerticalPanel ui:field="messageContainer" />
->>>>>>> prepare for message content panel
-=======
-	<g:ScrollPanel>
-		<g:HTML ui:field="messageContent" />
-	</g:ScrollPanel>
->>>>>>> make message content work as expected partly
-=======
-			width:100%;
-			height:100%;
-		}
-	</ui:style>
-	<g:SimplePanel addStyleNames="{style.messageContent}">
-		<g:HTML ui:field="messageContent" />
-	</g:SimplePanel>
->>>>>>> beautify message list and content
-=======
 		}
 		
 		.moreHeaders {
@@ -174,9 +92,4 @@
 			</g:DockLayoutPanel>
 		</g:center>
 	</g:DockLayoutPanel>
-<<<<<<< HEAD
->>>>>>> fixed issue#64, add attachments region in message content view
-</ui:UiBinder>
-=======
 </ui:UiBinder>
->>>>>>> make cursor pointer to the right place

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java Mon Sep 23 07:04:08 2013
@@ -19,11 +19,6 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,7 +33,6 @@ import com.google.gwt.user.cellview.clie
 import com.google.gwt.user.cellview.client.SimplePager.TextLocation;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HasVisibility;
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.SimplePanel;
@@ -122,133 +116,15 @@ public class MessageListFooterView exten
 	}
 
 	interface MessageListFooterUiBinder extends UiBinder<HorizontalPanel, MessageListFooterView> {
-=======
-=======
-import org.apache.hupa.client.activity.MessageListFooterActivity;
-
->>>>>>> integrate all of the views to their corresponding activities and mappers
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.cellview.client.SimplePager;
-import com.google.gwt.user.cellview.client.SimplePager.TextLocation;
-import com.google.gwt.user.client.ui.Composite;
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
-
-public class MessageListFooterView extends Composite implements MessageListFooterActivity.Displayable {
-
-	@UiField(provided = true) SimplePager simplePager;
-
-	@UiField ListBox labels;
-	@UiField SimplePanel labelsPanel;
-	private List<LabelNode> folderNodes = new ArrayList<LabelNode>();
-
-	private static final String ROOT_PATH = "imap_root";
-
-	@Inject
-	public MessageListFooterView(final MessagesCellTable table, final HupaRequestFactory rf) {
-		SimplePager.Resources pagerResources = GWT.create(SimplePager.Resources.class);
-		simplePager = new SimplePager(TextLocation.CENTER, pagerResources, false, 0, true);
-		simplePager.setDisplay(table);
-		// simplePager.setRangeLimited(false);
-		initWidget(binder.createAndBindUi(this));
-
-		rf.fetchFoldersRequest().fetch(null, Boolean.TRUE).fire(new Receiver<List<ImapFolder>>() {
-
-			private String INTENTS = "&nbsp;&nbsp;&nbsp;&nbsp;";
-
-			@Override
-			public void onSuccess(List<ImapFolder> response) {
-				folderNodes.clear();
-				if (response == null || response.size() == 0) {
-				} else {
-					for (ImapFolder folder : response) {
-						fillCellList(folderNodes, folder, LabelNode.ROOT, "");
-					}
-				}
-
-				makeParentList();
-			}
-
-			private void fillCellList(List<LabelNode> folderNodes, ImapFolder curFolder, LabelNode parent,
-					String intents) {
-				LabelNode labelNode = new LabelNode();
-				labelNode.setFolder(curFolder);
-				labelNode.setName(curFolder.getName());
-				labelNode.setNameForDisplay(intents + curFolder.getName());
-				labelNode.setParent(parent);
-				labelNode.setPath(curFolder.getFullName());
-				folderNodes.add(labelNode);
-				if ("inbox".equalsIgnoreCase(curFolder.getName())) {
-					// if(selectionModel.getSelectedObject() == null){
-					// selectionModel.setSelected(labelNode, true);
-					// }
-				}
-				if (curFolder.getHasChildren()) {
-					for (ImapFolder subFolder : curFolder.getChildren()) {
-						fillCellList(folderNodes, subFolder, labelNode, intents + INTENTS);
-					}
-				}
-			}
-
-			@Override
-			public void onFailure(ServerFailure error) {
-				if (error.isFatal()) {
-					throw new RuntimeException(error.getMessage());
-				}
-			}
-
-		});
-	}
-
-	private void makeParentList() {
-		labels.clear();
-		labels.addItem("Move to...", ROOT_PATH);
-		for (LabelNode folderNode : this.folderNodes) {
-			labels.addItem(folderNode.getNameForDisplay().replace("&nbsp;&nbsp;", ". "), folderNode.getPath());
-		}
-
-	}
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	interface MessageListFooterUiBinder extends UiBinder<HTMLPanel, MessageListFooterView> {
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-	interface MessageListFooterUiBinder extends
-			UiBinder<HTMLPanel, MessageListFooterView> {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-	interface MessageListFooterUiBinder extends UiBinder<SimplePanel, MessageListFooterView> {
->>>>>>> make message list view panel work as expected partly
-=======
-	interface MessageListFooterUiBinder extends UiBinder<HorizontalPanel, MessageListFooterView> {
->>>>>>> remove deprecated code
 	}
 
 	private static MessageListFooterUiBinder binder = GWT.create(MessageListFooterUiBinder.class);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> try to rearrange the places and history managment.
 	@Override
 	public SimplePager getPager() {
 		return simplePager;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
 	@Override
 	public HasVisibility getLabelsPanel() {
 		return labelsPanel;
@@ -259,11 +135,4 @@ public class MessageListFooterView exten
 		return labels;
 	}
 
-<<<<<<< HEAD
-=======
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
->>>>>>> try to rearrange the places and history managment.
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml Mon Sep 23 07:04:08 2013
@@ -10,8 +10,6 @@
 	language governing permissions and limitations under the License. -->
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-<<<<<<< HEAD
-<<<<<<< HEAD
 	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
 
 	<ui:style>
@@ -24,34 +22,6 @@
 		<c:SimplePager ui:field="simplePager" />
 		<g:SimplePanel ui:field="labelsPanel" addStyleNames="{style.moveMessage}">
 			<g:ListBox ui:field="labels"></g:ListBox>
-<<<<<<< HEAD
 		</g:SimplePanel>
 	</g:HorizontalPanel>
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-	<g:HTMLPanel>MessageListFooter
-	</g:HTMLPanel>
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
-
-	<ui:style>
-		.moveMessage {
-		position:absolute;
-		right:20px;	
-		}
-	</ui:style>
-	<g:HorizontalPanel>
-		<c:SimplePager ui:field="simplePager" />
-<<<<<<< HEAD
-	</g:SimplePanel>
->>>>>>> make message list view panel work as expected partly
-=======
-		<g:SimplePanel addStyleNames="{style.moveMessage}">
-			<g:HTML>Hello</g:HTML>
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
-		</g:SimplePanel>
-	</g:HorizontalPanel>
->>>>>>> remove deprecated code
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Mon Sep 23 07:04:08 2013
@@ -19,24 +19,11 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.List;
-<<<<<<< HEAD
 import java.util.Set;
-=======
-import java.util.logging.Level;
-import java.util.logging.Logger;
->>>>>>> scrub code
 
 import org.apache.hupa.client.activity.MessageListActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.shared.domain.Message;
 
 import com.google.gwt.core.client.GWT;
@@ -45,7 +32,6 @@ import com.google.gwt.uibinder.client.Ui
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.RequiresResize;
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.inject.Inject;
@@ -63,184 +49,10 @@ public class MessageListView extends Com
 	}
 
 	interface MessageListUiBinder extends UiBinder<SimpleLayoutPanel, MessageListView> {
-=======
-=======
-=======
-import java.util.List;
-
->>>>>>> add click handler to every message row
-import org.apache.hupa.client.activity.MessageListActivity;
-=======
-=======
-import org.apache.hupa.client.place.DefaultPlace;
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-import org.apache.hupa.client.place.MailFolderPlace;
->>>>>>> make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's
-import org.apache.hupa.client.rf.FetchMessagesRequest;
-import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-=======
-=======
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
->>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar
-import org.apache.hupa.client.activity.MessageListActivity;
->>>>>>> scrub code
-import org.apache.hupa.client.rf.HupaRequestFactory;
-=======
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
-import org.apache.hupa.shared.domain.Message;
-
->>>>>>> integrate all of the views to their corresponding activities and mappers
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.Composite;
-=======
->>>>>>> Fix grid not resizing since we werent implementing RequiresResize in its container. In fact we could get rid of its container
-import com.google.gwt.user.client.ui.SimpleLayoutPanel;
-import com.google.gwt.view.client.MultiSelectionModel;
-import com.google.inject.Inject;
-
-public class MessageListView extends Composite implements MessageListActivity.Displayable, RequiresResize {
-
-	@UiField SimpleLayoutPanel thisView;
-	private MessagesCellTable grid;
-
-	@Inject
-	public MessageListView(final EventBus eventBus, final MessagesCellTable table) {
-		initWidget(binder.createAndBindUi(this));
-		grid = table;
-		thisView.add(grid);
-	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-	public void fetch(final int start) {
-		FetchMessagesRequest req = requestFactory.messagesRequest();
-		FetchMessagesAction action = req.create(FetchMessagesAction.class);
-		final ImapFolder f = req.create(ImapFolder.class);
-		f.setFullName(folder.getFullName());
-		action.setFolder(f);
-		action.setOffset(grid.getPageSize());
-		action.setSearchString(searchValue);
-		action.setStart(start);
-		req.fetch(action).fire(new Receiver<FetchMessagesResult>() {
-
-			@Override
-			public void onSuccess(final FetchMessagesResult result) {
-				assert result != null;
-				grid.setRowCount(result.getRealCount());
-				grid.setRowData(start, result.getMessages());
-			}
-
-			@Override
-			public void onFailure(ServerFailure error) {
-				placeController.goTo(new DefaultPlace("@"));
-				if (error.isFatal()) {
-					// FIXME should goto login page regarding the long time
-					// session expired.
-					throw new RuntimeException(error.getMessage());
-				}
-			}
-		});
-	}
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	interface MessageListUiBinder extends UiBinder<HTMLPanel, MessageListView> {
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-	interface MessageListUiBinder extends UiBinder<SimplePanel, MessageListView> {
->>>>>>> try to integrate the messages list's panel
-=======
-	interface MessageListUiBinder extends UiBinder<LayoutPanel, MessageListView> {
->>>>>>> make message list view panel work as expected partly
-=======
-	interface MessageListUiBinder extends UiBinder<MessagesCellTable, MessageListView> {
->>>>>>> adjust to the ui of folder list panel
-=======
-	interface MessageListUiBinder extends UiBinder<DataGrid, MessageListView> {
->>>>>>> deal with onResizeEvent of folder list panel, but found issue #25
-=======
-	interface MessageListUiBinder extends
-			UiBinder<DataGrid<Message>, MessageListView> {
->>>>>>> prepare for place management and history controller
-=======
-=======
->>>>>>> let messages list activity make use of mvp
-=======
-
-<<<<<<< HEAD
->>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar
-	interface MessageListUiBinder extends UiBinder<DataGrid<Message>, MessageListView> {
->>>>>>> coping with reply and forward sending message
-=======
-	interface MessageListUiBinder extends UiBinder<SimpleLayoutPanel, MessageListView> {
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
 	}
 
 	private static MessageListUiBinder binder = GWT.create(MessageListUiBinder.class);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	public MessagesCellTable getGrid() {
-		return grid;
-	}
-	
-	@Override
-	public void refresh(){
-		grid.refresh();
-	}
-
-	@Override
-	public List<Long> getSelectedMessagesIds() {
-		List<Long> selecteds = new ArrayList<Long>();
-		MultiSelectionModel<? super Message> selectionModel = (MultiSelectionModel<? super Message>) grid
-				.getSelectionModel();
-		selectionModel.getSelectedSet();
-		for (Message msg : getSelectedMessages()) {
-			selecteds.add(msg.getUid());
-		}
-		return selecteds;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Set<Message> getSelectedMessages() {
-		MultiSelectionModel<? super Message> selectionModel = (MultiSelectionModel<? super Message>) grid
-				.getSelectionModel();
-		return (Set<Message>) selectionModel.getSelectedSet();
-	}
-
-    @Override
-    public void onResize() {
-        grid.onResize();
-    }
-    
-    @Override
-    public void setSearchValue(String searchValue){
-    	grid.setSearchValue(searchValue);
-    	
-    }
-
-=======
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-=======
-
->>>>>>> let messages list activity make use of mvp
-=======
->>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar
 	@Override
 	public MessagesCellTable getGrid() {
 		return grid;
@@ -251,11 +63,6 @@ public class MessageListView extends Com
 		grid.refresh();
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> prepare for place management and history controller
-=======
-=======
 	@Override
 	public List<Long> getSelectedMessagesIds() {
 		List<Long> selecteds = new ArrayList<Long>();
@@ -275,11 +82,7 @@ public class MessageListView extends Com
 				.getSelectionModel();
 		return (Set<Message>) selectionModel.getSelectedSet();
 	}
->>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar
 
-<<<<<<< HEAD
->>>>>>> let messages list activity make use of mvp
-=======
     @Override
     public void onResize() {
         grid.onResize();
@@ -291,5 +94,4 @@ public class MessageListView extends Com
     	
     }
 
->>>>>>> Fix grid not resizing since we werent implementing RequiresResize in its container. In fact we could get rid of its container
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml Mon Sep 23 07:04:08 2013
@@ -10,51 +10,6 @@
 	language governing permissions and limitations under the License. -->
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 	<g:SimpleLayoutPanel ui:field="thisView" />
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-<<<<<<< HEAD
-	<g:HTMLPanel>MessageList
-	</g:HTMLPanel>
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-	<g:SimplePanel>
-		<g:HTMLPanel>MessageList
-		</g:HTMLPanel>
-	</g:SimplePanel>
->>>>>>> try to integrate the messages list's panel
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
-	<g:LayoutPanel>
-		<g:layer>
-			<hupa:MessagesCellTable ui:field="table" />
-		</g:layer>
-	</g:LayoutPanel>
->>>>>>> make message list view panel work as expected partly
-=======
-	xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
-	<hupa:MessagesCellTable ui:field="table" />
->>>>>>> adjust to the ui of folder list panel
-=======
-	xmlns:hupa='urn:import:org.apache.hupa.client.ui' xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
-<<<<<<< HEAD
-<<<<<<< HEAD
-	<c:DataGrid ui:field="table" />
->>>>>>> deal with onResizeEvent of folder list panel, but found issue #25
-=======
-	<c:DataGrid ui:field="grid" />
->>>>>>> prepare for place management and history controller
-=======
-	<hupa:MessagesCellTable ui:field="grid" />
->>>>>>> try to link the mark actions to rf services
-=======
-    xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-	<g:SimpleLayoutPanel ui:field="thisView" />
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
 </ui:UiBinder>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message