Author: dongxu
Date: Thu Sep 12 03:36:16 2013
New Revision: 1522222
URL: http://svn.apache.org/r1522222
Log:
commit frequently based on (http://t.cn/zjxJ71X), there should be more robust
and user-friendly features to develop.
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522222&r1=1522221&r2=1522222&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 03:36:16 2013
@@ -165,7 +165,6 @@ import org.apache.hupa.client.rf.HupaReq
import org.apache.hupa.client.ui.AppLayout;
import org.apache.hupa.client.ui.AppLayoutImpl;
import org.apache.hupa.client.ui.FoldersTreeViewModel;
-import org.apache.hupa.client.ui.FoldersCellTree;
import org.apache.hupa.client.ui.IMAPMessageListView;
<<<<<<< HEAD
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java?rev=1522222&r1=1522221&r2=1522222&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
Thu Sep 12 03:36:16 2013
@@ -26,6 +26,7 @@
package org.apache.hupa.client.place;
import org.apache.hupa.client.activity.MessageSendActivity.Type;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -72,6 +73,8 @@ import org.apache.hupa.shared.domain.Ima
=======
=======
>>>>>>> try to get message details, problem is:
+=======
+>>>>>>> commit frequently based on (http://t.cn/zjxJ71X), there should be more
robust and user-friendly features to develop.
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java?rev=1522222&r1=1522221&r2=1522222&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
Thu Sep 12 03:36:16 2013
@@ -19,7 +19,6 @@
package org.apache.hupa.client.validation;
-import com.google.gwt.regexp.shared.RegExp;
import com.google.gwt.user.client.ui.HasText;
import eu.maydu.gwt.validation.client.ValidationAction;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
