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 [4/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/place/DefaultPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.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,7 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.client.place;
 
 import com.google.gwt.place.shared.PlaceTokenizer;
@@ -44,7 +38,6 @@ public class DefaultPlace extends Abstra
 	}
 
 	@Prefix("")
-<<<<<<< HEAD
 	public static class Tokenizer implements PlaceTokenizer<DefaultPlace> {
 
 		@Override
@@ -57,69 +50,5 @@ public class DefaultPlace extends Abstra
 			return place.getToken();
 		}
 	}
-=======
-=======
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.client.place;
-
-import com.google.gwt.place.shared.PlaceTokenizer;
-import com.google.gwt.place.shared.Prefix;
-
-public class DefaultPlace extends AbstractPlace {
-
-<<<<<<< HEAD
-  @Prefix("!")
-  public static class Tokenizer implements PlaceTokenizer<DefaultPlace> {
-
-    @Override
-    public DefaultPlace getPlace(String token) {
-      return new DefaultPlace();
-    }
-
-    @Override
-    public String getToken(DefaultPlace place) {
-      return "login";
-    }
-  }
-<<<<<<< HEAD
-  
-  public String toString(){
-	  return this.getClass().getName()+"->[home page]";
-  }
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-=======
-	String token;
-
-	public DefaultPlace(String token) {
-		this.token = token;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	@Prefix("!")
-=======
->>>>>>> scrub code, remove deprecated code
-	public static class Tokenizer implements PlaceTokenizer<DefaultPlace> {
-
-		@Override
-		public DefaultPlace getPlace(String token) {
-			return new DefaultPlace(token);
-		}
-
-		@Override
-		public String getToken(DefaultPlace place) {
-			return place.getToken();
-		}
-	}
->>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token
 
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java Mon Sep 23 07:04:08 2013
@@ -19,208 +19,23 @@
 
 package org.apache.hupa.client.place;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.client.activity.IMAPMessageActivity;
->>>>>>> 1. improve the inbox folder place.
-=======
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.Message;
-import org.apache.hupa.shared.data.MessageDetails;
-import org.apache.hupa.shared.data.User;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
-=======
-import org.apache.hupa.shared.data.ImapFolderImpl;
-<<<<<<< HEAD
-import org.apache.hupa.shared.data.MessageDetails;
-<<<<<<< HEAD
-import org.apache.hupa.shared.data.User;
-<<<<<<< HEAD
-import org.apache.hupa.shared.proxy.ImapFolder;
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
-=======
-import org.apache.hupa.shared.domain.ImapFolder;
->>>>>>> Allow client can use the domain entity interface.
-=======
-=======
->>>>>>> try to get message details, problem is:
-=======
->>>>>>> forward and reply message to use RF
-import org.apache.hupa.shared.domain.ImapFolder;
-import org.apache.hupa.shared.domain.Message;
-import org.apache.hupa.shared.domain.MessageDetails;
-import org.apache.hupa.shared.domain.User;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-
-=======
->>>>>>> 
-=======
-
-<<<<<<< HEAD
->>>>>>> 1. improve the inbox folder place.
-import com.google.gwt.place.shared.Place;
-import com.google.gwt.place.shared.PlaceTokenizer;
-import com.google.gwt.place.shared.Prefix;
-
-public class IMAPMessagePlace extends Place {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	
-	private Message message;
-	private MessageDetails messageDetails;
-	private IMAPFolderProxy folder;
-=======
-	
-=======
-=======
-=======
->>>>>>> try to rearrange the places and history managment.
 import com.google.gwt.place.shared.PlaceTokenizer;
 import com.google.gwt.place.shared.Prefix;
 
-<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
-public class IMAPMessagePlace extends AbstractPlace {
-<<<<<<< HEAD
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-
->>>>>>> forward and reply message to use RF
-	private Message message;
-	private MessageDetails messageDetails;
-<<<<<<< HEAD
-<<<<<<< HEAD
-	private IMAPFolder folder;
->>>>>>> 1. improve the inbox folder place.
-=======
-	private IMAPFolderProxy folder;
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
-	private ImapFolder folder;
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
-	private User user;
-//	private String messageId;
-
-	public IMAPMessagePlace(String token) {
-//		this.messageId = token;
-	}
-	
-	public IMAPMessagePlace(MessageDetails messageDetails){
-		this.messageDetails = messageDetails;
-	}
-
-	public Message getMessage() {
-		return message;
-	}
-
-	public MessageDetails getMessageDetails() {
-		return messageDetails;
-	}
-<<<<<<< HEAD
-
-	public IMAPFolderProxy getFolder() {
-		return folder;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-@Prefix("message")
-=======
-
-  @Prefix("IMAPMessage")
->>>>>>> 
-=======
-
-	public ImapFolder getFolder() {
-		return folder;
-	}
-
-	public User getUser() {
-		return user;
-=======
-	String token;
-	public IMAPMessagePlace(String token){
-=======
 public class FolderPlace extends HupaPlace {
 
 	private String token;
 
 	public FolderPlace(String token) {
->>>>>>> change place management and make refresh folder and message list more gentle:client/src/main/java/org/apache/hupa/client/place/FolderPlace.java
 		this.token = token;
->>>>>>> try to rearrange the places and history managment.
 	}
 
-<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
-<<<<<<< HEAD
-@Prefix("message")
->>>>>>> 1. improve the inbox folder place.
-  public static class Tokenizer implements PlaceTokenizer<IMAPMessagePlace> {
-
-    @Override
-    public IMAPMessagePlace getPlace(String token) {
-      return new IMAPMessagePlace();
-    }
-
-    @Override
-    public String getToken(IMAPMessagePlace place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-      return String.valueOf(place.getMessage().getUid());
-=======
-      return "IMAPMessage";
->>>>>>> 
-=======
-      return String.valueOf(place.getMessage().getUid());
->>>>>>> 1. improve the inbox folder place.
-    }
-  }
-  
-  public String toString(){
-	  return this.getClass().getName()+"->[IMAPMessage]";
-  }
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public IMAPMessagePlace with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails){
-=======
-	public IMAPMessagePlace with(User user, IMAPFolder folder, Message message, MessageDetails messageDetails){
->>>>>>> 1. improve the inbox folder place.
-=======
-	public IMAPMessagePlace with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails){
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
-	public IMAPMessagePlace with(User user, ImapFolder folder, Message message, MessageDetails messageDetails){
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
-      this.message = message;
-      this.messageDetails = messageDetails;
-      this.folder = folder;
-      this.user = user;
-      return this;
-=======
-	@Prefix("message")
-	public static class Tokenizer implements PlaceTokenizer<IMAPMessagePlace> {
-=======
 	public String getToken() {
 		return token;
 	}
 
 	@Prefix("folder")
 	public static class Tokenizer implements PlaceTokenizer<FolderPlace> {
->>>>>>> change place management and make refresh folder and message list more gentle:client/src/main/java/org/apache/hupa/client/place/FolderPlace.java
 
 		@Override
 		public FolderPlace getPlace(String token) {
@@ -232,41 +47,6 @@ public class FolderPlace extends HupaPla
 			return place.getToken();
 		}
 	}
-<<<<<<< HEAD
-<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
-
-<<<<<<< HEAD
-	public IMAPMessagePlace with(User user, ImapFolder folder, Message message, MessageDetails messageDetails) {
-		this.message = message;
-		this.messageDetails = messageDetails;
-		this.folder = folder;
-		this.user = user;
-		return this;
->>>>>>> forward and reply message to use RF
-	}
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 
-=======
->>>>>>> 1. improve the inbox folder place.
-=======
-	public String getMessageId() {
-		return messageId;
-=======
-	public String getToken() {
-		return token;
->>>>>>> try to rearrange the places and history managment.
-	}
-
->>>>>>> prepare for message content panel
-=======
->>>>>>> make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's
-=======
->>>>>>> change place management and make refresh folder and message list more gentle:client/src/main/java/org/apache/hupa/client/place/FolderPlace.java
-=======
 //
 //	@Override
 //	public boolean equals(Object o) {
@@ -287,5 +67,4 @@ public class FolderPlace extends HupaPla
 //		result = prime * result + ((token == null) ? 0 : token.hashCode());
 //		return result;
 //	}
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Succeed creating new folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteFolderRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete and rename folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchFoldersRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchFoldersRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchFoldersRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchFoldersRequest.java Mon Sep 23 07:04:08 2013
@@ -31,13 +31,5 @@ import com.google.web.bindery.requestfac
 
 @Service(value = FetchFoldersService.class, locator = IocRfServiceLocator.class)
 public interface FetchFoldersRequest extends RequestContext {
-<<<<<<< HEAD
-<<<<<<< HEAD
 	Request<List<ImapFolder>> fetch(ImapFolder imapFolder, Boolean recursive);
-=======
-	Request<List<ImapFolder>> fetch(ImapFolder imapFolder);
->>>>>>> Fix issue #15.
-=======
-	Request<List<ImapFolder>> fetch(ImapFolder imapFolder, Boolean recursive);
->>>>>>> pull all folders for label settings
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> try to get message details, problem is:
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageRawRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java Mon Sep 23 07:04:08 2013
@@ -21,90 +21,12 @@ package org.apache.hupa.client.rf;
 import com.google.web.bindery.requestfactory.shared.RequestFactory;
 
 public interface HupaRequestFactory extends RequestFactory {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	SubjectRequest subjectRequest();
-
-=======
->>>>>>> Remove unused stuff
-	ImapFolderRequest folderRequest();
-
-	CheckSessionRequest sessionRequest();
-
-	LoginUserRequest loginRequest();
-
-	LogoutUserRequest logoutRequest();
-
-	FetchFoldersRequest fetchFoldersRequest();
-
-	FetchMessagesRequest messagesRequest();
-
-	MoveMessageRequest moveMessageRequest();
-
-	CreateFolderRequest createFolderRequest();
-
-	DeleteFolderRequest deleteFolderRequest();
-
-	RenameFolderRequest renameFolderRequest();
-
-	DeleteMessageByUidRequest deleteMessageByUidRequest();
-
-	DeleteMessageAllRequest deleteMessageAllRequest();
-
-	GetMessageDetailsRequest messageDetailsRequest();
-
-	SendMessageRequest sendMessageRequest();
-
-	SendForwardMessageRequest sendForwardMessageRequest();
-
-	SendReplyMessageRequest sendReplyMessageRequest();
-
-	IdleRequest idleRequest();
-
-	SetFlagRequest setFlagRequest();
-=======
-  SubjectRequest subjectRequest();
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-  UserRequest userRequest();
-  IMAPFolderRequestContext folderRequest();
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-=======
-  SubjectRequest subjectRequest();
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-  UserRequest userRequest();
-<<<<<<< HEAD
-  IMAPFolderRequestContext folderRequest();
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-=======
-  ImapFolderRequestContext folderRequest();
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
-=======
-	SubjectRequest subjectRequest();
-
 	ImapFolderRequest folderRequest();
 
 	CheckSessionRequest sessionRequest();
 
 	LoginUserRequest loginRequest();
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-	FetchMessagesRequest messagesRequest();
-<<<<<<< HEAD
->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
-=======
-=======
-=======
 
->>>>>>> fixed the requestfactory's quirk
 	LogoutUserRequest logoutRequest();
 
 	FetchFoldersRequest fetchFoldersRequest();
@@ -112,57 +34,26 @@ public interface HupaRequestFactory exte
 	FetchMessagesRequest messagesRequest();
 
 	MoveMessageRequest moveMessageRequest();
-<<<<<<< HEAD
->>>>>>> other RFs
-	CreateFolderRequest createFolderRequest();
-<<<<<<< HEAD
->>>>>>> Succeed creating new folder
-=======
-=======
 
 	CreateFolderRequest createFolderRequest();
 
->>>>>>> fixed the requestfactory's quirk
 	DeleteFolderRequest deleteFolderRequest();
 
 	RenameFolderRequest renameFolderRequest();
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> delete and rename folder
-=======
-=======
 
->>>>>>> fixed the requestfactory's quirk
 	DeleteMessageByUidRequest deleteMessageByUidRequest();
 
 	DeleteMessageAllRequest deleteMessageAllRequest();
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> delete messages, make WestActivity Singleton
-=======
-	GetMessageDetailsRequest messageDetailsRequest();
-<<<<<<< HEAD
->>>>>>> try to get message details, problem is:
-=======
-=======
 
 	GetMessageDetailsRequest messageDetailsRequest();
 
->>>>>>> fixed the requestfactory's quirk
 	SendMessageRequest sendMessageRequest();
 
 	SendForwardMessageRequest sendForwardMessageRequest();
 
 	SendReplyMessageRequest sendReplyMessageRequest();
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> forward and reply message to use RF
-=======
-=======
 
->>>>>>> fixed the requestfactory's quirk
 	IdleRequest idleRequest();
 
 	SetFlagRequest setFlagRequest();
->>>>>>> other RFs
 }
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IdleRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java Mon Sep 23 07:04:08 2013
@@ -21,30 +21,9 @@ package org.apache.hupa.client.rf;
 
 import java.util.List;
 
-<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequestContext.java
-<<<<<<< HEAD
-<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java
-import org.apache.hupa.server.service.IMAPFolderService;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
-=======
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-=======
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
-=======
-import org.apache.hupa.server.service.ImapFolderService;
-import org.apache.hupa.shared.proxy.ImapFolder;
->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequestContext.java
-=======
-import org.apache.hupa.server.locator.ImapFolderServiceLocator;
-=======
 import org.apache.hupa.server.ioc.IocRfServiceLocator;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.:client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java
 import org.apache.hupa.server.service.ImapFolderService;
 import org.apache.hupa.shared.domain.ImapFolder;
->>>>>>> Allow client can use the domain entity interface.
 
 import com.google.web.bindery.requestfactory.shared.Request;
 import com.google.web.bindery.requestfactory.shared.RequestContext;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LogoutUserRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/MoveMessageRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/RenameFolderRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> delete and rename folder
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendForwardMessageRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendForwardMessageRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendForwardMessageRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendForwardMessageRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendMessageRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendMessageRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendMessageRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendMessageRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendReplyMessageRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendReplyMessageRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendReplyMessageRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SendReplyMessageRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> forward and reply message to use RF
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SetFlagRequest.java Mon Sep 23 07:04:08 2013
@@ -1,7 +1,3 @@
-<<<<<<< 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 *
@@ -21,11 +17,6 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> other RFs
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.rf;
 
 import org.apache.hupa.server.ioc.IocRfServiceLocator;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml Mon Sep 23 07:04:08 2013
@@ -12,15 +12,7 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 	<ui:image field="buttons" src="res/buttons.png" />
-<<<<<<< HEAD
-<<<<<<< HEAD
 	<ui:style>
-=======
-	<ui:style type="org.apache.hupa.client.ui.ToolBarView.Style">
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-=======
-	<ui:style>
->>>>>>> 1.do not select the message which is being focused on. 2.create the mark popup menu
 		.bar {
 			position: absolute;
 			display: block;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Mon Sep 23 07:04:08 2013
@@ -37,64 +37,7 @@ import com.google.gwt.event.dom.client.H
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.SimpleLayoutPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
-
-public class __ComposePanel extends Composite {
-
-	@UiField protected SimplePanel composeHeaderContainer;
-	@UiField protected SimpleLayoutPanel composeContentContainer;
-	@UiField protected SimplePanel composeStatusContainer;
-
-	public __ComposePanel() {
-		initWidget(binder.createAndBindUi(this));
-	}
-
-	interface __ComposePanelUiBinder extends
-			UiBinder<DockLayoutPanel, __ComposePanel> {
-	}
-
-	private static __ComposePanelUiBinder binder = GWT
-			.create(__ComposePanelUiBinder.class);
-
-	public AcceptsOneWidget getComposeHeaderContainer() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				composeHeaderContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getComposeContentContainer() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				composeContentContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getComposeStatusContainer() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				composeStatusContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-=======
-=======
 import com.google.gwt.user.client.ui.Anchor;
->>>>>>> composing composing panel
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
@@ -510,5 +453,4 @@ public class ComposeView extends Composi
 
 	private static ComposeUiBinder binder = GWT.create(ComposeUiBinder.class);
 
->>>>>>> preparing for composing panel
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml Mon Sep 23 07:04:08 2013
@@ -10,60 +10,9 @@
 	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:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
-<<<<<<< HEAD
->>>>>>> preparing for composing panel
-	<ui:style>
-=======
 	<ui:image field="buttons" src="res/buttons.png" />
 	<ui:style type="org.apache.hupa.client.ui.ComposeView.Style">
-		@sprite .iconlink {
-			gwt-image: 'buttons';
-			background-position: -1000px 0;
-			width: auto;
-			height: auto;
-			display: inline-block;
-			color: #888;
-			text-decoration: none;
-			white-space: nowrap;
-			padding: 2px 8px 2px 20px;
-		}
-		
-		.left {
-			float: left;
-		}
-		
-		.right {
-			float: right;
-		}
-		
-		.operation {
-			margin: 0 -1px;
-		}
-		
-		.add {
-			background-position: -7px -357px;
-			margin-right: 6px;
-		}
-		
-		.formlinks {
-			padding: 0 4px;
-		}
-		
-		.hiddenInput {
-			display: none
-		}
-		
->>>>>>> beautify composing panel
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-	<ui:image field="buttons" src="res/buttons.png" />
-	<ui:style type="org.apache.hupa.client.ui.ComposeView.Style">
->>>>>>> make send text mail work excellently
 		.box {
 			border: 1px solid #A3A3A3;
 			border-radius: 4px;
@@ -93,15 +42,7 @@
 			border-bottom: 1px solid #dfdfdf;
 		}
 		
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> make send text mail work excellently
-		.composeHeader td {
-=======
 		.header td {
->>>>>>> make add operation buttons work according to the click events
 			padding: 3px 8px;
 		}
 		
@@ -119,9 +60,6 @@
 			bottom: 0;
 			width: 100%;
 			height: 26px;
-<<<<<<< HEAD
-=======
-=======
 		}
 		
 		@sprite .iconlink {
@@ -175,27 +113,13 @@
 			display: inner-block;
 		}
 		
->>>>>>> make send text mail work excellently
 		.headerTable {
 			display: table;
 			border-collapse: separate;
 			border-spacing: 2px;
 			border-color: gray;
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> preparing for composing panel
-=======
-			width: 99%;
-			margin: 4px 0;
->>>>>>> composing composing panel
-		}
-		
-		.composeHeader td {
-			padding: 3px 8px;
-=======
 			width: 99%;
 			margin: 4px 0;
->>>>>>> make send text mail work excellently
 		}
 		
 		.headerTable td {
@@ -213,17 +137,6 @@
 			white-space: nowrap;
 		}
 		
-<<<<<<< HEAD
-		.composebodycontainer {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 260px;
-			bottom: 0;
-		}
-		
-=======
->>>>>>> make send text mail work excellently
 		.composeattachments {
 			position: absolute;
 			right: 0;
@@ -236,21 +149,12 @@
 			overflow: auto;
 		}
 		
-<<<<<<< HEAD
-		.mailviewbottom {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			height: 26px;
-=======
 		.composebodycontainer {
 			position: absolute;
 			top: 0;
 			left: 0;
 			right: 260px;
 			bottom: 0;
->>>>>>> make send text mail work excellently
 		}
 		
 		.statusbar {
@@ -282,24 +186,13 @@
 	</ui:style>
 	<g:DockLayoutPanel ui:field="thisPanel" unit="PX"
 		addStyleNames="{style.box}">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		<g:north size="135">
-<<<<<<< HEAD
-			<g:SimplePanel ui:field="composeHeaderContainer"
-				addStyleNames="{style.composeHeader}">
-=======
 		<g:north size="135">
 			<g:SimplePanel ui:field="header" addStyleNames="{style.header}">
 				<g:FlexTable ui:field="headerTable" addStyleNames="{style.headerTable}" />
->>>>>>> make send text mail work excellently
 			</g:SimplePanel>
 		</g:north>
 		<g:center>
 			<g:SimpleLayoutPanel ui:field="composeContentContainer">
-<<<<<<< HEAD
-=======
 				<g:DockLayoutPanel unit="PX">
 					<g:north size="23">
 						<g:HTMLPanel addStyleNames="{style.composeoptionsbox}">composeOption</g:HTMLPanel>
@@ -320,49 +213,13 @@
 						</g:DockLayoutPanel>
 					</g:center>
 				</g:DockLayoutPanel>
->>>>>>> make send text mail work excellently
 			</g:SimpleLayoutPanel>
 		</g:center>
 		<g:south size="28">
 			<g:SimplePanel ui:field="composeStatusContainer"
-<<<<<<< HEAD
-				addStyleNames="{style.mailviewbottom}{style.box}" />
-=======
-=======
-		<g:north size="143">
->>>>>>> beautify composing panel
-=======
-		<g:north size="135">
->>>>>>> fine tuning the pixel of composing panel, while issue #35 should be fixed later
-			<g:SimplePanel ui:field="composeHeader" addStyleNames="{style.composeHeader}">
-				<g:FlexTable ui:field="headerTable" addStyleNames="{style.headerTable}" />
-			</g:SimplePanel>
-		</g:north>
-		<g:center>
-			<g:DockLayoutPanel ui:field="composeContent" unit="PX">
-				<g:north size="23">
-					<g:HTMLPanel addStyleNames="{style.composeoptionsbox}">composeOption</g:HTMLPanel>
-				</g:north>
-				<g:east size="257">
-					<g:HTMLPanel addStyleNames="{style.composeattachments}">composeAttachment
-					</g:HTMLPanel>
-				</g:east>
-				<g:center>
-					<g:HTMLPanel addStyleNames="{style.composebodycontainer}">composeBody</g:HTMLPanel>
-				</g:center>
-			</g:DockLayoutPanel>
-		</g:center>
-		<g:south size="28">
-			<g:SimplePanel ui:field="composeStatus"
-				addStyleNames="{style.mailviewbottom}{style.box}">
-				<g:HTMLPanel addStyleNames="{style.statusbar}">composeStatus</g:HTMLPanel>
-			</g:SimplePanel>
->>>>>>> preparing for composing panel
-=======
 				addStyleNames="{style.mailviewbottom}{style.box}">
 				<g:HTMLPanel addStyleNames="{style.statusbar}">composeStatus</g:HTMLPanel>
 			</g:SimplePanel>
->>>>>>> make send text mail work excellently
 		</g:south>
 	</g:DockLayoutPanel>
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Mon Sep 23 07:04:08 2013
@@ -19,18 +19,10 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#67; fixed issue#69 (with default select inbox folder); fixed issue#70;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hupa.client.HupaController;
-<<<<<<< HEAD
 import org.apache.hupa.client.activity.FolderListActivity;
 import org.apache.hupa.client.activity.MessageListActivity;
 import org.apache.hupa.client.activity.ToolBarActivity;
@@ -47,7 +39,6 @@ import com.google.gwt.uibinder.client.Ui
 import com.google.gwt.user.cellview.client.CellList;
 import com.google.gwt.user.cellview.client.HasKeyboardPagingPolicy.KeyboardPagingPolicy;
 import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy;
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.view.client.AsyncDataProvider;
@@ -214,251 +205,6 @@ public class FolderListView extends Comp
 		public void refresh() {
 			this.onRangeChanged(display);
 		}
-=======
-=======
-=======
-import java.util.logging.Logger;
-
->>>>>>> add a logger to folder list view for logging the switching activity
-=======
->>>>>>> scrub code
-=======
->>>>>>> fixed issue#67; fixed issue#69 (with default select inbox folder); fixed issue#70;
-import org.apache.hupa.client.activity.FolderListActivity;
-import org.apache.hupa.client.activity.MessageListActivity;
-import org.apache.hupa.client.activity.ToolBarActivity;
-import org.apache.hupa.client.place.FolderPlace;
-import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.shared.domain.ImapFolder;
-
-<<<<<<< HEAD
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-import com.google.gwt.cell.client.AbstractCell;
->>>>>>> fixed issue#67; fixed issue#69 (with default select inbox folder); fixed issue#70;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.place.shared.PlaceController;
-import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.cellview.client.CellList;
-=======
->>>>>>> fixed issue#79, using 100 as the assuming page size of labels list rather than CellList's default page size 25
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.SimplePanel;
-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 FolderListView extends Composite implements FolderListActivity.Displayable {
-	@UiField SimplePanel thisView;
-	@Inject private HupaController controller;
-	@Inject private ToolBarActivity.Displayable toolBar;
-	@Inject private MessageListActivity.Displayable msgListDisplay;
-	@Inject private PlaceController placeController;
-	private CellList<LabelNode> cellList;
-	private ShowMorePagerPanel pagerPanel;
-
-<<<<<<< HEAD
-	@Inject
-	public FolderListView(final FoldersTreeViewModel viewModel) {
-		initWidget(binder.createAndBindUi(this));
-<<<<<<< HEAD
-<<<<<<< HEAD
-//		if (place instanceof ComposePlace) {
-//			contactPanel = new HTMLPanel("contacts list");
-//			if (thisView.getWidget() != null
-//					&& thisView.getWidget() instanceof CellTree) {
-//				thisView.remove(cellTree);
-//			}
-//			thisView.add(contactPanel);
-//		} else {
-			cellTree = new RightCellTree(viewModel);
-			cellTree.setAnimationEnabled(true);
-//			if (thisView.getWidget() != null
-//					&& thisView.getWidget() instanceof HTMLPanel) {
-//				thisView.remove(contactPanel);
-//			}
-			thisView.add(cellTree);
-<<<<<<< HEAD
-		}
-<<<<<<< HEAD
-		cellTree.setAnimationEnabled(true);
-		initWidget(binder.createAndBindUi(this));
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
->>>>>>> make compose panel left another widget rather than cell tree
-=======
-//		}
->>>>>>> fixed issue#32
-=======
-		cellTree = new RightCellTree(viewModel);
-=======
-		this.viewModel = viewModel;
-		cellTree = new CellTree(viewModel,null,Resources.INSTANCE);
-<<<<<<< HEAD
->>>>>>> try to rearrange the places and history managment.
-		cellTree.setAnimationEnabled(true);
-=======
-//		cellTree.setAnimationEnabled(true);
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
-		thisView.add(cellTree);
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-	}
-	public interface Resources extends CellTree.Resources {
-=======
-	public interface Resources extends CellList.Resources {
->>>>>>> fixed issue#67; fixed issue#69 (with default select inbox folder); fixed issue#70;
-
-		Resources INSTANCE = GWT.create(Resources.class);
-
-		@Source("res/CssLabelListView.css")
-		public CellList.Style cellListStyle();
-	}
-	
-	public static final ProvidesKey<LabelNode> KEY_PROVIDER = new ProvidesKey<LabelNode>() {
-	      @Override
-	      public Object getKey(LabelNode item) {
-	        return item == null ? null : item.getPath();
-	      }
-	    };
-
-	@Inject
-	public FolderListView(final HupaRequestFactory rf) {
-		initWidget(binder.createAndBindUi(this));
-
-		data = new ImapLabelListDataProvider(rf);
-		pagerPanel = new ShowMorePagerPanel();
-		cellList = new CellList<LabelNode>(new FolderCell(), Resources.INSTANCE, KEY_PROVIDER);
-	    cellList.setKeyboardPagingPolicy(KeyboardPagingPolicy.INCREASE_RANGE);
-	    cellList.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.BOUND_TO_SELECTION);
-	    cellList.setPageSize(100);// ShowMorePagerPanel does not work at present. Therefore, assume one's labels are under one hundred
-		cellList.setSelectionModel(selectionModel);
-		selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
-			public void onSelectionChange(SelectionChangeEvent event) {
-				controller.showTopLoading("Loading...");
-				toolBar.enableAllTools(false);
-				placeController.goTo(new FolderPlace(selectionModel.getSelectedObject().getFolder().getFullName()));
-				msgListDisplay.refresh();
-			}
-		});
-		data.addDataDisplay(cellList);
-		pagerPanel.setDisplay(cellList);
-		thisView.setWidget(pagerPanel);
-	}
-
-	@Override
-	public void refresh() {
-		data.refresh();
-	}
-
-	public final SingleSelectionModel<LabelNode> selectionModel = new SingleSelectionModel<LabelNode>(
-			new ProvidesKey<LabelNode>() {
-				@Override
-				public Object getKey(LabelNode item) {
-					return item == null ? null : item.getPath();
-				}
-			});
-
-	class FolderCell extends AbstractCell<LabelNode> {
-		public FolderCell(String... consumedEvents) {
-			super(consumedEvents);
-		}
-		// TODO different images for each folder
-		@Override
-		public void render(Context context, LabelNode value, SafeHtmlBuilder sb) {
-			if (value != null) {
-				if (value.getFolder().getUnseenMessageCount() > 0) {
-					sb.appendHtmlConstant("<span style='right:6px;top:3px;font-weight:bold;'>");
-					sb.appendHtmlConstant(value.getNameForDisplay());
-					sb.appendHtmlConstant(" (" + value.getFolder().getUnseenMessageCount());
-					sb.appendHtmlConstant(")</span>");
-				} else {
-					sb.appendHtmlConstant(value.getNameForDisplay());
-				}
-			}
-		}
-	}
-
-	private final ImapLabelListDataProvider data;
-
-	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 (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);
-		}
 	}
 
 	interface FolderListUiBinder extends UiBinder<SimplePanel, FolderListView> {

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml Mon Sep 23 07:04:08 2013
@@ -10,42 +10,6 @@
 	language governing permissions and limitations under the License. -->
 
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	<g:SimplePanel ui:field="thisView" />
-=======
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'
-<<<<<<< HEAD
-	xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
->>>>>>> make folder list in west panel partly work
-=======
-	xmlns:hupa='urn:import:org.apache.hupa.client.ui'
-    xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
->>>>>>> track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN
-=======
-	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
-<<<<<<< HEAD
->>>>>>> make message list view panel work as expected partly
-	<g:SimplePanel ui:field="FolderListView">
-		<c:CellTree ui:field="cellTree" />
-	</g:SimplePanel>
->>>>>>> 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'>
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
-	<g:SimplePanel ui:field="thisView" />
->>>>>>> make compose panel left another widget rather than cell tree
-=======
-	<g:ScrollPanel ui:field="thisView" />
->>>>>>> fixed issue#67; fixed issue#69 (with default select inbox folder); fixed issue#70;
-=======
-	<g:SimplePanel ui:field="thisView" />
->>>>>>> fixed issue#79, using 100 as the assuming page size of labels list rather than CellList's default page size 25
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Mon Sep 23 07:04:08 2013
@@ -19,17 +19,6 @@
 
 package org.apache.hupa.client.ui;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.client.place.SettingPlace;
-=======
-import org.apache.hupa.client.evo.ActivityManagerInitializer;
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-
-=======
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -38,7 +27,6 @@ import com.google.gwt.user.client.ui.Acc
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.LayoutPanel;
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
-<<<<<<< HEAD
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -141,10 +129,6 @@ public class HupaLayout implements HupaL
 		return toolPanel.getSearchBoxView();
 	}
 	@Override
-	public AcceptsOneWidget getSearchBoxView() {
-		return toolPanel.getSearchBoxView();
-	}
-	@Override
 	public AcceptsOneWidget getFolderListView() {
 		return centerPanel.getFolderListView();
 	}
@@ -225,282 +209,10 @@ public class HupaLayout implements HupaL
 		mainBox.setWidgetLeftWidth(centerPanel, 0, Unit.PCT, (lyt & LAYOUT_MESSAGE) / LAYOUT_MESSAGE * 100, Unit.PCT);
 		mainBox.setWidgetTopHeight(centerPanel, 0, Unit.PCT, (lyt & LAYOUT_MESSAGE) / LAYOUT_MESSAGE * 100, Unit.PCT);
 	}
-	@Override
-	public void arrangeSettingLayout(SettingPlace sp) {
-		settingPanel.swithTo(sp);
-	}
-
-	interface HupaLayoutUiBinder extends UiBinder<LayoutPanel, HupaLayout> {
-	}
-
-	private static HupaLayoutUiBinder binder = GWT.create(HupaLayoutUiBinder.class);
-
-
-=======
-=======
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import com.google.gwt.uibinder.client.UiField;
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
->>>>>>> integrate them as a whole one - first: make the default place work
-=======
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> integrate all of the views to their corresponding activities and mappers
-import com.google.gwt.user.client.ui.LayoutPanel;
-=======
->>>>>>> deal with onResizeEvent of folder list panel, but found issue #25
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
-
-public class HupaLayout implements HupaLayoutable {
-
-	/*
-	 * The flag of layout can be defined as any single bit. such as: 0b0001
-	 * 0b0010 0b0100, namely, 0x01 0x02 0x04 respectively
-	 */
-	public static final int LAYOUT_MESSAGE = 0x01;
-	public static final int LAYOUT_COMPOSE = 0x02;
-	public static final int LAYOUT_CONTACT = 0x04;
-	public static final int LAYOUT_SETTING = 0x08;
-
-	@UiField SimplePanel topBarContainer;
-	@UiField SimplePanel logoContainer;
-	@UiField SimplePanel notificationContainer;
-	@UiField SimpleLayoutPanel navigationContainer;
-	@UiField _ToolPanel toolPanel;
-
-	@UiField LayoutPanel mainBox;
-
-	@UiField _CenterPanel centerPanel;
-	@UiField _CenterComposePanel composePanel;
-	@UiField _CenterSettingPanel settingPanel;
-	@UiField _CenterContactPanel contactPanel;
-
-	private LayoutPanel hupaMainPanel;
-
-	public HupaLayout() {
-		hupaMainPanel = binder.createAndBindUi(this);
-	}
-
-	@Override
-	public LayoutPanel get() {
-		return hupaMainPanel;
-	}
-
-	@Override
-	public void switchTo(int layout) {
-		arrangeLayout(layout);
-	}
-
-	@Override
-	public AcceptsOneWidget getTopBarView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				topBarContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	@Override
-	public AcceptsOneWidget getLogoView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				logoContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	@Override
-	public AcceptsOneWidget getNotificationView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				notificationContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-	@Override
-	public AcceptsOneWidget getNavigationView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				navigationContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	@Override
-	public AcceptsOneWidget getToolBarView() {
-		return toolPanel.getToolBarView();
-	}
-
-	@Override
-	public AcceptsOneWidget getComposeView() {
-		return composePanel.getComposeView();
-	}
-
-	@Override
-	public AcceptsOneWidget getComposeToolBarView() {
-		return toolPanel.getComposeToolBarView();
-	}
-
-	@Override
-	public AcceptsOneWidget getFolderListView() {
-		return centerPanel.getFolderListView();
-	}
-	@Override
-	public AcceptsOneWidget getContactListView() {
-		return composePanel.getContactListView();
-	}
-
-	@Override
-	public AcceptsOneWidget getMessageListView() {
-		return centerPanel.getMessageListView();
-	}
-
-	@Override
-	public AcceptsOneWidget getMessageListFooterView() {
-		return centerPanel.getMessageListFooterView();
-	}
-
-	@Override
-	public AcceptsOneWidget getMessageContentView() {
-		return centerPanel.getMessageContentView();
-	}
-
-	@Override
-	public AcceptsOneWidget getStatusView() {
-		return centerPanel.getStatusView();
-	}
-
-	@Override
-	public AcceptsOneWidget getLabelListView() {
-		return settingPanel.getLabelListView();
-	}
-
-	@Override
-	public AcceptsOneWidget getSettingNavView() {
-		return settingPanel.getSettingNavView();
-	}
-	
-	@Override
-	public AcceptsOneWidget getLabelPropertiesView() {
-		return settingPanel.getLabelPropertiesView();
-	}
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	public AcceptsOneWidget getComposeHeader() {
-		return centerPanel.getComposeHeader();
-	}
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-public interface HupaLayout {
-	LayoutPanel get();
->>>>>>> move new theme ui from experiment to hupa evo
-=======
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-	@Override
-	public AcceptsOneWidget getComposeContent() {
-		return centerPanel.getComposeContent();
-	}
-
-	@Override
-<<<<<<< HEAD
-	public void switchToMessage() {
-		if (isMessageOccupied())
-			return;
-		if (isComposeOccupied()) {
-			changeToMessage();
-		}
-	}
-
-<<<<<<< HEAD
->>>>>>> could change main panel dynamically currently by clicking the compose button
-=======
-	private void changeToMessage() {
-		centerPanel.thisPanel.remove(centerPanel.composePanel);
-		centerPanel.thisPanel.add(centerPanel.contentPanel);
-		centerPanel.temporarilyHiddenTheUnimplementedContactPanel(false);
-=======
-	public AcceptsOneWidget getComposeStatus() {
-		return centerPanel.getComposeStatus();
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-	}
-
-=======
->>>>>>> make send text mail work excellently
-	interface HupaLayoutUiBinder extends UiBinder<LayoutPanel, HupaLayout> {
-	}
-
-<<<<<<< HEAD
->>>>>>> scrub code
-=======
-	private static HupaLayoutUiBinder binder = GWT
-			.create(HupaLayoutUiBinder.class);
-<<<<<<< HEAD
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-=======
-=======
-=======
-	@Override
-	public AcceptsOneWidget getContactsListView() {
-		return contactPanel.getContactListView();
-	}
-
-	@Override
-	public AcceptsOneWidget getContactPropertiesView() {
-		return contactPanel.getContactPropertiesView();
-	}
-
->>>>>>> prepared for issue#73, established the UI layout
-	private void arrangeLayout(int lyt) {
-		toolPanel.toggleTo(lyt);
-		showOrHideMessage(lyt);
-		showOrHideCompose(lyt);
-		showOrHideSetting(lyt);
-		showOrHideContact(lyt);
-	}
-
-	private void showOrHideContact(int lyt) {
-		mainBox.setWidgetLeftWidth(contactPanel, 0, Unit.PCT, (lyt & LAYOUT_CONTACT) / LAYOUT_CONTACT * 100, Unit.PCT);
-		mainBox.setWidgetTopHeight(contactPanel, 0, Unit.PCT, (lyt & LAYOUT_CONTACT) / LAYOUT_CONTACT * 100, Unit.PCT);
-	}
-
-	private void showOrHideSetting(int lyt) {
-		mainBox.setWidgetLeftWidth(settingPanel, 0, Unit.PCT, (lyt & LAYOUT_SETTING) / LAYOUT_SETTING * 100, Unit.PCT);
-		mainBox.setWidgetTopHeight(settingPanel, 0, Unit.PCT, (lyt & LAYOUT_SETTING) / LAYOUT_SETTING * 100, Unit.PCT);
-	}
->>>>>>> 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.
-
-	private void showOrHideCompose(int lyt) {
-		mainBox.setWidgetLeftWidth(composePanel, 0, Unit.PCT, (lyt & LAYOUT_COMPOSE) / LAYOUT_COMPOSE * 100, Unit.PCT);
-		mainBox.setWidgetTopHeight(composePanel, 0, Unit.PCT, (lyt & LAYOUT_COMPOSE) / LAYOUT_COMPOSE * 100, Unit.PCT);
-	}
-<<<<<<< HEAD
->>>>>>> attempt to add label setting feature
-=======
-
-	private void showOrHideMessage(int lyt) {
-		mainBox.setWidgetLeftWidth(centerPanel, 0, Unit.PCT, (lyt & LAYOUT_MESSAGE) / LAYOUT_MESSAGE * 100, Unit.PCT);
-		mainBox.setWidgetTopHeight(centerPanel, 0, Unit.PCT, (lyt & LAYOUT_MESSAGE) / LAYOUT_MESSAGE * 100, Unit.PCT);
-	}
 
 	interface HupaLayoutUiBinder extends UiBinder<LayoutPanel, HupaLayout> {
 	}
 
 	private static HupaLayoutUiBinder binder = GWT.create(HupaLayoutUiBinder.class);
 
->>>>>>> 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.
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Mon Sep 23 07:04:08 2013
@@ -1,23 +1,10 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
 	<ui:image field="buttons" src="res/buttons.png" />
-<<<<<<< HEAD
-<<<<<<< HEAD
 	<ui:image field="originLogo" src="res/hupa-logo-original-transparent.png" />
 	<ui:style>
 		.minWidth {
 			min-width: 700px;
-<<<<<<< HEAD
-=======
-=======
-	<ui:image field="originLogo" src="res/hupa-logo-original-transparent.png" />
->>>>>>> beautify message list and content
-	<ui:style>
-		.minWidth {
-			min-width: 1150px;
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
 		}
 		
 		.feature {
@@ -31,238 +18,32 @@
 			background: -ms-linear-gradient(top, #404040 0%, #060606 100%);
 			background: linear-gradient(top, #404040 0%, #060606 100%);
 		}
-<<<<<<< HEAD
-<<<<<<< HEAD
-	</ui:style>
-	<g:LayoutPanel addStyleNames="{style.minWidth}">
-		<g:layer left='0' right='0' top='0' height='92px'>
-			<g:DockLayoutPanel unit="PX" ui:field="Header">
-				<g:north size="23">
-					<g:SimplePanel ui:field="topBarContainer" />
-=======
-		
-		.folderList {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			min-width: 144px;
-			bottom: 0;
-			overflow-x: hidden;
-			overflow-y: auto;
-		}
-		
-		.box {
-			border: 1px solid #A3A3A3;
-			border-radius: 4px;
-			overflow: hidden;
-			box-shadow: 0 0 2px #999;
-			-o-box-shadow: 0 0 2px #999;
-			-webkit-box-shadow: 0 0 2px #999;
-			-moz-box-shadow: 0 0 2px #999;
-			background: white;
-		}
-		
-		.listBox {
-			background: #D9ECF4;
-			overflow: hidden;
-		}
-		
-		.box .boxFooter {
-			border-radius: 0 0 4px 4px;
-		}
-		
-		.listBox .boxFooter {
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			width: 100%;
-			height: 42px;
-			border-top: 1px solid #CCDDE4;
-			background: #D9ECF4;
-			-webkit-box-shadow: inset 0 1px 0 0 white;
-			-moz-box-shadow: inset 0 1px 0 0 #fff;
-			box-shadow: inset 0 1px 0 0 white;
-			white-space: nowrap;
-			overflow: hidden;
-		}
-		
-		.messageListFooter {
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			height: 22px;
-			padding: 4px 8px;
-			border-top: 1px solid #ddd;
-			background: #ebebeb;
-			background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ebebeb),
-				color-stop(100%, #c6c6c6) );
-			background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			border-radius: 0 0 4px 4px;
-		}
-		
-		@sprite .messageContent {
-			margin: 8px;
-			gwt-image: 'originLogo';
-			background-position: center center;
-			width: auto;
-			height: auto;
-			filter: grayscale(100%);
-			-webkit-filter: grayscale(100%);
-			-moz-filter: grayscale(100%);
-			-ms-filter: grayscale(100%);
-			-o-filter: grayscale(100%);
-			opacity: 0.7;
-		}
-		
-		@sprite .messageContentWorkAround {
-			margin: 8px 0 8px 8px;
-			padding-right: 8px;
-			gwt-image: 'originLogo';
-			background-position: center center;
-			width: auto;
-			height: auto;
-		}
-=======
->>>>>>> split the layout panel to little ones
 	</ui:style>
 	<g:LayoutPanel addStyleNames="{style.minWidth}">
 		<g:layer left='0' right='0' top='0' height='92px'>
 			<g:DockLayoutPanel unit="PX" ui:field="Header">
 				<g:north size="23">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-					<hupa:TopBarView />
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-					<hupa:TopBarView ui:field="topBarView"/>
->>>>>>> integrate them as a whole one - first: make the default place work
-=======
-					<g:SimplePanel>
-						<hupa:TopBarView ui:field="topBarView" />
-					</g:SimplePanel>
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-=======
-					<g:SimplePanel ui:field="topBarContainer"/>
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
 					<g:SimplePanel ui:field="topBarContainer" />
->>>>>>> make message list view panel work as expected partly
 				</g:north>
 				<g:center>
 					<g:LayoutPanel addStyleNames="{style.feature}"
 						ui:field="HupaFeature">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 
-=======
-						
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
-=======
-
->>>>>>> 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.
 						<g:layer width="177px" left="10px">
 							<g:SimplePanel ui:field="logoContainer" />
 						</g:layer>
 						<g:layer>
-<<<<<<< HEAD
-<<<<<<< HEAD
-							<g:SimplePanel ui:field="notificationContainer" />
-						</g:layer>
-						<g:layer width="287px" right="0">
-							<g:SimpleLayoutPanel ui:field="navigationContainer" />
-=======
-						<g:layer width="177px" left="10px">
-							<g:SimplePanel ui:field="logoContainer" />
-						</g:layer>
-<<<<<<< HEAD
-						<g:layer width="301px" right="0">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-							<hupa:NavigationView />
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-						</g:layer>
-					</g:LayoutPanel>
-				</g:center>
-			</g:DockLayoutPanel>
-		</g:layer>
-<<<<<<< HEAD
-		<g:layer left='10px' right='10px' top='84px' bottom="20px">
-			<g:DockLayoutPanel>
-				<g:north size="44">
-					<hupa:_ToolPanel ui:field="toolPanel" />
-				</g:north>
-				<g:center>
-					<g:LayoutPanel ui:field="mainBox">
-						<g:layer left="0%" width="100%" top="0%" height="100%">
-							<hupa:_CenterPanel ui:field="centerPanel" />
-						</g:layer>
-						<g:layer left="0%" width="0%" top="0%" height="0%">
-							<hupa:_CenterSettingPanel ui:field="settingPanel" />
-=======
-							<hupa:NavigationView ui:field="navigationView"/>
->>>>>>> integrate them as a whole one - first: make the default place work
-=======
-							<g:SimplePanel>
-								<hupa:NavigationView ui:field="navigationView" />
-							</g:SimplePanel>
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-=======
-=======
-=======
-						  <g:SimplePanel ui:field="notificationContainer" />
-=======
 							<g:SimplePanel ui:field="notificationContainer" />
->>>>>>> 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.
 						</g:layer>
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
 						<g:layer width="287px" right="0">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN
-							<g:LayoutPanel ui:field="navigationContainer"/><!-- why can not be SimplePanel here -->
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-							<g:LayoutPanel ui:field="navigationContainer" /><!-- 
-								why can not be SimplePanel here -->
->>>>>>> make message list view panel work as expected partly
-=======
-							<g:LayoutPanel ui:field="navigationContainer" />
->>>>>>> DataGrid requires to be put in a LayoutPanel or Panel that implements the ProvidesResize interface to be visible
-=======
 							<g:SimpleLayoutPanel ui:field="navigationContainer" />
->>>>>>> deal with onResizeEvent of folder list panel, but found issue #25
 						</g:layer>
-                        <g:layer left="0%" width="0%" top="0%" height="0%">
-                            <hupa:_CenterContactPanel ui:field="contactPanel" />
-                        </g:layer>
-                        <g:layer left="0%" width="0%" top="0%" height="0%">
-                            <hupa:_CenterComposePanel ui:field="composePanel" />
-                        </g:layer>
 					</g:LayoutPanel>
 				</g:center>
 			</g:DockLayoutPanel>
 		</g:layer>
-<<<<<<< HEAD
-=======
-		<g:layer left='10px' right='10px' top='88px' bottom="20px">
-=======
 		<g:layer left='10px' right='10px' top='84px' bottom="20px">
-<<<<<<< HEAD
->>>>>>> make fine tuning with tool buttons in toolbar
-			<g:DockLayoutPanel ui:field="mainBox">
-=======
 			<g:DockLayoutPanel>
->>>>>>> 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.
 				<g:north size="44">
 					<hupa:_ToolPanel ui:field="toolPanel" />
 				</g:north>
@@ -283,11 +64,6 @@
 					</g:LayoutPanel>
 				</g:center>
 			</g:DockLayoutPanel>
-<<<<<<< HEAD
-		</g:layer> -->
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
 		</g:layer>
->>>>>>> integrate them as a whole one - first: make the default place work
 	</g:LayoutPanel>
 </ui:UiBinder>



---------------------------------------------------------------------
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