Build failed in Jenkins: hupa-trunk #349

[Apache Jenkins Server]

See 

Changes:

[dongxu] make cursor pointer to the right place

[dongxu] Disable InImapUserPreferencesStorage

[dongxu] Remove unused stuff

[dongxu] Change method signature

[dongxu] Move method to Util class

[dongxu] Set snapshot version higger than the current hupa in svn repo

[dongxu] Fix RegexPatternsTest test

[dongxu] Fix tests

[dongxu] Compiler optimizations and profiles

[dongxu] make a skeleton in the setting place, for more setting items

[dongxu] fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place

[dongxu] fixed issue#71, use an unique background

[dongxu] fixed issue#85, can move one message now in DEMO mode, while not test 
in Gmail mode

[dongxu] remove deprecated code

[dongxu] hide the show raw message button when not displaying a message and 
remove deprecated code

[dongxu] fixed issue#86, use opening a new window button to show the raw 
message in a new window

[dongxu] fixed issue#82, make display message first and then mark etc.

[dongxu] show/hide attachment's panel according to the attachments size

[dongxu] use different INBOX folder in DEV and PROD mode respectively

[dongxu] scrub code, remove deprecated code

[dongxu] fixed issue#87, and remove deprecated west view related codes

[dongxu] add searching... loading progress; add some attribute to searchbox, 
say magnifying glass and placeholder and so on

[dongxu] make more width for searchButton because firefox compress it

[dongxu] quick fix something - use textbox for search and make contacts TODO

[dongxu] Adding some kind of sorting in client-side. Fixed issue#83

[dongxu] fixed issue#74, finished to add search feature

[dongxu] Avoid entering a new-line in the textarea when selecting a suggestion 
element

[dongxu] prepare to add search feature

[dongxu] fixed issue#73, using LinkedHashSet in memory to store the contacts 
list like 'Echo Wang '

[dongxu] Remove demo values in login screen

[dongxu] Do not compile language specific permutations until we dont translate 
all the app to other languages

[dongxu] prepared for issue#73, established the UI layout

[dongxu] fixed issue#84, actually, in evo, there has been several deprecated 
classed, include WestActivity, which is replaced by FolderListActivity

[dongxu] fixed issue#81, add refresh event handler

[dongxu] fixed issue#80, make root path empty string ''

[dongxu] fixed issue#79, using 100 as the assuming page size of labels list 
rather than CellList's default page size 25

[dongxu] make status panel in the message content panel hidden temp

[dongxu] fixed issue#78, cause not be using the HtmlConstant and nameForDisplay 
which with intents

[dongxu] Fix issue in chrome with inlined images in messages

[dongxu] fixed issue#77, the reason is that the arguement passed to server was 
not the selected value in the list box

--
Started by an SCM change
Building remotely on ubuntu3 in workspace 

Updating http://svn.apache.org/repos/asf/james/hupa/trunk at revision 
'2013-09-12T05:07:02.027 +'
U mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
U mock/pom.xml
U pom.xml
U 
client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
U client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
U client/src/main/webapp/Hupa.html
U client/src/main/webapp/styles.css
D 
client/src/main/java/org/apache/hupa/client/place/MessageFolderPlace.java
D client/src/main/java/org/apache/hupa/client/place/NamedPlace.java
D 
client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
D client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
U client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
U client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
U client/src/main/java/org/apache/hupa/client/place/FolderPlace.java
A 
client/src/main/java/org/apache/hupa/client/place/FolderPlace.java~HEAD
D 
client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java
D 
client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java
D 
client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java
D 
client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java
D 
client/src/main/java/org/apache/hupa/client/mapper/AbstractActivityMapper.java
D 
client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
U 
client/src/main/java/org/apache/hupa/cli

svn commit: r1522443 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:05:33 2013
New Revision: 1522443

URL: http://svn.apache.org/r1522443
Log:
make cursor pointer to the right place

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

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=1522443&r1=1522442&r2=1522443&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
 Thu Sep 12 05:05:33 2013
@@ -134,7 +134,6 @@
.moreHeaders {
position: absolute;
top: 8px;
-cursor: pointer;
right: 18px;
width: 18em;
text-align: right;
@@ -149,6 +148,7 @@
height: 13px;
text-indent: 1000px;
overflow: hidden;
+  cursor: pointer;
}


@@ -174,5 +174,9 @@



+<<< HEAD
 >>> fixed issue#64, add attachments region in message content view
-
\ No newline at end of file
+
+===
+
+>>> make cursor pointer to the right place



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

svn commit: r1522442 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:05:13 2013
New Revision: 1522442

URL: http://svn.apache.org/r1522442
Log:
Disable InImapUserPreferencesStorage

Modified:

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java

Modified: 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1522442&r1=1522441&r2=1522442&view=diff
==
--- 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
 (original)
+++ 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
 Thu Sep 12 05:05:13 2013
@@ -48,6 +48,7 @@ import org.apache.hupa.server.guice.prov
 import org.apache.hupa.server.guice.providers.JavaMailSessionProvider;
 import org.apache.hupa.server.guice.providers.LogProvider;
 import org.apache.hupa.server.preferences.InImapUserPreferencesStorage;
+import org.apache.hupa.server.preferences.InSessionUserPreferencesStorage;
 import org.apache.hupa.server.preferences.UserPreferencesStorage;
 import org.apache.hupa.server.service.CheckSessionService;
 import org.apache.hupa.server.service.CheckSessionServiceImpl;
@@ -511,12 +512,17 @@ public class GuiceServerModule extends A

bind(Log.class).toProvider(LogProvider.class).in(Singleton.class);
bind(Session.class).toProvider(JavaMailSessionProvider.class);
 <<< HEAD
+<<< HEAD
 // bind(HttpSession.class).toProvider(HttpSessionProvider.class);
 >>> Make chechsession and login work with RF, with refactoring fetch 
 >>> folders.
bind(Properties.class).toInstance(properties);
 ===
 >>> forward and reply message to use RF
 
bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
+===
+//
bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class);
+
bind(UserPreferencesStorage.class).to(InSessionUserPreferencesStorage.class);
+>>> Disable InImapUserPreferencesStorage
bind(Properties.class).toInstance(properties);
}
 



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

svn commit: r1522440 - /james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:04:26 2013
New Revision: 1522440

URL: http://svn.apache.org/r1522440
Log:
Change method signature

Modified:

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java

Modified: 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java?rev=1522440&r1=1522439&r2=1522440&view=diff
==
--- 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
 (original)
+++ 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
 Thu Sep 12 05:04:26 2013
@@ -67,6 +67,7 @@ import javax.activation.DataHandler;
 import javax.activation.DataSource;
 import javax.mail.Address;
 import javax.mail.BodyPart;
+import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
 import javax.mail.Part;
@@ -199,7 +200,7 @@ public class MessageUtils {
  * @throws MessagingException
  * @throws IOException
  */
-public static boolean handleParts(MimeMessage message, Object content, 
StringBuffer sbPlain,
+public static boolean handleParts(Message message, Object content, 
StringBuffer sbPlain,
 ArrayList attachmentList) throws 
UnsupportedEncodingException, MessagingException,
 IOException {
 boolean isHTML = false;



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

svn commit: r1522441 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/rf/ server/src/main/java/org/apache/hupa/server/rf/

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:04:54 2013
New Revision: 1522441

URL: http://svn.apache.org/r1522441
Log:
Remove unused stuff

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SubjectProxy.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/SubjectRequest.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/rf/Subject.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java

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=1522441&r1=1522440&r2=1522441&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
 Thu Sep 12 05:04:54 2013
@@ -24,8 +24,11 @@ public interface HupaRequestFactory exte
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
SubjectRequest subjectRequest();
 
+===
+>>> Remove unused stuff
ImapFolderRequest folderRequest();
 
CheckSessionRequest sessionRequest();



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

svn commit: r1522439 - in /james/hupa/trunk/server/src/main/java/org/apache/hupa/server: service/GetMessageDetailsServiceImpl.java utils/MessageUtils.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:04:08 2013
New Revision: 1522439

URL: http://svn.apache.org/r1522439
Log:
Move method to Util class

Modified:

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java

Modified: 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java?rev=1522439&r1=1522438&r2=1522439&view=diff
==
--- 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java
 (original)
+++ 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java
 Thu Sep 12 05:04:08 2013
@@ -63,14 +63,11 @@ import javax.mail.Flags.Flag;
 import javax.mail.Header;
 import javax.mail.Message;
 import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
 import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
 
+import org.apache.hupa.server.utils.MessageUtils;
 import org.apache.hupa.shared.data.GetMessageDetailsResultImpl;
 import org.apache.hupa.shared.data.MailHeaderImpl;
-import org.apache.hupa.shared.data.MessageAttachmentImpl;
 import org.apache.hupa.shared.data.MessageDetailsImpl;
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;
@@ -127,12 +124,12 @@ public class GetMessageDetailsServiceImp
MessagingException, UnsupportedEncodingException {
MessageDetails mDetails = new MessageDetailsImpl();
 
-   Object con = message.getContent();
+   Object content = message.getContent();
 
StringBuffer sbPlain = new StringBuffer();
ArrayList attachmentList = new 
ArrayList();
 
-   boolean isHTML = handleParts(message, con, sbPlain, 
attachmentList);
+   boolean isHTML = MessageUtils.handleParts(message, content, 
sbPlain, attachmentList);
 
 <<< HEAD
 <<< HEAD
@@ -150,115 +147,14 @@ public class GetMessageDetailsServiceImp
 
mDetails.setMessageAttachments(attachmentList);
 
-   for (@SuppressWarnings("unchecked")
-   Enumeration en = message.getAllHeaders(); 
en.hasMoreElements();) {
+   for (@SuppressWarnings("unchecked") Enumeration en = 
message.getAllHeaders(); en.hasMoreElements();) {
Header header = en.nextElement();
mDetails.setMailHeader(new 
MailHeaderImpl(header.getName(), header.getValue()));
-// mDetails.addHeader(header.getName(), header.getValue());
}
 
return mDetails;
}
 
-   /**
-* Handle the parts of the given message. The method will call itself
-* recursively to handle all nested parts
-* 
-* @param message the MimeMessage
-* @param con the current processing Content
-* @param sbPlain the StringBuffer to fill with text
-* @param attachmentList ArrayList with attachments
-* @throws UnsupportedEncodingException
-* @throws MessagingException
-* @throws IOException
-*/
-   protected boolean handleParts(MimeMessage message, Object con, 
StringBuffer sbPlain,
-   ArrayList attachmentList) throws 
UnsupportedEncodingException, MessagingException,
-   IOException {
-   boolean isHTML = false;
-   if (con instanceof String) {
-   if 
(message.getContentType().toLowerCase().startsWith("text/html")) {
-   isHTML = true;
-   } else {
-   isHTML = false;
-   }
-   sbPlain.append((String) con);
-
-   } else if (con instanceof Multipart) {
-
-   Multipart mp = (Multipart) con;
-   String multipartContentType = 
mp.getContentType().toLowerCase();
-
-   String text = null;
-
-   if 
(multipartContentType.startsWith("multipart/alternative")) {
-   isHTML = handleMultiPartAlternative(mp, 
sbPlain);
-   } else {
-   for (int i = 0; i < mp.getCount(); i++) {
-   Part part = mp.getBodyPart(i);
-
-   String contentType = 
part.getContentType().toLowerCase();
-
-   Boolean bodyRead = sbPlain.length() > 0;
-
-   if (!bodyRead && 
contentType.startsWith("text/

svn commit: r1522438 - in /james/hupa/trunk: client/pom.xml mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:03:49 2013
New Revision: 1522438

URL: http://svn.apache.org/r1522438
Log:
Set snapshot version higger than the current hupa in svn repo

Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/mock/pom.xml
james/hupa/trunk/pom.xml
james/hupa/trunk/server/pom.xml
james/hupa/trunk/shared/pom.xml
james/hupa/trunk/widgets/pom.xml

Modified: james/hupa/trunk/client/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 05:03:49 2013
@@ -39,6 +39,7 @@
 hupa-parent
 <<< HEAD
 <<< HEAD
+<<< HEAD
 0.0.3-SNAPSHOT
 ===
 0.0.2-SNAPSHOT
@@ -46,6 +47,9 @@
 ===
 0.0.3-SNAPSHOT
 >>> constantly changed by manolo
+===
+0.0.5-SNAPSHOT
+>>> Set snapshot version higger than the current hupa in svn repo
 ../pom.xml
 
 hupa

Modified: james/hupa/trunk/mock/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu Sep 12 05:03:49 2013
@@ -26,6 +26,7 @@
 
 org.apache.james.hupa
 hupa-parent
+<<< HEAD
 0.0.3-SNAPSHOT
 ===
 ===
@@ -61,6 +62,9 @@
 ===
 0.0.3-SNAPSHOT
 >>> constantly changed by manolo
+===
+0.0.5-SNAPSHOT
+>>> Set snapshot version higger than the current hupa in svn repo
 ../pom.xml
 
 hupa-mock

Modified: james/hupa/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Sep 12 05:03:49 2013
@@ -56,6 +56,7 @@
 
 org.apache.james.hupa
 hupa-parent
+<<< HEAD
 0.0.3-SNAPSHOT
 <<< HEAD
 <<< HEAD
@@ -75,6 +76,9 @@
 >>> first commit
 ===
 >>> constantly changed by manolo
+===
+0.0.5-SNAPSHOT
+>>> Set snapshot version higger than the current hupa in svn repo
 pom
 Apache James Hupa Parent
 Hupa is a GWT based Webmail

Modified: james/hupa/trunk/server/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Thu Sep 12 05:03:49 2013
@@ -30,7 +30,7 @@
 
 org.apache.james.hupa
 hupa-parent
-0.0.3-SNAPSHOT
+0.0.5-SNAPSHOT
 ../pom.xml
 
 hupa-server

Modified: james/hupa/trunk/shared/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==
--- james/hupa/trunk/shared/pom.xml (original)
+++ james/hupa/trunk/shared/pom.xml Thu Sep 12 05:03:49 2013
@@ -30,7 +30,7 @@
 
 org.apache.james.hupa
 hupa-parent
-0.0.3-SNAPSHOT
+0.0.5-SNAPSHOT
 ../pom.xml
 
 hupa-shared

Modified: james/hupa/trunk/widgets/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==
--- james/hupa/trunk/widgets/pom.xml (original)
+++ james/hupa/trunk/widgets/pom.xml Thu Sep 12 05:03:49 2013
@@ -30,7 +30,7 @@
 
 org.apache.james.hupa
 hupa-parent
-0.0.3-SNAPSHOT
+0.0.5-SNAPSHOT
 ../pom.xml
 
 hupa-widgets



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

svn commit: r1522437 - /james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:03:30 2013
New Revision: 1522437

URL: http://svn.apache.org/r1522437
Log:
Fix RegexPatternsTest test

Modified:

james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java

Modified: 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java?rev=1522437&r1=1522436&r2=1522437&view=diff
==
--- 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java
 (original)
+++ 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/RegexPatternsTest.java
 Thu Sep 12 05:03:30 2013
@@ -53,7 +53,7 @@ public class RegexPatternsTest extends T
 String txt, res;
 txt = ".. click ..";
 res = RegexPatterns.replaceAll(txt, RegexPatterns.regex_inlineImg, 
RegexPatterns.repl_inlineImg);
-assertEquals(".. 
click ..", res);
+assertEquals(".. 
click ..", res);
 }
 
 public void testRegexRestoreInlineLinks() {



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

svn commit: r1522435 - /james/hupa/trunk/client/pom.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:02:52 2013
New Revision: 1522435

URL: http://svn.apache.org/r1522435
Log:
Compiler optimizations and profiles

Modified:
james/hupa/trunk/client/pom.xml

Modified: james/hupa/trunk/client/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522435&r1=1522434&r2=1522435&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 05:02:52 2013
@@ -222,6 +222,7 @@
 gwt-maven-plugin
 
 Hupa.html
+<<< HEAD
 
 <<< HEAD
 <<< HEAD
@@ -233,12 +234,17 @@
 -Xmx512M -Xss128M
 >>> constantly changed by manolo
 
+===
+>>> Compiler optimizations and profiles
 1
-true
+${gwt.compileReport}
 
${gwt.disableClassMetadata}
 
${gwt.disableCastChecking}
 ${gwt.logLevel}
 ${gwt.style}
+10
+
${gwt.enableClosureCompiler}
+${gwt.disableRunAsync}
 
 
org.apache.hupa.Hupa${gwt.moduleSuffix}
 



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

svn commit: r1522436 - /james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:03:12 2013
New Revision: 1522436

URL: http://svn.apache.org/r1522436
Log:
Fix tests

Modified:

james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java

Modified: 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java?rev=1522436&r1=1522435&r2=1522436&view=diff
==
--- 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
 (original)
+++ 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
 Thu Sep 12 05:03:12 2013
@@ -80,10 +80,14 @@ public class GetMessageDetailServiceTest
 assertNotSame(msg, res);
 assertEquals("...\n...>> re-add server unit tests
+===
+SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" +
+>>> Fix tests
 SConsts.PARAM_FOLDER + "=WHATEVER&" + 
 SConsts.PARAM_UID + "=0&" + 
 SConsts.PARAM_NAME + 
"=1.1934304...@web28309.mail.ukl.yahoo.com'"));



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

svn commit: r1522434 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/activity/ java/org/apache/hupa/client/ioc/ java/org/apache/hupa/client/mapper/ java/org/apache/hupa/client/ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:02:39 2013
New Revision: 1522434

URL: http://svn.apache.org/r1522434
Log:
make a skeleton in the setting place, for more setting items

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingNavView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
james/hupa/trunk/client/src/main/webapp/styles.css

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
 Thu Sep 12 05:02:39 2013
@@ -45,6 +45,7 @@ public class SettingNavActivity extends 
pc.goTo(new SettingPlace("labels"));
}
}));
+<<< HEAD
registerHandler(display.getEcsAchor().addClickHandler(new 
ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -53,13 +54,18 @@ public class SettingNavActivity extends 
}
}));

+===
+>>> make a skeleton in the setting place, for more setting items
}
 
@Inject private Displayable display;
 
public interface Displayable extends IsWidget {
+<<< HEAD
HasClickHandlers getEcsAchor();
 
+===
+>>> make a skeleton in the setting place, for more setting items
HasClickHandlers getLabelsAchor();
 
void singleSelect(int i);

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=1522434&r1=1522433&r2=1522434&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 05:02:39 2013
@@ -765,7 +765,14 @@ public class AppGinModule extends Abstra
public ActivityManager 
getLabelPropertiesActivityMapper(LabelPropertiesActivityMapper activityMapper, 
EventBus eventBus) {
return new ActivityManager(activityMapper, eventBus);
}
+

+   @Provides
+   @Singleton
+   @Named("SettingNavRegion")
+   public ActivityManager 
getSettingNavActivityMapper(SettingNavActivityMapper activityMapper, EventBus 
eventBus) {
+   return new ActivityManager(activityMapper, eventBus);
+   }

@Provides
@Singleton

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java?rev=1522434&r1=1522433&r2=1522434&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
 Thu Sep 12 05:02:39 2013
@@ -38,6 +38,7 @@ public class ActivityManagerInitializer 
@Named("ContactsListRegion") ActivityManager 
contactsListActivityManager,
@Named("ContactPropertiesRegion") ActivityManager 
contactPropertiesActivityManager,
@Named("LabelListRegion") ActivityManager 
labelListActivityManager,
+   @Named("SettingNavRegion") ActivityManager 
settingNavActivityManager,
@Named("LabelPropertiesRegion") ActivityManager 
labelPropertiesActiv

svn commit: r1522433 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: mapper/MessageListFooterActivityMapper.java ui/ContentSplitLayoutPanel.java ui/_CenterSettingPanel.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:02:12 2013
New Revision: 1522433

URL: http://svn.apache.org/r1522433
Log:
fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java?rev=1522433&r1=1522432&r2=1522433&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
 Thu Sep 12 05:02:12 2013
@@ -20,10 +20,10 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.MessageListFooterActivity;
-import org.apache.hupa.client.place.DefaultPlace;
 
 import com.google.gwt.activity.shared.Activity;
 <<< HEAD
+<<< HEAD
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
 ===
@@ -31,6 +31,8 @@ import com.google.gwt.activity.shared.Ac
 <<< HEAD
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 ===
+===
+>>> fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
 >>> support code split
@@ -39,10 +41,14 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 
 <<< HEAD
+<<< HEAD
 public class MessageListFooterActivityMapper extends _MessageActivityMapper {
 ===
 public class MessageListFooterActivityMapper implements ActivityMapper {
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
+===
+public class MessageListFooterActivityMapper extends _MessageActivityMapper {
+>>> fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place
private final Provider 
messageListFooterActivityProvider;
 
@Inject
@@ -52,12 +58,16 @@ public class MessageListFooterActivityMa
}
 
 <<< HEAD
+<<< HEAD
+===
+>>> fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place
@Override
protected Activity lazyLoadActivity(Place place) {return new 
ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
GWT.runAsync(callback);
}
+<<< HEAD
 
@Override
protected Activity createInstance() {
@@ -80,4 +90,12 @@ public class MessageListFooterActivityMa
};
}
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
+===
+
+   @Override
+   protected Activity createInstance() {
+   return messageListFooterActivityProvider.get();
+   }
+   };}
+>>> fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place
 }

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522433&r1=1522432&r2=1522433&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
 Thu Sep 12 05:02:12 2013
@@ -94,12 +94,18 @@ import java.util.Arrays;
 import java.util.List;
 
 <<< HEAD
+<<< HEAD
 import com.google.gwt.cell.client.TextCell;
 >>> make label settings prototype
 ===
+===
+import org.apache.hupa.client.ui.FolderListView.Resources;
+
+>>> fixed issue#66 and remove one useless class, make 
MessageListFooterActivityMapper do not map anything when it comes to setting 
place
 import com.google.gwt.cell.client.AbstractCell;
 >>> try to rearrange the places and history managment.
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.

svn commit: r1522432 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:01:50 2013
New Revision: 1522432

URL: http://svn.apache.org/r1522432
Log:
fixed issue#71, use an unique background

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css?rev=1522432&r1=1522431&r2=1522432&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
 Thu Sep 12 05:01:50 2013
@@ -61,6 +61,7 @@
 
 .cellListKeyboardSelectedItem {
 <<< HEAD
+<<< HEAD
 background:  #c7e3ef;
 }
 
@@ -72,6 +73,13 @@
 
 .cellListSelectedItem {
 >>> add adjusted style to labels list in setting palce
+===
+background:  #c7e3ef;
+}
+
+.cellListSelectedItem {
+   background:  #c7e3ef;
+>>> fixed issue#71, use an unique background
 background-color: #c7e3ef;
 color: #004458;
 height: auto;



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

svn commit: r1522431 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ui/ shared/src/main/java/org/apache/hupa/shared/events/

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:01:25 2013
New Revision: 1522431

URL: http://svn.apache.org/r1522431
Log:
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/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522431&r1=1522430&r2=1522431&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 05:01:25 2013
@@ -294,13 +294,17 @@ import org.apache.hupa.shared.data.ImapF
 >>> fixed issue#82, make display message first and then mark etc.
 import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
 import org.apache.hupa.shared.domain.DeleteMessageResult;
+import org.apache.hupa.shared.domain.GenericResult;
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Message;
+import org.apache.hupa.shared.domain.MoveMessageAction;
 import org.apache.hupa.shared.domain.User;
 import org.apache.hupa.shared.events.DeleteClickEvent;
 import org.apache.hupa.shared.events.DeleteClickEventHandler;
+import org.apache.hupa.shared.events.MoveMessageEvent;
+import org.apache.hupa.shared.events.MoveMessageEventHandler;
 import org.apache.hupa.shared.events.RefreshMessagesEvent;
 import org.apache.hupa.shared.events.RefreshMessagesEventHandler;
 import org.apache.hupa.shared.events.RefreshUnreadEvent;
@@ -320,7 +324,7 @@ public class MessageListActivity extends
@Inject private ToolBarActivity.Displayable toolBar;
@Inject private TopBarActivity.Displayable topBar;
private String folderName;
-// private String searchValue;
+   // private String searchValue;
private User user;
 
@Override
@@ -377,15 +381,15 @@ public class MessageListActivity extends
return "click".equals(event.getNativeEvent().getType()) && 0 != 
event.getColumn();
}
 
-   private void bindTo(EventBus eventBus) {
+   private void bindTo(final EventBus eventBus) {
eventBus.addHandler(DeleteClickEvent.TYPE, new 
DeleteClickEventHandler() {
@Override
public void onDeleteClickEvent(DeleteClickEvent event) {
deleteSelectedMessages();
}
});
-   
-   eventBus.addHandler(RefreshMessagesEvent.TYPE, new 
RefreshMessagesEventHandler(){
+
+   eventBus.addHandler(RefreshMessagesEvent.TYPE, new 
RefreshMessagesEventHandler() {
@Override
public void onRefresh(RefreshMessagesEvent event) {
display.setSearchValue(event.getSearchValue());
@@ -393,6 +397,56 @@ public class MessageListActivity extends
}
});
 
+   eventBus.addHandler(MoveMessageEvent.TYPE, new 
MoveMessageEventHandler() {
+
+   @Override
+   public void onMoveMessageHandler(final MoveMessageEvent 
event) {
+   hc.showTopLoading("Moving...");
+   MoveMessageRequest req = 
rf.moveMessageRequest();
+   ImapFolder f = req.create(ImapFolder.class);
+   ImapFolder newF = req.create(ImapFolder.class);
+
+   String fullName = null;
+   if (pc.getWhere() instanceof FolderPlace) {
+   fullName = ((FolderPlace) 
pc.getWhere()).getToken();
+   } else {
+   fullName = ((MessagePlace) 
pc.getWhere()).getTokenWrapper().getFolder();
+   }
+   f.setFullName(fullName);
+

svn commit: r1522430 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FoldersTreeViewModel.java MessageListFooterView.java MessageListFooterView.ui.xml RightCellTree.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:00:54 2013
New Revision: 1522430

URL: http://svn.apache.org/r1522430
Log:
remove deprecated code

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml

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=1522430&r1=1522429&r2=1522430&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
 Thu Sep 12 05:00:54 2013
@@ -129,7 +129,7 @@ import com.google.gwt.uibinder.client.Ui
 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;
-import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.inject.Inject;
 
 public class MessageListFooterView extends Composite implements 
MessageListFooterActivity.Displayable {
@@ -148,6 +148,7 @@ public class MessageListFooterView exten
 
 <<< HEAD
 <<< HEAD
+<<< HEAD
interface MessageListFooterUiBinder extends UiBinder {
 >>> make login page as one part of the overall layout & splite layout to 
 >>> little one
 ===
@@ -157,6 +158,9 @@ public class MessageListFooterView exten
 ===
interface MessageListFooterUiBinder extends UiBinder {
 >>> make message list view panel work as expected partly
+===
+   interface MessageListFooterUiBinder extends UiBinder {
+>>> remove deprecated code
}
 
private static MessageListFooterUiBinder binder = 
GWT.create(MessageListFooterUiBinder.class);

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=1522430&r1=1522429&r2=1522430&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
 Thu Sep 12 05:00:54 2013
@@ -33,8 +33,22 @@
 >>> 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'>
-   
+
+   
+   .moveMessage {
+   position:absolute;
+   right:20px; 
+   }
+   
+   

+<<< HEAD

 >>> make message list view panel work as expected partly
+===
+   
+   Hello
+   
+   
+>>> remove deprecated code
 
\ No newline at end of file



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

svn commit: r1522428 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageContentActivity.java ui/MessageContentView.java ui/MessageContentView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:00:10 2013
New Revision: 1522428

URL: http://svn.apache.org/r1522428
Log:
fixed issue#86, use opening a new window button to show the raw message in a 
new window

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522428&r1=1522427&r2=1522428&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 Thu Sep 12 05:00:10 2013
@@ -124,6 +124,7 @@ public class MessageContentActivity exte
}
 
}));
+<<< HEAD
}
 
private boolean isUidSet() {
@@ -276,6 +277,8 @@ public class MessageContentActivity exte
display.clearContent();
}
});
+===
+>>> fixed issue#86, use opening a new window button to show the raw 
message in a new window
}
 
 >>> fixed issue#76 with adding delete handler event
@@ -294,6 +297,7 @@ public class MessageContentActivity exte
void clearContent();
void setAttachments(List attachements, 
String folder, long uid);
void showAttachmentPanel(boolean is);
+   HasClickHandlers getRaw();
}
 
public Activity with(TokenWrapper tokenWrapper) {

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=1522428&r1=1522427&r2=1522428&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
 Thu Sep 12 05:00:10 2013
@@ -65,10 +65,14 @@ public class MessageContentView extends 
@UiField FlowPanel attachments;
@UiField DockLayoutPanel thisPanel;
 <<< HEAD
+<<< HEAD
@UiField Anchor rawButton;
@UiField SimplePanel rawPanel;
 ===
 >>> 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
 ===
@@ -462,5 +466,13 @@ public class MessageContentView extends 
}
 
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;
+   }
+>>> fixed issue#86, use opening a new window button to show the raw 
message in a new window
 }

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=1522428&r1=1522427&r2=1522428&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
 Thu Sep 12 05:00:10 2013
@@ -15,9 +15,13 @@
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD

 ===
 >>> beautify message list and content
+===
+   
+>>> fixed issue#86, use opening a new window button to show the raw 
message in a new window

.messageContent {
display: block;
@@ -126,16 +130,42 @@
 >>> beautify message list and content
 ===
}
+   
+   .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;
+  

svn commit: r1522429 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: evo/ActivityManagerInitializer.java evo/AppController.java evo/HupaEvo.java ui/MessageContentView.java ui/Messa

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:00:33 2013
New Revision: 1522429

URL: http://svn.apache.org/r1522429
Log:
hide the show raw message button when not displaying a message and remove 
deprecated code

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

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=1522429&r1=1522428&r2=1522429&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
 Thu Sep 12 05:00:33 2013
@@ -51,9 +51,13 @@ import com.google.gwt.user.client.ui.Lab
 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 {
@@ -68,6 +72,7 @@ public class MessageContentView extends 
 <<< HEAD
@UiField Anchor rawButton;
@UiField SimplePanel rawPanel;
+<<< HEAD
 ===
 >>> show/hide attachment's panel according to the attachments size
 ===
@@ -257,6 +262,8 @@ public class MessageContentView extends 
 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;
@@ -474,5 +481,13 @@ public class MessageContentView extends 
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=1522429&r1=1522428&r2=1522429&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
 Thu Sep 12 05:00:33 2013
@@ -156,7 +156,7 @@



-   
+   
 
Raw




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

svn commit: r1522427 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:59:48 2013
New Revision: 1522427

URL: http://svn.apache.org/r1522427
Log:
fixed issue#82, make display message first and then mark etc.

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522427&r1=1522426&r2=1522427&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:59:48 2013
@@ -39,6 +39,7 @@ import org.apache.hupa.client.rf.GetMess
 import org.apache.hupa.client.rf.MoveMessageRequest;
 import org.apache.hupa.client.ui.MessagesCellTable;
 import org.apache.hupa.client.ui.ToolBarView;
+<<< HEAD
 import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
 import org.apache.hupa.shared.domain.DeleteMessageResult;
 import org.apache.hupa.shared.domain.GenericResult;
@@ -289,6 +290,8 @@ import org.apache.hupa.client.ui.WidgetD
 ===
 >>> replace with IsWidget
 import org.apache.hupa.shared.data.ImapFolderImpl;
+===
+>>> fixed issue#82, make display message first and then mark etc.
 import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
 import org.apache.hupa.shared.domain.DeleteMessageResult;
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
@@ -298,7 +301,6 @@ import org.apache.hupa.shared.domain.Mes
 import org.apache.hupa.shared.domain.User;
 import org.apache.hupa.shared.events.DeleteClickEvent;
 import org.apache.hupa.shared.events.DeleteClickEventHandler;
-import org.apache.hupa.shared.events.ExpandMessageEvent;
 import org.apache.hupa.shared.events.RefreshMessagesEvent;
 import org.apache.hupa.shared.events.RefreshMessagesEventHandler;
 import org.apache.hupa.shared.events.RefreshUnreadEvent;
@@ -341,16 +343,14 @@ public class MessageListActivity extends
req.get(action).fire(new 
Receiver() {
@Override
public void 
onSuccess(GetMessageDetailsResult response) {
-   eventBus.fireEvent(new 
ExpandMessageEvent(user, new ImapFolderImpl(folderName), event
-   
.getValue(), response.getMessageDetails()));
+   MessagePlace place = 
new MessagePlace(folderName + AbstractPlace.SPLITTER
+   + 
event.getValue().getUid());
+   pc.goTo(place);

display.getGrid().getSelectionModel().setSelected(event.getValue(), true);

toolBar.enableAllTools(true);
ToolBarView.Parameters 
p = new ToolBarView.Parameters(user, folderName, event.getValue(),

response.getMessageDetails());

toolBar.setParameters(p);
-   MessagePlace place = 
new MessagePlace(folderName + AbstractPlace.SPLITTER
-   + 
event.getValue().getUid());
-   pc.goTo(place);
display.refresh();
hc.hideTopLoading();
eventBus.fireEvent(new 
RefreshUnreadEvent());



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

svn commit: r1522425 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java ui/NavigationView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:59:06 2013
New Revision: 1522425

URL: http://svn.apache.org/r1522425
Log:
use different INBOX folder in DEV and PROD mode respectively

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522425&r1=1522424&r2=1522425&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:59:06 2013
@@ -365,8 +365,12 @@ public class HupaController {
if (here.getParameters() != null) {
hupaLayout.switchTo(HupaLayout.LAYOUT_COMPOSE);
} else {
-   //FIXME when gmail mode
-   this.placeController.goTo(new 
FolderPlace("INBOX"));
+   //FIXME using configure one
+   if(GWT.isProdMode()){
+   placeController.goTo(new 
FolderPlace("INBOX"));
+   }else{
+   placeController.goTo(new 
FolderPlace("Mock-Inbox"));
+   }
}
} else if (place instanceof ContactPlace) {
hupaLayout.switchTo(HupaLayout.LAYOUT_CONTACT);

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522425&r1=1522424&r2=1522425&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 Thu Sep 12 04:59:06 2013
@@ -188,8 +188,12 @@ public class NavigationView extends Comp

contactOuter.removeStyleName(style.selected());
contact.removeStyleName(style.contactInnerSelected());
-   //FIXME need the default one
-   placeController.goTo(new FolderPlace("INBOX"));
+   //FIXME need the configure one
+   if(GWT.isProdMode()){
+   placeController.goTo(new FolderPlace("INBOX"));
+   }else{
+   placeController.goTo(new FolderPlace("Mock-Inbox"));
+   }
}





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

svn commit: r1522426 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageContentActivity.java ui/MessageContentView.java ui/MessageContentView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:59:28 2013
New Revision: 1522426

URL: http://svn.apache.org/r1522426
Log:
show/hide attachment's panel according to the attachments size

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522426&r1=1522425&r2=1522426&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 Thu Sep 12 04:59:28 2013
@@ -233,8 +233,14 @@ public class MessageContentActivity exte
@Override
public void onSuccess(GetMessageDetailsResult 
response) {

display.fillMessageContent(response.getMessageDetails().getText());
-   
display.setAttachments(response.getMessageDetails().getMessageAttachments(), 
fullName,
-   Long.parseLong(uid));
+   List attaches = 
response.getMessageDetails().getMessageAttachments();
+   if (attaches == null || 
attaches.isEmpty()) {
+   
display.showAttachmentPanel(false);
+   } else {
+   
display.showAttachmentPanel(true);
+   
display.setAttachments(response.getMessageDetails().getMessageAttachments(), 
fullName,
+   
Long.parseLong(uid));
+   }
}
 
@Override
@@ -287,6 +293,7 @@ public class MessageContentActivity exte
void fillMessageContent(String messageContent);
void clearContent();
void setAttachments(List attachements, 
String folder, long uid);
+   void showAttachmentPanel(boolean is);
}
 
public Activity with(TokenWrapper tokenWrapper) {
@@ -302,7 +309,6 @@ public class MessageContentActivity exte
Window.open(url, "_blank", "");
}
 
-
public void mailTo(String mailto) {
pc.goTo(new ComposePlace("new").with(new Parameters(null, null, 
null, null)));
eventBus.fireEvent(new MailToEvent(mailto));

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=1522426&r1=1522425&r2=1522426&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
 Thu Sep 12 04:59:28 2013
@@ -64,8 +64,11 @@ public class MessageContentView extends 
//TODO should use a scrolled panel which can contain multiple children
@UiField FlowPanel attachments;
@UiField DockLayoutPanel thisPanel;
+<<< HEAD
@UiField Anchor rawButton;
@UiField SimplePanel rawPanel;
+===
+>>> show/hide attachment's panel according to the attachments size
 
@Inject
 ===
@@ -290,6 +293,7 @@ public class MessageContentView extends 
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
@Override
public void fillMessageContent(String messageDetail) {
messageContentHTML.setHTML(messageDetail);
@@ -385,18 +389,28 @@ public class MessageContentView extends 
 
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);
messageContent.add(messageContentHTML);
}
+   
+   @Override
+   public void showAttachmentPanel(boolean is){
+   if(is){
+   thisPanel.setWidgetSize(attachments, 216);
+   }else{
+   thisPanel.setWidgetSize(attachments

svn commit: r1522424 - in /james/hupa/trunk/client/src: main/java/org/apache/hupa/client/ioc/ main/java/org/apache/hupa/client/mapper/ main/java/org/apache/hupa/client/place/ test/java/org/apache/hupa

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:58:45 2013
New Revision: 1522424

URL: http://svn.apache.org/r1522424
Log:
scrub code, remove deprecated code

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageFolderPlace.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/NamedPlace.java
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/mapper/AppPlaceHistoryMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java

james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.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=1522424&r1=1522423&r2=1522424&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 04:58:45 2013
@@ -147,11 +147,14 @@ import org.apache.hupa.client.HupaContro
 >>> move new theme ui from experiment to hupa evo
 ===
 import org.apache.hupa.client.activity.FolderListActivity;
+<<< HEAD
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 import org.apache.hupa.client.activity.IMAPMessageActivity;
 ===
 >>> try to rearrange the places and history managment.
 import org.apache.hupa.client.activity.IMAPMessageListActivity;
+===
+>>> scrub code, remove deprecated code
 import org.apache.hupa.client.activity.LabelListActivity;
 import org.apache.hupa.client.activity.LabelPropertiesActivity;
 import org.apache.hupa.client.activity.LoginActivity;
@@ -159,13 +162,11 @@ import org.apache.hupa.client.activity.L
 import org.apache.hupa.client.activity.MessageContentActivity;
 import org.apache.hupa.client.activity.MessageListActivity;
 import org.apache.hupa.client.activity.MessageListFooterActivity;
-import org.apache.hupa.client.activity.MessageSendActivity;
 import org.apache.hupa.client.activity.NavigationActivity;
 import org.apache.hupa.client.activity.NotificationActivity;
 import org.apache.hupa.client.activity.SearchBoxActivity;
 import org.apache.hupa.client.activity.StatusActivity;
 import org.apache.hupa.client.activity.ToolBarActivity;
-import org.apache.hupa.client.activity.TopActivity;
 import org.apache.hupa.client.activity.TopBarActivity;
 import org.apache.hupa.client.mapper.AppPlaceHistoryMapper;
 <<< HEAD
@@ -272,9 +273,9 @@ import org.apache.hupa.client.ui.Compose
 import org.apache.hupa.client.ui.ContactPropertiesView;
 import org.apache.hupa.client.ui.ContactsListView;
 import org.apache.hupa.client.ui.FolderListView;
-import org.apache.hupa.client.ui.FoldersTreeViewModel;
 import org.apache.hupa.client.ui.HupaLayout;
 import org.apache.hupa.client.ui.HupaLayoutable;
+<<< HEAD
 import org.apache.hupa.client.ui.IMAPMessageListView;
 <<< HEAD
 <<< HEAD
@@ -284,6 +285,8 @@ import org.apache.hupa.client.ui.IMAPMes
 import org.apache.hupa.client.ui.IMAPMessageView;
 ===
 >>> try to rearrange the places and history managment.
+===
+>>> scrub code, remove deprecated code
 import org.apache.hupa.client.ui.LabelListView;
 import org.apache.hupa.client.ui.LabelPropertiesView;
 import org.apache.hupa.client.ui.LoginLayout;
@@ -293,7 +296,6 @@ import org.apache.hupa.client.ui.LogoVie
 import org.apache.hupa.client.ui.MessageContentView;
 import org.apache.hupa.client.ui.MessageListFooterView;
 import org.apache.hupa.client.ui.MessageListView;
-import org.apache.hupa.client.ui.MessageSendView;
 import org.apache.hupa.client.ui.MessagesCellTable;
 import org.apache.hupa.client.ui.NavigationView;
 import org.apache.hupa.client.ui.NotificationView;
@@ -301,7 +303,6 @@ import org.apache.hupa.client.ui.SearchB
 import org.apache.hupa.client.ui.StatusView;
 import org.apache.hupa.client.ui.ToolBarView;
 import org.apache.hupa.client.ui.TopBarView;
-import org.apache.hupa.client.ui.TopView;
 
 import com.google.gwt.activity.shared.ActivityManager;
 <<< HEAD
@@ -433,6 +434,7 @@ public class AppGinModule extends Abstra
bind(ContactPropertiesActivity.class).in(Singleton.class);

 
+<<< HEAD

bind(FolderListActivity.Displayable.class).to(FolderListView.class).in(Singleton.class);
 
bind(MessagesCellTable.class).in(Singleton.class);
@@ -672,9 +674,11 @@ public class AppGinModule extends Abstra
  

svn commit: r1522423 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/TopBarActivity.java ioc/AppGinModule.java mapper/CachingWestActivityMapper.java mapper/WestActivityMap

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:58:10 2013
New Revision: 1522423

URL: http://svn.apache.org/r1522423
Log:
fixed issue#87, and remove deprecated west view related codes

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522423&r1=1522422&r2=1522423&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
 Thu Sep 12 04:58:10 2013
@@ -105,6 +105,7 @@ public class TopBarActivity extends AppB

RootLayoutPanel.get().add(loginLayout.get());
pc.goTo(new DefaultPlace(""));
Window.Location.reload();
+<<< HEAD
}
 
@Override
@@ -228,13 +229,16 @@ public class TopBarActivity extends AppB
RootLayoutPanel.get().clear();

RootLayoutPanel.get().add(loginLayout.get());
TopBarActivity.this.pc.goTo(new 
DefaultPlace("@"));
+===
+>>> fixed issue#87, and remove deprecated west view related codes
}
 
@Override
public void onFailure(ServerFailure error) {
RootLayoutPanel.get().clear();

RootLayoutPanel.get().add(loginLayout.get());
-   TopBarActivity.this.pc.goTo(new 
DefaultPlace("@"));
+   pc.goTo(new DefaultPlace(""));
+   Window.Location.reload();
}
});
}

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=1522423&r1=1522422&r2=1522423&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 04:58:10 2013
@@ -167,7 +167,6 @@ import org.apache.hupa.client.activity.S
 import org.apache.hupa.client.activity.ToolBarActivity;
 import org.apache.hupa.client.activity.TopActivity;
 import org.apache.hupa.client.activity.TopBarActivity;
-import org.apache.hupa.client.activity.WestActivity;
 import org.apache.hupa.client.mapper.AppPlaceHistoryMapper;
 <<< HEAD
 <<< HEAD
@@ -303,7 +302,6 @@ import org.apache.hupa.client.ui.StatusV
 import org.apache.hupa.client.ui.ToolBarView;
 import org.apache.hupa.client.ui.TopBarView;
 import org.apache.hupa.client.ui.TopView;
-import org.apache.hupa.client.ui.WestView;
 
 import com.google.gwt.activity.shared.ActivityManager;
 <<< HEAD
@@ -622,8 +620,11 @@ public class AppGinModule extends Abstra
 >>> fixed issue#45, issue#47, issue#51. change the layout of composite, 
 >>> don't use contact instead of folders list
 ===

bind(FolderListActivity.Displayable.class).to(FolderListView.class).in(Singleton.class);
+<<< HEAD
 >>> fixed issue#61; add loading to mark, unmark.

bind(WestActivity.Displayable.class).to(WestView.class).in(Singleton.class);
+===
+>>> fixed issue#87, and remove deprecated west view related codes

bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class);

bind(MessageSendActivity.Displayable.class).to(MessageSendView.class);
 <<< HEAD
@@ -669,7 +670,6 @@ public class AppGinModule extends Abstra
 ===
 >>> remove the duplicate bind of LoginActivity
bind(TopActivity.class).in(Singleton.class);
-   bind(WestActivity.class).in(Singleton.class);
bind(IMAPMessageListActivity.class).in(Singleton.class);
bind(MessageSendActivity.class).in(Singleton.class);
 



-
To unsubsc

svn commit: r1522422 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:57:43 2013
New Revision: 1522422

URL: http://svn.apache.org/r1522422
Log:
add searching... loading progress; add some attribute to searchbox, say 
magnifying glass and placeholder and so on

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java?rev=1522422&r1=1522421&r2=1522422&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
 Thu Sep 12 04:57:43 2013
@@ -30,10 +30,15 @@ import com.google.gwt.event.dom.client.K
 import com.google.gwt.event.dom.client.KeyUpEvent;
 import com.google.gwt.event.dom.client.KeyUpHandler;
 <<< HEAD
+<<< HEAD
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 ===
 >>> prepare to add search feature
+===
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+>>> add searching... loading progress; add some attribute to searchbox, 
say magnifying glass and placeholder and so on
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Button;
@@ -85,20 +90,28 @@ public class SearchBoxView extends Compo
private Button searchButton = new Button("Search");
@UiField protected HorizontalPanel thisPanel;
 
-// @SuppressWarnings("deprecation")
+   // @SuppressWarnings("deprecation")
public SearchBoxView() {
initWidget(binder.createAndBindUi(this));
 
-//searchBox.addStyleName(HupaCSS.C_msg_search);
-
-//searchBox.setAnimationEnabled(true);
-//searchBox.setAutoSelectEnabled(false);
-//searchBox.setLimit(20);
+   // searchBox.addStyleName(HupaCSS.C_msg_search);
+
+   // searchBox.setAnimationEnabled(true);
+   // searchBox.setAutoSelectEnabled(false);
+   // searchBox.setLimit(20);
searchBox.getElement().setAttribute("type", "search");
+   searchBox.getElement().setAttribute("placeholder", "Search...");
+   searchBox.getElement().setAttribute("results", "10");
+   searchBox.getElement().setAttribute("incremental", 
"incremental");
+   searchBox.getElement().setAttribute("name", "s");
searchBox.addKeyUpHandler(new KeyUpHandler() {
public void onKeyUp(KeyUpEvent event) {
+<<< HEAD
if (event.getNativeKeyCode() == 
KeyCodes.KEY_ENTER) {
 >>> prepare to add search feature
+===
+   if (event.getNativeKeyCode() == 
KeyCodes.KEY_ENTER || (event.getNativeKeyCode() == KeyCodes.KEY_BACKSPACE && 
searchBox.getText().trim().equals(""))) {
+>>> add searching... loading progress; add some attribute to searchbox, 
say magnifying glass and placeholder and so on
searchButton.click();
}
}



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

svn commit: r1522421 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:57:25 2013
New Revision: 1522421

URL: http://svn.apache.org/r1522421
Log:
make more width for searchButton because firefox compress it

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml?rev=1522421&r1=1522420&r2=1522421&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
 Thu Sep 12 04:57:25 2013
@@ -18,7 +18,7 @@



-   
+   






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

svn commit: r1522420 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/SearchBoxActivity.java ui/NavigationView.java ui/SearchBoxView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:57:06 2013
New Revision: 1522420

URL: http://svn.apache.org/r1522420
Log:
quick fix something - use textbox for search and make contacts TODO

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java?rev=1522420&r1=1522419&r2=1522420&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
 Thu Sep 12 04:57:06 2013
@@ -103,6 +103,7 @@ public class SearchBoxActivity extends A
 
 }));
 
+<<< HEAD
 registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new 
MessagesReceivedEventHandler() {
 
 public void onMessagesReceived(MessagesReceivedEvent event) {
@@ -113,6 +114,17 @@ public class SearchBoxActivity extends A
 
 }));
 >>> fixed issue#74, finished to add search feature
+===
+//registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new 
MessagesReceivedEventHandler() {
+//
+//public void onMessagesReceived(MessagesReceivedEvent event) {
+//
+//// fill the oracle
+//display.fillSearchOracle(event.getMessages());
+//}
+//
+//}));
+>>> quick fix something - use textbox for search and make contacts TODO
}
 
@Inject private Displayable display;

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522420&r1=1522419&r2=1522420&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 Thu Sep 12 04:57:06 2013
@@ -212,14 +212,15 @@ public class NavigationView extends Comp
 
@UiHandler("contact")
public void onContactClick(ClickEvent e){
-   mailOuter.removeStyleName(style.selected());
-   mail.removeStyleName(style.mailInnerSelected());
-   contactOuter.addStyleName(style.selected());
-   contact.addStyleName(style.contactInnerSelected());
-   
-   settingOuter.removeStyleName(style.selected());
-   setting.removeStyleName(style.settingsInnerSelected());
-   placeController.goTo(new ContactPlace("contacts"));
+   Window.alert("//TODO");
+// mailOuter.removeStyleName(style.selected());
+// mail.removeStyleName(style.mailInnerSelected());
+// contactOuter.addStyleName(style.selected());
+// contact.addStyleName(style.contactInnerSelected());
+// 
+// settingOuter.removeStyleName(style.selected());
+// setting.removeStyleName(style.settingsInnerSelected());
+// placeController.goTo(new ContactPlace("contacts"));
}



Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java?rev=1522420&r1=1522419&r2=1522420&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
 Thu Sep 12 04:57:06 2013
@@ -43,14 +43,19 @@ import com.google.gwt.user.client.ui.Hor
 import com.google.gwt.user.client.ui.MultiWordSuggestOracle;
 import com.google.gwt.user.client.ui.SuggestBox;
 <<< HEAD
+<<< HEAD
 import com.google.gwt.user.client.ui.TextBox;
 ===
 >>> prepare to add search feature
+===
+import com.google.gwt.user.client.ui.TextBox;
+>>> quick fix something - use textbox for search and make contacts TODO
 
 public class SearchBoxView extends Composite implements 
SearchBoxActivity.Displayable {
 
private MultiWordSuggestOracle oracle = new MultiWordSuggestOracle(" 
,@");
 <<< HEAD
+<<< HEAD
private TextBox searchBox = new TextBox();
private Button searchButton = new Button("Search");
@UiField protected Horizo

svn commit: r1522419 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:56:48 2013
New Revision: 1522419

URL: http://svn.apache.org/r1522419
Log:
Adding some kind of sorting in client-side. Fixed issue#83

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522419&r1=1522418&r2=1522419&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 Thu Sep 12 04:56:48 2013
@@ -499,6 +499,9 @@ public class MessagesCellTable extends D
 >>> remove both of gwt-representer and gwt-dispatch dependencies, add 
 >>> license headers to all new files
 package org.apache.hupa.client.ui;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -540,6 +543,8 @@ import com.google.gwt.place.shared.Place
 import com.google.gwt.resources.client.ImageResource;
 import com.google.gwt.storage.client.Storage;
 import com.google.gwt.user.cellview.client.Column;
+import com.google.gwt.user.cellview.client.ColumnSortEvent.AsyncHandler;
+import com.google.gwt.user.cellview.client.ColumnSortList.ColumnSortInfo;
 import com.google.gwt.user.cellview.client.DataGrid;
 import com.google.gwt.user.cellview.client.Header;
 import com.google.gwt.user.cellview.client.RowStyles;
@@ -548,6 +553,7 @@ import com.google.gwt.view.client.Defaul
 import com.google.gwt.view.client.HasData;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.gwt.view.client.ProvidesKey;
+import com.google.gwt.view.client.Range;
 import com.google.inject.Inject;
 import com.google.web.bindery.requestfactory.shared.Receiver;
 import com.google.web.bindery.requestfactory.shared.ServerFailure;
@@ -560,7 +566,7 @@ public class MessagesCellTable extends D
private String folderName;
private String searchValue;
 
-   public static final int PAGE_SIZE = 25;
+   public static final int PAGE_SIZE = 100;
 
private HupaImageBundle imageBundle;
CheckboxColumn checkboxCol = new CheckboxColumn();
@@ -644,7 +650,6 @@ public class MessagesCellTable extends D
if (null != contactsString) {
for (String contact : 
contactsString.split(",")) {

contacts.add(contact.replace("[", "").replace("]", "").trim());
-
}
}
contactsStore.setItem(CONTACTS_STORE, 
contacts.toString());
@@ -670,6 +675,7 @@ public class MessagesCellTable extends D
} else {

updateRowCount(response.getRealCount(), true);
updateRowData(start, 
response.getMessages());
+   getColumnSortList().push(dateCol);
}
hc.hideTopLoading();
Scheduler.get().scheduleDeferred(new 
ScheduledCommand() {
@@ -787,9 +793,51 @@ public class MessagesCellTable extends D
dataProvider = new MessageListDataProvider();
dataProvider.addDataDisplay(this);
}
+   
+   // make table sortable
+   AsyncHandler columnSortHandler = new AsyncHandler(this);
+   addColumnSortHandler(columnSortHandler);
+fromCol.setSortable(true);
+subjectCol.setSortable(true);
+attachedCol.setSortable(true);
+dateCol.setSortable(true);
+
refresh();
}
 
+   // TODO: this should be perform in the server side, but in the 
meanwhile it is useful
+   // some kind of sorting in client side.
+   @Override
+   public void setVisibleRangeAndClearData(Range range, boolean 
forceRangeChangeEvent) {
+   final ColumnSortInfo sortInfo = getColumnSortList().get(0);
+
+   List sortedList = new 
ArrayList(getVisibleItems());
+Collections.sort(sortedList, new Comparator() {
+public int compare(Message o1, Message o2) {
+Column column = sortInfo.getColumn();
+Message a = sortInfo.isAscending() ? o1 : o2;
+Message b = sortInfo.isAscending() ? o2 : o1;
+if (fromCol.equals(column)) {
+return a.getFrom().compareToIgnoreCase(b.getFrom());
+  

svn commit: r1522418 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ui/ shared/src/main/java/org/apache/hupa/shared/events/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:56:28 2013
New Revision: 1522418

URL: http://svn.apache.org/r1522418
Log:
fixed issue#74, finished to add search feature

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java

james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/RefreshMessagesEvent.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522418&r1=1522417&r2=1522418&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:56:28 2013
@@ -388,6 +388,7 @@ public class MessageListActivity extends
eventBus.addHandler(RefreshMessagesEvent.TYPE, new 
RefreshMessagesEventHandler(){
@Override
public void onRefresh(RefreshMessagesEvent event) {
+   display.setSearchValue(event.getSearchValue());
display.refresh();
}
});
@@ -426,6 +427,8 @@ public class MessageListActivity extends
List getSelectedMessagesIds();
 
Set getSelectedMessages();
+
+   void setSearchValue(String searchValue);
}
 
private void antiSelectMessages(Collection c) {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java?rev=1522418&r1=1522417&r2=1522418&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
 Thu Sep 12 04:56:28 2013
@@ -23,15 +23,21 @@ import java.util.List;
 
 import org.apache.hupa.shared.domain.Message;
 <<< HEAD
+<<< HEAD
+===
+>>> fixed issue#74, finished to add search feature
 import org.apache.hupa.shared.events.MessagesReceivedEvent;
 import org.apache.hupa.shared.events.MessagesReceivedEventHandler;
 import org.apache.hupa.shared.events.RefreshMessagesEvent;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
+<<< HEAD
 ===
 
 >>> prepare to add search feature
+===
+>>> fixed issue#74, finished to add search feature
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -44,6 +50,7 @@ public class SearchBoxActivity extends A
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
 <<< HEAD
+<<< HEAD
bindTo(eventBus);
container.setWidget(display.asWidget());

@@ -76,6 +83,36 @@ public class SearchBoxActivity extends A
 ===
container.setWidget(display.asWidget());
 >>> prepare to add search feature
+===
+   bindTo(eventBus);
+   container.setWidget(display.asWidget());
+   
+   }
+
+   private void bindTo(final EventBus eventBus) {
+
+registerHandler(display.getSearchClick().addClickHandler(new 
ClickHandler() {
+
+public void onClick(ClickEvent event) {
+String searchValue = null;
+if (display.getSearchValue().getValue().trim().length() > 0) {
+searchValue = display.getSearchValue().getValue().trim();
+}
+eventBus.fireEvent(new RefreshMessagesEvent(searchValue));
+}
+
+}));
+
+registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new 
MessagesReceivedEventHandler() {
+
+public void onMessagesReceived(MessagesReceivedEvent event) {
+
+// fill the oracle
+display.fillSearchOracle(event.getMessages());
+}
+
+}));
+>>> fixed issue#74, finished to add search feature
}
 
@Inject private Displayable display;

Modified: 
james/hupa/trunk/cl

svn commit: r1522417 - /james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:55:58 2013
New Revision: 1522417

URL: http://svn.apache.org/r1522417
Log:
Avoid entering a new-line in the textarea when selecting a suggestion element

Modified:

james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java

Modified: 
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java?rev=1522417&r1=1522416&r2=1522417&view=diff
==
--- 
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
 (original)
+++ 
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
 Thu Sep 12 04:55:58 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.widgets.ui;
 
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyDownHandler;
@@ -28,6 +29,11 @@ import com.google.gwt.event.dom.client.K
 >>> first commit
 ===
 >>> first commit
+===
+import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.dom.client.KeyDownEvent;
+import com.google.gwt.event.dom.client.KeyDownHandler;
+>>> Avoid entering a new-line in the textarea when selecting a suggestion 
element
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Focusable;
@@ -60,6 +66,9 @@ public class MultiValueSuggestArea exten
 super(oracle, new TextArea() {
 <<< HEAD
 <<< HEAD
+<<< HEAD
+===
+>>> Avoid entering a new-line in the textarea when selecting a suggestion 
element
 
 {
 // Avoid entering a new-line when selecting a suggestion 
element
@@ -72,10 +81,13 @@ public class MultiValueSuggestArea exten
 }
 });
 }
+<<< HEAD
 ===
 >>> first commit
 ===
 >>> first commit
+===
+>>> Avoid entering a new-line in the textarea when selecting a suggestion 
element
 
 String search = null;
 



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

svn commit: r1522416 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:55:42 2013
New Revision: 1522416

URL: http://svn.apache.org/r1522416
Log:
prepare to add search feature

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522416&r1=1522415&r2=1522416&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:55:42 2013
@@ -53,8 +53,6 @@ import org.apache.hupa.shared.domain.Sen
 import org.apache.hupa.shared.domain.SendReplyMessageAction;
 import org.apache.hupa.shared.domain.SmtpMessage;
 import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.events.ContactsUpdatedEvent;
-import org.apache.hupa.shared.events.ContactsUpdatedEventHandler;
 import org.apache.hupa.shared.events.LoginEvent;
 import org.apache.hupa.shared.events.LoginEventHandler;
 import org.apache.hupa.shared.events.MailToEvent;

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java?rev=1522416&r1=1522415&r2=1522416&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
 Thu Sep 12 04:55:42 2013
@@ -22,12 +22,16 @@ package org.apache.hupa.client.activity;
 import java.util.List;
 
 import org.apache.hupa.shared.domain.Message;
+<<< HEAD
 import org.apache.hupa.shared.events.MessagesReceivedEvent;
 import org.apache.hupa.shared.events.MessagesReceivedEventHandler;
 import org.apache.hupa.shared.events.RefreshMessagesEvent;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
+===
+
+>>> prepare to add search feature
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -39,6 +43,7 @@ public class SearchBoxActivity extends A
 
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
+<<< HEAD
bindTo(eventBus);
container.setWidget(display.asWidget());

@@ -68,6 +73,9 @@ public class SearchBoxActivity extends A
 //}
 //
 //}));
+===
+   container.setWidget(display.asWidget());
+>>> prepare to add search feature
}
 
@Inject private Displayable display;

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=1522416&r1=1522415&r2=1522416&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 04:55:42 2013
@@ -162,6 +162,7 @@ import org.apache.hupa.client.activity.M
 import org.apache.hupa.client.activity.MessageSendActivity;
 import org.apache.hupa.client.activity.NavigationActivity;
 import org.apache.hupa.client.activity.NotificationActivity;
+import org.apache.hupa.client.activity.SearchBoxActivity;
 import org.apache.hupa.client.activity.StatusActivity;
 import org.apache.hupa.client.activity.ToolBarActivity;
 import org.apache.hupa.client.activity.TopActivity;
@@ -252,6 +253,7 @@ import org.apache.hupa.client.mapper.Mes
 import org.apache.hupa.client.mapper.MessageListFooterActivityMapper;
 import org.ap

svn commit: r1522414 - /james/hupa/trunk/client/src/main/webapp/Hupa.html

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:54:59 2013
New Revision: 1522414

URL: http://svn.apache.org/r1522414
Log:
Remove demo values in login screen

Modified:
james/hupa/trunk/client/src/main/webapp/Hupa.html

Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522414&r1=1522413&r2=1522414&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 04:54:59 2013
@@ -147,8 +147,8 @@
 
 
  
-   
-   
+   
+   
  
 
 



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

svn commit: r1522415 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/activity/ComposeActivity.java java/org/apache/hupa/client/ui/ComposeView.java java/org/apache/hupa/client/ui/Me

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:55:20 2013
New Revision: 1522415

URL: http://svn.apache.org/r1522415
Log:
fixed issue#73, using LinkedHashSet in memory to store the contacts list like 
'Echo Wang '

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
james/hupa/trunk/client/src/main/webapp/styles.css

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522415&r1=1522414&r2=1522415&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:55:20 2013
@@ -53,6 +53,8 @@ import org.apache.hupa.shared.domain.Sen
 import org.apache.hupa.shared.domain.SendReplyMessageAction;
 import org.apache.hupa.shared.domain.SmtpMessage;
 import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.events.ContactsUpdatedEvent;
+import org.apache.hupa.shared.events.ContactsUpdatedEventHandler;
 import org.apache.hupa.shared.events.LoginEvent;
 import org.apache.hupa.shared.events.LoginEventHandler;
 import org.apache.hupa.shared.events.MailToEvent;
@@ -98,6 +100,9 @@ import com.google.gwt.event.dom.client.H
 import com.google.gwt.event.shared.EventBus;
 <<< HEAD
 <<< HEAD
+<<< HEAD
+===
+>>> fixed issue#73, using LinkedHashSet in memory to store the contacts 
list like 'Echo Wang '
 import com.google.gwt.storage.client.Storage;
 import com.google.gwt.user.client.History;
 <<< HEAD
@@ -620,6 +625,18 @@ public class ComposeActivity extends App
display.getTo().setText(event.getMailto());
}});

+   fillSuggestList();
+   
+   }
+
+   private void fillSuggestList() {
+   Storage contactStore = Storage.getLocalStorageIfSupported();
+   if(contactStore != null){
+   String contactsString = 
contactStore.getItem(MessagesCellTable.CONTACTS_STORE);
+   if(contactsString != null){
+   
display.fillContactList(contactsString.replace("[", "").replace("]", 
"").trim().split(","));
+   }   
+   }
}
 
 <<< HEAD
@@ -995,6 +1012,7 @@ public class ComposeActivity extends App
ListBox getFromList();
IUploader getUploader();
void fillContactList(String[] contacts);
+<<< HEAD
 ===
Window.alert("//TODO send result is: " + response.isSuccess());
 ===
@@ -1046,5 +1064,7 @@ public class ComposeActivity extends App
 >>> make add operation buttons work according to the click events
IUploader getUploader();
 >>> make attachments sending work as expected
+===
+>>> fixed issue#73, using LinkedHashSet in memory to store the contacts 
list like 'Echo Wang '
}
 }

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=1522415&r1=1522414&r2=1522415&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
 Thu Sep 12 04:55:20 2013
@@ -466,6 +466,12 @@ public class ComposeView extends Composi
hideRow(ROW_FOLLOWUP);
// show(addFollowupButton);
}
+   
+
+   @Override
+public void fillContactList(String[] contacts){
+toSuggest.fillOracle(contacts);
+}
 
private void showRow(int row) {
if (isShowing(row)) {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522415&r1=1522414&r2=1522415&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 Thu Sep 12 04:55:20 2013
@@ -500,7 +500,9 @@ public class MessagesCellTable extends D
 package org.apache.hupa.client.ui;
 
 impor

svn commit: r1522413 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:54:38 2013
New Revision: 1522413

URL: http://svn.apache.org/r1522413
Log:
Do not compile language specific permutations until we dont translate all the 
app to other languages

Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1522413&r1=1522412&r2=1522413&view=diff
==
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml 
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml Thu 
Sep 12 04:54:38 2013
@@ -26,8 +26,7 @@
 
   
   
-   
-  
+  
   
 
   



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

svn commit: r1522411 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java activity/ComposeActivity.java activity/MessageContentActivity.java activity/MessageListActi

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:53:54 2013
New Revision: 1522411

URL: http://svn.apache.org/r1522411
Log:
fixed issue#84, actually, in evo, there has been several deprecated classed, 
include WestActivity, which is replaced by FolderListActivity

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522411&r1=1522410&r2=1522411&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:53:54 2013
@@ -362,7 +362,7 @@ public class HupaController {
hupaLayout.switchTo(HupaLayout.LAYOUT_COMPOSE);
} else {
//FIXME when gmail mode
-   this.placeController.goTo(new 
FolderPlace("Mock-Inbox"));
+   this.placeController.goTo(new 
FolderPlace("INBOX"));
}
} else if (place instanceof SettingPlace) {
hupaLayout.switchTo(HupaLayout.LAYOUT_SETTING);

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522411&r1=1522410&r2=1522411&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:53:54 2013
@@ -612,6 +612,14 @@ public class ComposeActivity extends App

registerHandler(display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler));

registerHandler(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler));

registerHandler(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler));
+
+   eventBus.addHandler(MailToEvent.TYPE, new MailToEventHandler(){
+
+   @Override
+   public void onMailTo(MailToEvent event) {
+   display.getTo().setText(event.getMailto());
+   }});
+   
}
 
 <<< HEAD

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522411&r1=1522410&r2=1522411&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 Thu Sep 12 04:53:54 2013
@@ -31,6 +31,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.place.ComposePlace;
 import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
 import org.apache.hupa.client.rf.GetMessageDetailsRequest;
@@ -187,15 +188,23 @@ import org.apache.hupa.client.rf.GetMess
 import org.apache.hupa.client.ui.WidgetDisplayable;
 ===
 >>> replace with IsWidget
+===
+import org.apache.hupa.client.place.ComposePlace;
+import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
+import org.apache.hupa.client.rf.GetMessageDetailsRequest;
+import org.apache.hupa.client.ui.ToolBarView.Parameters;
+>>> fixed issue#84, actually, in evo, there has been several deprecated 
classed, include WestActivity, which is replaced by FolderListActivity
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.MessageAttachment;
 import org.apache.hupa.shared.events.DeleteClickEvent;
 import org.apache.hupa.shared.events.DeleteClickEventHandler;
+import org.apache.hupa.shared.events.MailToEvent;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.event.shared.EventBus;
+import com.google

svn commit: r1522412 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:54:19 2013
New Revision: 1522412

URL: http://svn.apache.org/r1522412
Log:
prepared for issue#73, established the UI layout

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522412&r1=1522411&r2=1522412&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:54:19 2013
@@ -44,6 +44,7 @@ import org.apache.hupa.client.place.Comp
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.place.ContactPlace;
 import org.apache.hupa.client.place.FolderPlace;
 import org.apache.hupa.client.place.HupaPlace;
@@ -87,6 +88,9 @@ import org.apache.hupa.client.place.Mail
 >>> prepare to make composeView's reload work
 ===
 ===
+===
+import org.apache.hupa.client.place.ContactPlace;
+>>> prepared for issue#73, established the UI layout
 import org.apache.hupa.client.place.FolderPlace;
 import org.apache.hupa.client.place.HupaPlace;
 >>> change place management and make refresh folder and message list more 
 >>> gentle
@@ -364,7 +368,9 @@ public class HupaController {
//FIXME when gmail mode
this.placeController.goTo(new 
FolderPlace("INBOX"));
}
-   } else if (place instanceof SettingPlace) {
+   } else if (place instanceof ContactPlace) {
+   hupaLayout.switchTo(HupaLayout.LAYOUT_CONTACT);
+   }  else if (place instanceof SettingPlace) {
hupaLayout.switchTo(HupaLayout.LAYOUT_SETTING);
} else if(place instanceof HupaPlace){
hupaLayout.switchTo(HupaLayout.LAYOUT_MESSAGE);

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=1522412&r1=1522411&r2=1522412&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 04:54:19 2013
@@ -52,6 +52,7 @@ import org.apache.hupa.client.activity.C
 import org.apache.hupa.client.activity.ComposeToolBarActivity;
 import org.apache.hupa.client.activity.ContactPropertiesActivity;
 import org.apache.hupa.client.activity.ContactsListActivity;
+<<< HEAD
 ===
 import org.apache.hupa.client.activity.ComposeContentActivity;
 import org.apache.hupa.client.activity.ComposeHeaderActivity;
@@ -64,6 +65,8 @@ import org.apache.hupa.client.activity.C
 >>> make send text mail work excellently
 import org.apache.hupa.client.activity.ComposeToolBarActivity;
 >>> toggle to display/hide the tool bar view to adjust the compose and 
 >>> message panel
+===
+>>> prepared for issue#73, established the UI layout
 import org.apache.hupa.client.activity.FolderListActivity;
 <<< HEAD
 import org.apache.hupa.client.activity.LabelListActivity;
@@ -233,7 +236,12 @@ import org.apache.hupa.client.mapper.Cac
 import org.apache.hupa.client.mapper.ComposeActivityMapper;
 >>> make send text mail work excellently
 import org.apache.hupa.client.mapper.ComposeToolBarActivityMapper;
+<<< HEAD
 >>> toggle to display/hide the tool bar view to adjust the compose and 
 >>> message panel
+===
+import org.apache.hupa.client.mapper.ContactPropertiesActivityMapper;
+import org.apache.hupa.client.mapper.ContactsListActivityMapper;
+>>> prepared for issue#73, established the UI layout
 import org.apache.hupa.client.mapper.FolderListActivityMapper;
 import org.apache.hupa.client.mapper.LabelListActivi

svn commit: r1522410 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ui/ shared/src/main/java/org/apache/hupa/shared/events/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:53:34 2013
New Revision: 1522410

URL: http://svn.apache.org/r1522410
Log:
fixed issue#81, add refresh event handler

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/RefreshMessagesEvent.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522410&r1=1522409&r2=1522410&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:53:34 2013
@@ -299,7 +299,10 @@ import org.apache.hupa.shared.domain.Use
 import org.apache.hupa.shared.events.DeleteClickEvent;
 import org.apache.hupa.shared.events.DeleteClickEventHandler;
 import org.apache.hupa.shared.events.ExpandMessageEvent;
+import org.apache.hupa.shared.events.RefreshMessagesEvent;
+import org.apache.hupa.shared.events.RefreshMessagesEventHandler;
 import org.apache.hupa.shared.events.RefreshUnreadEvent;
+import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -382,6 +385,13 @@ public class MessageListActivity extends
deleteSelectedMessages();
}
});
+   
+   eventBus.addHandler(RefreshMessagesEvent.TYPE, new 
RefreshMessagesEventHandler(){
+   @Override
+   public void onRefresh(RefreshMessagesEvent event) {
+   display.refresh();
+   }
+   });
 
}
 

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522410&r1=1522409&r2=1522410&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:53:34 2013
@@ -28,6 +28,7 @@ import java.util.List;
 
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.place.FolderPlace;
 ===
 ===
@@ -44,6 +45,8 @@ import org.apache.hupa.client.place.Mail
 ===
 >>> fixed issue#57 - really disable the tools in toolbar
 ===
+===
+>>> fixed issue#81, add refresh event handler
 import org.apache.hupa.client.place.FolderPlace;
 >>> try to make messages list better for user experience
 import org.apache.hupa.client.rf.SetFlagRequest;
@@ -72,6 +75,7 @@ public class ToolBarActivity extends App
@Inject private Displayable display;
@Inject private MessagesCellTable table;
@Inject private MessageListActivity.Displayable messagesDisplay;
+<<< HEAD
private String folderName;
 
@Override
@@ -212,6 +216,8 @@ public class ToolBarActivity extends App
@Inject private MessagesCellTable table;
@Inject private MessageListActivity.Displayable messagesDisplay;
@Inject private HupaController hupaController;
+===
+>>> fixed issue#81, add refresh event handler
private String folderName;
 
@Override
@@ -233,16 +239,20 @@ public class ToolBarActivity extends App
}
 
 <<< HEAD
+<<< HEAD
@Inject private Displayable display;

public interface Displayable extends WidgetDisplayable {}
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 ===
private void bindTo(EventBus eventBus) {
+===
+   private void bindTo(final EventBus eventBus) {
+>>> fixed issue#81, add refresh event handler
registerHandler(display.getMarkRead().addClickHandler(new 
ClickHandler() {
@Override
public void onClick(ClickEvent event) {
-   hupaController.showTopLoading("Loading");
+   hc.showTopLoading("Loading");
toMarkRead(true);
display.getPopup().hide();
}
@@ -250,11 +260,20 @@ public class ToolBarActivity extends App
 

svn commit: r1522409 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:53:03 2013
New Revision: 1522409

URL: http://svn.apache.org/r1522409
Log:
fixed issue#80, make root path empty string ''

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

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=1522409&r1=1522408&r2=1522409&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
 Thu Sep 12 04:53:03 2013
@@ -190,13 +190,14 @@ public class LabelPropertiesView extends
 
@UiField TextBox name;
private String path;
-   
+
@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";
 
private int state;
 
@@ -226,7 +227,12 @@ public class LabelPropertiesView extends
final ImapFolder f = req.create(ImapFolder.class);
f.setFullName(folder.getFullName());
action.setFolder(f);
-   
action.setNewName(parent.getValue(parent.getSelectedIndex()) + "/" + 
name.getText());
+
+   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() {
@Override
public void onSuccess(GenericResult response) {
@@ -362,7 +368,7 @@ public class LabelPropertiesView extends
}
private void makeParentList(LabelNode labelNode, boolean isParent, 
List wholeList) {
parent.clear();
-   parent.addItem("---", "root");
+   parent.addItem("---", ROOT_PATH);
for (LabelNode folderNode : wholeList) {
if (isItself(labelNode, isParent, folderNode) || 
isItsDecendant(labelNode, isParent, folderNode)) {
continue;
@@ -388,7 +394,7 @@ public class LabelPropertiesView extends
}
 
private boolean isKinship(LabelNode labelNode, LabelNode folderNode) {
-   if(folderNode == null){
+   if (folderNode == null) {
return false;
}
if (labelNode.compareTo(folderNode.getParent()) == 0)



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

svn commit: r1522408 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java FolderListView.ui.xml LabelListView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:52:44 2013
New Revision: 1522408

URL: http://svn.apache.org/r1522408
Log:
fixed issue#79, using 100 as the assuming page size of labels list rather than 
CellList's default page size 25

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

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=1522408&r1=1522407&r2=1522408&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
 Thu Sep 12 04:52:44 2013
@@ -47,6 +47,7 @@ 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;
@@ -241,8 +242,9 @@ import com.google.gwt.safehtml.shared.Sa
 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.ScrollPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.view.client.AsyncDataProvider;
 import com.google.gwt.view.client.HasData;
@@ -254,12 +256,13 @@ import com.google.web.bindery.requestfac
 import com.google.web.bindery.requestfactory.shared.ServerFailure;
 
 public class FolderListView extends Composite implements 
FolderListActivity.Displayable {
-   @UiField ScrollPanel thisView;
+   @UiField SimplePanel thisView;
@Inject private HupaController controller;
@Inject private ToolBarActivity.Displayable toolBar;
@Inject private MessageListActivity.Displayable msgListDisplay;
@Inject private PlaceController placeController;
private CellList cellList;
+   private ShowMorePagerPanel pagerPanel;
 
 <<< HEAD
@Inject
@@ -317,13 +320,24 @@ public class FolderListView extends Comp
@Source("res/CssLabelListView.css")
public CellList.Style cellListStyle();
}
+   
+   public static final ProvidesKey KEY_PROVIDER = new 
ProvidesKey() {
+ @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);
-   cellList = new CellList(new FolderCell(), 
Resources.INSTANCE);
+   pagerPanel = new ShowMorePagerPanel();
+   cellList = new CellList(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) {
@@ -334,7 +348,8 @@ public class FolderListView extends Comp
}
});
data.addDataDisplay(cellList);
-   thisView.setWidget(cellList);
+   pagerPanel.setDisplay(cellList);
+   thisView.setWidget(pagerPanel);
}
 
@Override

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=1522408&r1=1522407&r2=1522408&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/mai

svn commit: r1522407 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:52:22 2013
New Revision: 1522407

URL: http://svn.apache.org/r1522407
Log:
make status panel in the message content panel hidden temp

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml?rev=1522407&r1=1522406&r2=1522407&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
 Thu Sep 12 04:52:22 2013
@@ -90,7 +90,7 @@


-   
+   






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

svn commit: r1522406 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java TopBarView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:51:57 2013
New Revision: 1522406

URL: http://svn.apache.org/r1522406
Log:
fixed issue#78, cause not be using the HtmlConstant and nameForDisplay which 
with intents

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java

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=1522406&r1=1522405&r2=1522406&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
 Thu Sep 12 04:51:57 2013
@@ -358,12 +358,14 @@ public class FolderListView extends Comp
@Override
public void render(Context context, LabelNode value, 
SafeHtmlBuilder sb) {
if (value != null) {
-   sb.appendEscaped(value.getName());
-   }
-   if (value.getFolder().getUnseenMessageCount() > 0) {
-   sb.appendHtmlConstant("(");
-   sb.appendHtmlConstant("" + 
value.getFolder().getUnseenMessageCount());
-   sb.appendHtmlConstant(")");
+   if (value.getFolder().getUnseenMessageCount() > 
0) {
+   sb.appendHtmlConstant("");
+   
sb.appendHtmlConstant(value.getNameForDisplay());
+   sb.appendHtmlConstant(" (" + 
value.getFolder().getUnseenMessageCount());
+   sb.appendHtmlConstant(")");
+   } else {
+   
sb.appendHtmlConstant(value.getNameForDisplay());
+   }
}
}
}

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java?rev=1522406&r1=1522405&r2=1522406&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java 
(original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java 
Thu Sep 12 04:51:57 2013
@@ -166,6 +166,7 @@ public class TopBarView extends Composit

@Override
public void showUserName(String userName){
+   userLabel.clear();
userLabel.add(new HTML(userName));
}
 



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

svn commit: r1522405 - in /james/hupa/trunk/server/src/main/java/org/apache/hupa/server: servlet/DownloadAttachmentServlet.java utils/RegexPatterns.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:51:35 2013
New Revision: 1522405

URL: http://svn.apache.org/r1522405
Log:
Fix issue in chrome with inlined images in messages

Modified:

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java

Modified: 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java?rev=1522405&r1=1522404&r2=1522405&view=diff
==
--- 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
 (original)
+++ 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/servlet/DownloadAttachmentServlet.java
 Thu Sep 12 04:51:35 2013
@@ -110,9 +110,10 @@ public class DownloadAttachmentServlet e
 >>> first commit
 ===
 String mode = request.getParameter(SConsts.PARAM_MODE);
-if (!"inline".equals(mode)) {
-   response.setHeader("Content-disposition", "attachment; 
filename="
-   + attachmentName + "");
+boolean inline = "inline".equals(mode);
+if (!inline) {
+   response.setHeader("Content-disposition", "attachment; filename="
+   + attachmentName + "");
 }
 >>> merged with main trunk in apache: replacing rounded borders with gwt 
 >>> decorator boxes, fix Hupa-93 Hupa-94, fix IE issue
 InputStream in = null;
@@ -138,17 +139,23 @@ public class DownloadAttachmentServlet e
 if (in != null) {
 <<< HEAD
 <<< HEAD
+<<< HEAD
+===
+>>> Fix issue in chrome with inlined images in messages
 // FIXME: for some reason Chrome does not display inline 
images when they have the content-length
 // it's like the size reported in server is different than the 
received bytes.
 if (!inline) {
 response.setContentLength(part.getSize());
 }
+<<< HEAD
 ===
 response.setContentLength(part.getSize());
 >>> first commit
 ===
 response.setContentLength(part.getSize());
 >>> first commit
+===
+>>> Fix issue in chrome with inlined images in messages
 IOUtils.copy(in, out);
 } else {
 response.setContentLength(0);

Modified: 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java?rev=1522405&r1=1522404&r2=1522405&view=diff
==
--- 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
 (original)
+++ 
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
 Thu Sep 12 04:51:35 2013
@@ -50,6 +50,7 @@ public class RegexPatterns {
 public static final String repl_inlineImg = "$1'" + SConsts.HUPA + 
SConsts.SERVLET_DOWNLOAD 
 <<< HEAD
 <<< HEAD
+<<< HEAD
 + "?" + SConsts.PARAM_MODE + "=inline" 
 + "&" + SConsts.PARAM_FOLDER + 
"=%%FOLDER%%" 
 ===
@@ -58,6 +59,10 @@ public class RegexPatterns {
 ===
 + "?" + SConsts.PARAM_FOLDER + 
"=%%FOLDER%%" 
 >>> first commit
+===
++ "?" + SConsts.PARAM_MODE + "=inline" 
++ "&" + SConsts.PARAM_FOLDER + 
"=%%FOLDER%%" 
+>>> Fix issue in chrome with inlined images in messages
 + "&" + SConsts.PARAM_UID + "=%%UID%%" 
 + "&" + SConsts.PARAM_NAME + "=$2' 
name='cid:$2'";
 
@@ -110,6 +115,7 @@ public class RegexPatterns {
 
 <<< HEAD
 <<< HEAD
+<<< HEAD
 }
 ===
 }
@@ -117,3 +123,6 @@ public class RegexPatterns {
 ===
 }
 >>> first commit
+===
+}
+>>> Fix issue in chrome with inlined images in messages



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

Build failed in Jenkins: hupa-trunk #348

[Apache Jenkins Server]

See 

Changes:

[dongxu] fixed issue#76 with adding delete handler event

[dongxu] fixed issue#75 with our own CheckboxHeader and DataGrid.redrawHeaders 
method

[dongxu] done issue#72, get back the unread count

[dongxu] Fix grid not resizing since we werent implementing RequiresResize in 
its container. In fact we could get rid of its container

[dongxu] This class should not be here since it is part of GWT and it seems we 
are not patching it

[dongxu] compize the label list

[dongxu] fixed issue#67; fixed issue#69 (with default select inbox folder); 
fixed issue#70;

[dongxu] change a new start at tree view model

[dongxu] remove the cursor pointer style in the attachment box

[dongxu] hide the header in message content panel util the feature is added

[dongxu] add cursor pointer style to the attachment list

[dongxu] add adjusted style to labels list in setting palce

[dongxu] add intents to labels list

[dongxu] replace Label List View in setting place to use ScrollPanel

[dongxu] change the message content view with scrollbar

[dongxu] fixed issue#68, make pager work as expected

[dongxu] replace with IsWidget

[dongxu] Quick fix to make the project compile

[dongxu] fixed issue#64, add attachments region in message content view

[dongxu] fixed issue#65, while this should be improved to add some cache or 
something like

[dongxu] remove useless code

[dongxu] refresh labels list when create/remove label in the setting place, 
while remove label can not refresh now

[dongxu] add top Loading... bar when expanding a message

[dongxu] add top Deleting... bar when delete message(s)

[dongxu] make folders list view refresh automatically according to the actual 
unread message

--
[...truncated 657 lines...]
A client/src/main/java/org/apache/hupa/client/ioc
A client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
A client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java
A 
client/src/main/java/org/apache/hupa/client/HupaConstants_es.properties
A client/src/main/java/org/apache/hupa/client/ui
A client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
A client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
A 
client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
A client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
A 
client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
A client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java
A client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java
A client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
A client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml
A client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.ui.xml
A 
client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java
A 
client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
A client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD
A client/src/main/java/org/apache/hupa/client/ui/res
A client/src/main/java/org/apache/hupa/client/ui/res/loginShadow.png
A 
client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css
A client/src/main/java/org/apache/hupa/client/ui/res/CssLoginView.css
A 
client/src/main/java/org/apache/hupa/client/ui/res/hupa-logo-64-transparent.png
A 
client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
A client/src/main/java/org/apache/hupa/client/ui/res/loginBack.jpg
A 
client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
A client/src/main/java/org/apache/hupa/client/ui/res/styles.css
A client/src/main/java/org/apache/hupa/client/ui/res/ajaxloader.gif
A 
client/src/main/java/org/apache/hupa/client/ui/res/hupa-logo-original-transparent.png
A 
client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css
A client/src/main/java/org/apache/hupa/client/ui/res/buttons.png
A 
client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css~HEAD
A client/src/main/java/org/apache/hupa/client/ui/res/splitter.png
A client/src/main/java/org/apache/hupa/client/ui/res/messages.png
A client/src/main/java/org/apache/hupa/client/ui/res/listicons.png
A client/src/main/java/org/apache/hupa/client/ui/res/linen_header.jpg
A 
client/src/main/java/org/apache/hupa/client/ui/res/hupa_logo_49_transparent.png
A 
client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css~HEAD
A client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
A 
client/src/main/java/org/apache/hupa/client/ui/_CenterContactPanel.java
A clien

svn commit: r1522404 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:51:11 2013
New Revision: 1522404

URL: http://svn.apache.org/r1522404
Log:
fixed issue#77, the reason is that the arguement passed to server was not the 
selected value in the list box

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

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=1522404&r1=1522403&r2=1522404&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
 Thu Sep 12 04:51:11 2013
@@ -106,6 +106,7 @@ public class LabelPropertiesView extends
@Inject HupaController hc;
@Inject EventBus eventBus;
 <<< HEAD
+<<< HEAD
 
 ===

@@ -185,9 +186,18 @@ public class LabelPropertiesView extends
 >>> make add of label setting work in backend
@UiField Button save;

+===
+
+   @UiField TextBox name;
+   private String path;
+   
+   @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 int state;
 
ImapFolder folder;
@@ -210,38 +220,38 @@ public class LabelPropertiesView extends
 ===
void handleSave(ClickEvent e) {
hc.showTopLoading("Saving...");
-   if(state == LabelListActivity.Displayable.CASCADE_TYPE_RENAME){
+   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);
-   action.setNewName(name.getText());
+   
action.setNewName(parent.getValue(parent.getSelectedIndex()) + "/" + 
name.getText());
req.rename(action).fire(new Receiver() {
@Override
public void onSuccess(GenericResult response) {
hc.hideTopLoading();
eventBus.fireEvent(new 
RefreshLabelListEvent());
-   hc.showNotice("The label \"" + 
f.getFullName() + "\" has been renamed to "+name.getText(), 1);
+   hc.showNotice("The label \"" + 
f.getFullName() + "\" has been renamed to " + name.getText(), 1);
}
@Override
public void onFailure(ServerFailure error) {
hc.hideTopLoading();
hc.showNotice(error.getMessage(), 
1);
}
-   }); 
-   } else if (state == 
LabelListActivity.Displayable.CASCADE_TYPE_ADD){
+   });
+   } 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(folder.getFullName()+"/"+name.getText());
+   f.setFullName(path + "/" + name.getText());
action.setFolder(f);
-   req.create(action).fire(new Receiver(){
+   req.create(action).fire(new Receiver() {
@Override
public void onSuccess(GenericResult response) {
hc.hideTopLoading();
eventBus.fireEvent(new 
RefreshLabelListEvent());
-   hc.showNotice("The label \"" + 
f.getFullName() + "\" was created.", 1);
+   hc.showNotice("The label \"" + 
f.getName() + "\" was created.", 1);
}
@Override
public void onFailure(ServerFailure error) {
@@ -249,7 +259,7 @@ public class LabelPropertiesView extends
h

svn commit: r1522402 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/MessagesCellTable.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:50:31 2013
New Revision: 1522402

URL: http://svn.apache.org/r1522402
Log:
fixed issue#75 with our own CheckboxHeader and DataGrid.redrawHeaders method

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522402&r1=1522401&r2=1522402&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:50:31 2013
@@ -255,11 +255,6 @@ public class ToolBarActivity extends App
display.getPopup().hide();
}
}));
-// registerHandler(display.getDeleteReg());
-// registerHandler(display.getMarkReg());
-// registerHandler(display.getReplyReg());
-// registerHandler(display.getReplyAllReg());
-// registerHandler(display.getForwardReg());
}
 
protected void toMarkRead(boolean read) {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522402&r1=1522401&r2=1522402&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 Thu Sep 12 04:50:31 2013
@@ -516,6 +516,7 @@ import org.apache.hupa.shared.domain.Fet
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Message;
 
+import com.google.gwt.cell.client.Cell.Context;
 import com.google.gwt.cell.client.CheckboxCell;
 import com.google.gwt.cell.client.DateCell;
 import com.google.gwt.cell.client.FieldUpdater;
@@ -523,6 +524,9 @@ import com.google.gwt.cell.client.ImageR
 import com.google.gwt.cell.client.TextCell;
 import com.google.gwt.cell.client.ValueUpdater;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.InputElement;
+import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.i18n.client.DateTimeFormat;
@@ -544,6 +548,12 @@ import com.google.web.bindery.requestfac
 
 public class MessagesCellTable extends DataGrid {
 
+   @Inject private ToolBarActivity.Displayable toolBar;
+   @Inject protected HupaController hc;
+   @Inject EventBus eventBus;
+   private String folderName;
+   private String searchValue;
+
public static final int PAGE_SIZE = 25;
 
private HupaImageBundle imageBundle;
@@ -633,12 +643,43 @@ public class MessagesCellTable extends D
}
 
}
+   
+   public final class CheckboxHeader extends Header {
 
-   @Inject private ToolBarActivity.Displayable toolBar;
-   private String folderName;
-   private String searchValue;
-   @Inject protected HupaController hc;
-   @Inject EventBus eventBus;
+   private final MultiSelectionModel 
selectionModel;
+   private final AsyncDataProvider provider;
+
+   public CheckboxHeader(MultiSelectionModel 
selectionModel,
+   AsyncDataProvider provider) {
+   super(new CheckboxCell());
+   this.selectionModel = selectionModel;
+   this.provider = provider;
+   }
+
+   @Override
+   public Boolean getValue() {
+   if(selectionModel == null || provider==null){
+   return false;
+   }
+   if(selectionModel.getSelectedSet().size() == 0 || 
provider.getDataDisplays().size() == 0){
+   return false;
+   }
+   boolean allItemsSelected = 
selectionModel.getSelectedSet().size() == provider.getDataDisplays().size();
+   return allItemsSelected;
+   }
+
+   @Override
+   public void onBrowserEvent(Context context, Element elem, 
NativeEvent event) {
+   InputElement input = elem.getFirstChild().cast();
+   Boolean isChecked = input.isChecked();
+

svn commit: r1522403 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageContentActivity.java activity/MessageListActivity.java ui/MessageContentView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:50:53 2013
New Revision: 1522403

URL: http://svn.apache.org/r1522403
Log:
fixed issue#76 with adding delete handler event

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522403&r1=1522402&r2=1522403&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 Thu Sep 12 04:50:53 2013
@@ -191,6 +191,8 @@ import org.apache.hupa.shared.domain.Get
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.MessageAttachment;
+import org.apache.hupa.shared.events.DeleteClickEvent;
+import org.apache.hupa.shared.events.DeleteClickEventHandler;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.event.shared.EventBus;
@@ -210,6 +212,7 @@ public class MessageContentActivity exte
 
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
+   bindTo(eventBus);
if (isUidSet()) {
GetMessageDetailsRequest req = 
rf.messageDetailsRequest();
GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
@@ -238,6 +241,7 @@ public class MessageContentActivity exte
}
 
 <<< HEAD
+<<< HEAD
@Inject private Displayable display;
 <<< HEAD

@@ -247,6 +251,17 @@ public class MessageContentActivity exte
 ===
 ===
 ===
+===
+   private void bindTo(EventBus eventBus) {
+   eventBus.addHandler(DeleteClickEvent.TYPE, new 
DeleteClickEventHandler() {
+   @Override
+   public void onDeleteClickEvent(DeleteClickEvent event) {
+   display.clearContent();
+   }
+   });
+   }
+
+>>> fixed issue#76 with adding delete handler event
private boolean isUidSet() {
return uid != null && uid.matches("\\d+");
}
@@ -259,6 +274,7 @@ public class MessageContentActivity exte
public interface Displayable extends IsWidget {
 >>> replace with IsWidget
void fillMessageContent(String messageContent);
+   void clearContent();
void setAttachments(List attachements, 
String folder, long uid);
}
 

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522403&r1=1522402&r2=1522403&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:50:53 2013
@@ -341,8 +341,6 @@ public class MessageListActivity extends
public void 
onSuccess(GetMessageDetailsResult response) {
eventBus.fireEvent(new 
ExpandMessageEvent(user, new ImapFolderImpl(folderName), event

.getValue(), response.getMessageDetails()));
-   // 
display.getGrid().getSelectionModel().setSelected(event.getValue(),
-   // true);

display.getGrid().getSelectionModel().setSelected(event.getValue(), true);

toolBar.enableAllTools(true);
ToolBarView.Parameters 
p = new ToolBarView.Parameters(user, folderName, event.getValue(),

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=1522403&r1=1522402&r2=1522403&view=diff
===

svn commit: r1522401 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/FolderListActivity.java activity/ToolBarActivity.java ui/FolderListView.java ui/ToolBarView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:50:12 2013
New Revision: 1522401

URL: http://svn.apache.org/r1522401
Log:
done issue#72, get back the unread count

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java?rev=1522401&r1=1522400&r2=1522401&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
 Thu Sep 12 04:50:12 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.client.activity;
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.shared.events.RefreshUnreadEvent;
 import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
 
@@ -41,6 +42,11 @@ import com.google.gwt.event.shared.Event
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 ===
+===
+import org.apache.hupa.shared.events.RefreshUnreadEvent;
+import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
+
+>>> done issue#72, get back the unread count
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.IsWidget;
@@ -91,6 +97,17 @@ public class FolderListActivity extends 
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
+   bindTo(eventBus);
+   }
+
+   private void bindTo(EventBus eventBus) {
+
+   eventBus.addHandler(RefreshUnreadEvent.TYPE, new 
RefreshUnreadEventHandler() {
+   @Override
+   public void onRefreshEvent(RefreshUnreadEvent event) {
+   display.refresh();
+   }
+   });
}
 
 <<< HEAD

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522401&r1=1522400&r2=1522401&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:50:12 2013
@@ -200,7 +200,6 @@ import com.google.gwt.event.dom.client.C
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.PopupPanel;
@@ -301,11 +300,6 @@ public class ToolBarActivity extends App
public interface Displayable extends IsWidget {
 >>> replace with IsWidget
void enableSendingTools(boolean is);
-   HandlerRegistration getForwardReg();
-   HandlerRegistration getReplyAllReg();
-   HandlerRegistration getReplyReg();
-   HandlerRegistration getMarkReg();
-   HandlerRegistration getDeleteReg();
void enableDealingTools(boolean is);
void enableAllTools(boolean is);
HasClickHandlers getReply();

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=1522401&r1=1522400&r2=1522401&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
 Thu Sep 12 04:50:12 2013
@@ -228,10 +228,6 @@ import org.apache.hupa.client.activity.M
 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.client.ui.LabelListVi

svn commit: r1522400 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:49:50 2013
New Revision: 1522400

URL: http://svn.apache.org/r1522400
Log:
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.java

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=1522400&r1=1522399&r2=1522400&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
 Thu Sep 12 04:49:50 2013
@@ -45,6 +45,7 @@ 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;
@@ -97,11 +98,13 @@ import com.google.gwt.event.shared.Event
 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 {
+public class MessageListView extends Composite implements 
MessageListActivity.Displayable, RequiresResize {
 
@UiField SimpleLayoutPanel thisView;
private MessagesCellTable grid;
@@ -274,5 +277,13 @@ public class MessageListView extends Com
}
 >>> 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();
+}
+
+>>> Fix grid not resizing since we werent implementing RequiresResize in 
its container. In fact we could get rid of its container
 }



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

svn commit: r1522398 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:49:12 2013
New Revision: 1522398

URL: http://svn.apache.org/r1522398
Log:
compize the label list

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

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=1522398&r1=1522397&r2=1522398&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
 Thu Sep 12 04:49:12 2013
@@ -323,7 +323,7 @@ public class LabelListView extends Compo
updateRowCount(-1, true);
} else {
for (ImapFolder folder : 
response) {
-   
fillCellList(folderNodes, folder, LabelNode.ROOT, INTENTS);
+   
fillCellList(folderNodes, folder, LabelNode.ROOT, "");
}
updateRowData(start, 
folderNodes);
}



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

svn commit: r1522399 - /james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:49:32 2013
New Revision: 1522399

URL: http://svn.apache.org/r1522399
Log:
This class should not be here since it is part of GWT and it seems we are not 
patching it

Removed:

james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java


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

svn commit: r1522397 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java FolderListView.ui.xml LabelListView.java res/CssLabelListView.css

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:48:52 2013
New Revision: 1522397

URL: http://svn.apache.org/r1522397
Log:
fixed issue#67; fixed issue#69 (with default select inbox folder); fixed 
issue#70;

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css

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=1522397&r1=1522396&r2=1522397&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
 Thu Sep 12 04:48:52 2013
@@ -23,10 +23,14 @@ package org.apache.hupa.client.ui;
 <<< 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;
@@ -217,24 +221,55 @@ 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.client.ui.LabelListView.ImapLabelListDataProvider;
+import org.apache.hupa.client.ui.LabelListView.LabelCell;
+import org.apache.hupa.client.ui.LabelListView.Resources;
 import org.apache.hupa.client.ui.RightCellTree.Css;
+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.resources.client.ImageResource;
+import com.google.gwt.resources.client.ClientBundle.Source;
+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;
 import com.google.gwt.user.cellview.client.CellTree;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.ScrollPanel;
 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;
+   @UiField ScrollPanel thisView;
+   @Inject private HupaController controller;
+   @Inject private ToolBarActivity.Displayable toolBar;
+   @Inject private MessageListActivity.Displayable msgListDisplay;
+   @Inject private PlaceController placeController;
private CellTree cellTree;
-   private FoldersTreeViewModel viewModel; 
+// private FoldersTreeViewModel viewModel; 
 
+<<< HEAD
@Inject
public FolderListView(final FoldersTreeViewModel viewModel) {
initWidget(binder.createAndBindUi(this));
@@ -281,21 +316,165 @@ public class FolderListView extends Comp
 >>> 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);
 
-   

svn commit: r1522394 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:47:54 2013
New Revision: 1522394

URL: http://svn.apache.org/r1522394
Log:
hide the header in message content panel util the feature is added

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

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=1522394&r1=1522393&r2=1522394&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
 Thu Sep 12 04:47:54 2013
@@ -129,7 +129,7 @@
}


-   
+   






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

svn commit: r1522395 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessageContentView.java MessageContentView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:48:15 2013
New Revision: 1522395

URL: http://svn.apache.org/r1522395
Log:
remove the cursor pointer style in the attachment box

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

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=1522395&r1=1522394&r2=1522395&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
 Thu Sep 12 04:48:15 2013
@@ -273,7 +273,8 @@ public class MessageContentView extends 
 ===
 >>> change the message content view with scrollbar
 
-   @UiField ScrollPanel attachments;
+   //TODO should use a scrolled panel which can contain multiple children
+   @UiField FlowPanel attachments;
 
 <<< HEAD
 >>> prepare for message content panel

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=1522395&r1=1522394&r2=1522395&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
 Thu Sep 12 04:48:15 2013
@@ -51,7 +51,6 @@
}

.attachBox {
-  cursor:pointer;
float: right;
width: 230px;
margin: 8px;
@@ -139,8 +138,8 @@



-   
-   
+   
+   






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

svn commit: r1522396 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:48:33 2013
New Revision: 1522396

URL: http://svn.apache.org/r1522396
Log:
change a new start at tree view model

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522396&r1=1522395&r2=1522396&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 Thu Sep 12 04:48:33 2013
@@ -147,14 +147,15 @@ public class FoldersTreeViewModel implem
}
 
@Override
-   protected void onRangeChanged(HasData display) {
+   protected void onRangeChanged(final HasData 
display) {
rf.fetchFoldersRequest().fetch(folder, 
Boolean.FALSE).fire(new Receiver>() {
@Override
public void onSuccess(List 
response) {
if (response == null || response.size() 
== 0) {
updateRowCount(-1, true);
} else {
-   updateRowData(0, response);
+   int start = 
display.getVisibleRange().getStart();
+   updateRowData(start, response);
}
}
 



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

svn commit: r1522393 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/ui/ webapp/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:47:35 2013
New Revision: 1522393

URL: http://svn.apache.org/r1522393
Log:
add cursor pointer style to the attachment list

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
james/hupa/trunk/client/src/main/webapp/styles.css

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=1522393&r1=1522392&r2=1522393&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
 Thu Sep 12 04:47:35 2013
@@ -111,7 +111,6 @@ 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.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;

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=1522393&r1=1522392&r2=1522393&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
 Thu Sep 12 04:47:35 2013
@@ -51,6 +51,7 @@
}

.attachBox {
+  cursor:pointer;
float: right;
width: 230px;
margin: 8px;

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=1522393&r1=1522392&r2=1522393&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
 Thu Sep 12 04:47:35 2013
@@ -98,7 +98,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.SimpleLayoutPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.inject.Inject;
 

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java?rev=1522393&r1=1522392&r2=1522393&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
 Thu Sep 12 04:47:35 2013
@@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.Com
 import com.google.gwt.user.client.ui.DockLayoutPanel;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.SplitLayoutPanel;

Modified: james/hupa/trunk/client/src/main/webapp/styles.css
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/styles.css?rev=1522393&r1=1522392&r2=1522393&view=diff
==
--- james/hupa/trunk/client/src/main/webapp/styles.css (original)
+++ james/hupa/trunk/client/src/main/webapp/styles.css Thu Sep 12 04:47:35 2013
@@ -2162,6 +2162,11 @@ fieldset.tab {
 color: #0d0eb0;
 text-decoration: underline;
 cursor: pointer;
+}.hupa-attachment .hupa-hyperlink {
+padding-left: 5px;
+color: #0d0eb0;
+text-decoration: underline;
+cursor: pointer;
 }
 
 



--

svn commit: r1522392 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LabelListView.java res/CssLabelListView.css

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:47:14 2013
New Revision: 1522392

URL: http://svn.apache.org/r1522392
Log:
add adjusted style to labels list in setting palce

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css

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=1522392&r1=1522391&r2=1522392&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
 Thu Sep 12 04:47:14 2013
@@ -224,6 +224,13 @@ public class LabelListView extends Compo
@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);
@@ -235,7 +242,7 @@ public class LabelListView extends Compo
public LabelListView(final HupaRequestFactory rf) {
initWidget(binder.createAndBindUi(this));
data = new ImapLabelListDataProvider(rf);
-   CellList cellList = new CellList(new 
LabelCell());
+   CellList cellList = new CellList(new 
LabelCell(), Resources.INSTANCE);
cellList.setSelectionModel(selectionModel);
selectionModel.addSelectionChangeHandler(new 
SelectionChangeEvent.Handler() {
public void onSelectionChange(SelectionChangeEvent 
event) {
@@ -307,6 +314,8 @@ public class LabelListView extends Compo
 
rf.fetchFoldersRequest().fetch(null, 
Boolean.TRUE).fire(new Receiver>() {
 
+   private String INTENTS = 
"";
+
@Override
public void onSuccess(List 
response) {
folderNodes.clear();
@@ -314,7 +323,7 @@ public class LabelListView extends Compo
updateRowCount(-1, true);
} else {
for (ImapFolder folder : 
response) {
-   
fillCellList(folderNodes, folder, LabelNode.ROOT, "");
+   
fillCellList(folderNodes, folder, LabelNode.ROOT, INTENTS);
}
updateRowData(start, 
folderNodes);
}
@@ -331,7 +340,7 @@ public class LabelListView extends Compo
folderNodes.add(labelNode);
if (curFolder.getHasChildren()) {
for (ImapFolder subFolder : 
curFolder.getChildren()) {
-   
fillCellList(folderNodes, subFolder, labelNode, intents + 
"");
+   
fillCellList(folderNodes, subFolder, labelNode, intents + INTENTS);
}
}
}

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css?rev=1522392&r1=1522391&r2=1522392&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssLabelListView.css
 Thu Sep 12 04:47:14 2013
@@ -15,8 +15,11 @@
  */
 .cellListWidget {

+<<< HEAD
cursor:default;

+===
+>>> add adjusted style to labels list in setting palce
 }
 
 .cellListEvenItem {
@@ -52,11 +55,18 @@
 }
 
 .cellListKeyboardSelectedItem {
+<<< HEAD
 background:  #c7e3ef;
 }
 
 .cellListSelectedItem {
background:  #c7e3ef;
+===
+   background: #ffc;
+}
+
+.cellListSelectedItem {
+>>> add adjusted style to labels list in setting palce
 background-color: #c7e3ef;
 color: #004458;
 height: auto;



--

svn commit: r1522391 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageListActivity.java ioc/AppGinModule.java ui/LabelListView.java ui/LabelNode.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:46:51 2013
New Revision: 1522391

URL: http://svn.apache.org/r1522391
Log:
add intents to labels list

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

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/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522391&r1=1522390&r2=1522391&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:46:51 2013
@@ -316,7 +316,7 @@ public class MessageListActivity extends
@Inject private ToolBarActivity.Displayable toolBar;
@Inject private TopBarActivity.Displayable topBar;
private String folderName;
-   private String searchValue;
+// private String searchValue;
private User user;
 
@Override

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=1522391&r1=1522390&r2=1522391&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 04:46:51 2013
@@ -170,6 +170,7 @@ import org.apache.hupa.client.mapper.App
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.mapper.CachingTopActivityMapper;
 <<< HEAD
 <<< HEAD
@@ -225,6 +226,8 @@ import org.apache.hupa.client.mapper.Com
 ===
 import org.apache.hupa.client.mapper.CachingMessageListActivityMapper;
 >>> change message list view to make it not refresh the whole list when 
 >>> click one of the messages
+===
+>>> add intents to labels list
 import org.apache.hupa.client.mapper.CachingTopBarActivityMapper;
 >>> fixed issue#46 and issue#32
 import org.apache.hupa.client.mapper.ComposeActivityMapper;

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=1522391&r1=1522390&r2=1522391&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
 Thu Sep 12 04:46:51 2013
@@ -22,7 +22,6 @@ package org.apache.hupa.client.ui;
 <<< HEAD
 <<< HEAD
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.hupa.client.activity.LabelListActivity;
@@ -208,7 +207,6 @@ import com.google.gwt.user.client.ui.But
 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.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;
@@ -273,10 +271,10 @@ public class LabelListView extends Compo
}
 
if (value.getFolder().getSubscribed()) {
-   sb.appendHtmlConstant(value.getName());
+   
sb.appendHtmlConstant(value.getNameForDisplay());
} else {
sb.appendHtmlConstant("");
-   sb.appendHtmlConstant(value.getName());
+   
sb.appendHtmlConstant(value.getNameForDisplay());
sb.appendHtmlConstant("");
}
}
@@ -305,9 +303,10 @@ public class LabelListView extends Compo
@Override
protected void onRangeChanged(HasData display) {
 
-final int start = display.getVisibleRange().getStart();
+   final int start = display.getVisibleRange().getStart();
 
rf.fetchFoldersRequest().fetch(null, 
Boolean.TRUE).fire(new Receiver>() {
+
@Override
pub

svn commit: r1522388 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/MessageListFooterView.java ui/MessagesCellTable.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:45:51 2013
New Revision: 1522388

URL: http://svn.apache.org/r1522388
Log:
fixed issue#68, make pager work as expected

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522388&r1=1522387&r2=1522388&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:45:51 2013
@@ -49,6 +49,7 @@ import org.apache.hupa.client.place.Fold
 import org.apache.hupa.client.rf.SetFlagRequest;
 import org.apache.hupa.client.ui.MessagesCellTable;
 import org.apache.hupa.client.ui.ToolBarView.Parameters;
+<<< HEAD
 import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
 import org.apache.hupa.shared.domain.GenericResult;
 import org.apache.hupa.shared.domain.ImapFolder;
@@ -186,6 +187,8 @@ import org.apache.hupa.client.ui.ToolBar
 import org.apache.hupa.client.ui.WidgetDisplayable;
 ===
 >>> replace with IsWidget
+===
+>>> fixed issue#68, make pager work as expected
 import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
 import org.apache.hupa.shared.domain.GenericResult;
 import org.apache.hupa.shared.domain.ImapFolder;

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=1522388&r1=1522387&r2=1522388&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
 Thu Sep 12 04:45:51 2013
@@ -142,7 +142,7 @@ public class MessageListFooterView exten
SimplePager.Resources pagerResources = 
GWT.create(SimplePager.Resources.class);
simplePager = new SimplePager(TextLocation.CENTER, 
pagerResources, false, 0, true);
simplePager.setDisplay(table);
-   simplePager.startLoading();
+// simplePager.setRangeLimited(false);
initWidget(binder.createAndBindUi(this));
}
 

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522388&r1=1522387&r2=1522388&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 Thu Sep 12 04:45:51 2013
@@ -603,18 +603,20 @@ public class MessagesCellTable extends D
FetchMessagesRequest req = rf.messagesRequest();
FetchMessagesAction action = 
req.create(FetchMessagesAction.class);
final ImapFolder f = req.create(ImapFolder.class);
+final int start = display.getVisibleRange().getStart();
f.setFullName(parseFolderName(pc));
action.setFolder(f);
action.setOffset(display.getVisibleRange().getLength());
action.setSearchString(searchValue);
-   action.setStart(display.getVisibleRange().getStart());
+   action.setStart(start);
req.fetch(action).fire(new 
Receiver() {
@Override
public void onSuccess(final FetchMessagesResult 
response) {
if (response == null || 
response.getRealCount() == 0) {
updateRowCount(-1, true);
} else {
-   updateRowData(0, 
response.getMessages());
+   
updateRowCount(response.getRealCount(), true);
+   updateRowData(start, 
response.getMessages());
}
hc.hideTopLoading();

svn commit: r1522390 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LabelListView.java LabelListView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:46:28 2013
New Revision: 1522390

URL: http://svn.apache.org/r1522390
Log:
replace Label List View in setting place to use ScrollPanel

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml

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=1522390&r1=1522389&r2=1522390&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
 Thu Sep 12 04:46:28 2013
@@ -207,6 +207,7 @@ import com.google.gwt.user.cellview.clie
 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.user.client.ui.SimplePanel;
 import com.google.gwt.view.client.AsyncDataProvider;
 import com.google.gwt.view.client.HasData;
@@ -220,7 +221,7 @@ import com.google.web.bindery.requestfac
 public class LabelListView extends Composite implements 
LabelListActivity.Displayable {
 
@Inject LabelPropertiesActivity.Displayable labelProperties;
-   @UiField SimplePanel thisView;
+   @UiField ScrollPanel thisView;
 
@UiField Button add;
@UiField Button delete;
@@ -304,6 +305,8 @@ public class LabelListView extends Compo
@Override
protected void onRangeChanged(HasData display) {
 
+final int start = display.getVisibleRange().getStart();
+
rf.fetchFoldersRequest().fetch(null, 
Boolean.TRUE).fire(new Receiver>() {
@Override
public void onSuccess(List 
response) {
@@ -314,7 +317,7 @@ public class LabelListView extends Compo
for (ImapFolder folder : 
response) {

fillCellList(folderNodes, folder, LabelNode.ROOT);
}
-   updateRowData(0, folderNodes);
+   updateRowData(start, 
folderNodes);
}
}
 

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=1522390&r1=1522389&r2=1522390&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
 Thu Sep 12 04:46:28 2013
@@ -19,8 +19,12 @@
 ===


+<<< HEAD

 >>> make delete label in label setting work(backend now)
+===
+   
+>>> replace Label List View in setting place to use ScrollPanel






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

svn commit: r1522389 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessageContentView.java MessageContentView.ui.xml StatusView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:46:08 2013
New Revision: 1522389

URL: http://svn.apache.org/r1522389
Log:
change the message content view with scrollbar

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml

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=1522389&r1=1522388&r2=1522389&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
 Thu Sep 12 04:46:08 2013
@@ -50,12 +50,16 @@ 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
 import com.google.gwt.user.client.ui.SimplePanel;
+===
+>>> change the message content view with scrollbar
 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;
@@ -267,10 +271,10 @@ public class MessageContentView extends 
 ===
 public class MessageContentView extends Composite implements 
MessageContentActivity.Displayable {
 >>> make message content work as expected partly
+===
+>>> change the message content view with scrollbar
 
-   @UiField HTML messageContent;
-
-   @UiField FlowPanel attachments;
+   @UiField ScrollPanel attachments;
 
 <<< HEAD
 >>> prepare for message content panel
@@ -383,7 +387,8 @@ public class MessageContentView extends 
 
@Override
public void fillMessageContent(String messageDetail) {
-   messageContent.setHTML(messageDetail);
+   messageContentHTML.setHTML(messageDetail);
+   messageContent.add(messageContentHTML);
}
 
 <<< HEAD

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=1522389&r1=1522388&r2=1522389&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
 Thu Sep 12 04:46:08 2013
@@ -135,11 +135,11 @@



-   
+   


-   
-   
+   
+   




Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml?rev=1522389&r1=1522388&r2=1522389&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
 Thu Sep 12 04:46:08 2013
@@ -12,9 +12,13 @@
 
 <<< HEAD
+<<< HEAD

 ===
Status
 >>> make login page as one part of the overall layout & splite layout to 
 >>> little one
+===
+   
+>>> change the message content view with scrollbar

 
\ No newline at end of file



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

svn commit: r1522386 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:45:29 2013
New Revision: 1522386

URL: http://svn.apache.org/r1522386
Log:
replace with IsWidget

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:45:29 2013
@@ -71,7 +71,6 @@ import org.apache.hupa.client.place.Comp
 import org.apache.hupa.client.rf.SendForwardMessageRequest;
 import org.apache.hupa.client.rf.SendMessageRequest;
 import org.apache.hupa.client.rf.SendReplyMessageRequest;
-import org.apache.hupa.client.ui.WidgetDisplayable;
 import org.apache.hupa.client.validation.EmailListValidator;
 import org.apache.hupa.shared.Util;
 import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -997,7 +996,7 @@ public class ComposeActivity extends App
 >>> fixed issue#61; add loading to mark, unmark.
}
 
-   public interface Displayable extends WidgetDisplayable {
+   public interface Displayable extends IsWidget {
String getFromText();
void showCc();
void hideCc();

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
 Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
 package org.apache.hupa.client.activity;
 
 <<< HEAD
+<<< HEAD
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.IsWidget;
@@ -29,6 +30,11 @@ import org.apache.hupa.client.ui.WidgetD
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 >>> toggle to display/hide the tool bar view to adjust the compose and 
 >>> message panel
+===
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>> replace with IsWidget
 import com.google.inject.Inject;
 
 public class ComposeToolBarActivity extends AppBaseActivity {
@@ -41,8

svn commit: r1522385 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:44:57 2013
New Revision: 1522385

URL: http://svn.apache.org/r1522385
Log:
Quick fix to make the project compile

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522385&r1=1522384&r2=1522385&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:44:57 2013
@@ -282,7 +282,13 @@ public class ToolBarActivity extends App
});
}
 
-   public interface Displayable extends WidgetDisplayable {
+
+   // FIXME: for some reason if we extend WidgetDisplayable we get the 
error
+   // ToolBarActivity.java:[124,38] error: cannot find symbol
+   public interface Displayable /*extends WidgetDisplayable*/ {
+   // FIXME: added this method until we fix the problem with 
inheritance
+   com.google.gwt.user.client.ui.Widget asWidget();
+
void enableSendingTools(boolean is);
HandlerRegistration getForwardReg();
HandlerRegistration getReplyAllReg();



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

svn commit: r1522384 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageContentActivity.java ui/MessageContentView.java ui/MessageContentView.ui.xml ui/MessageListView

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:44:36 2013
New Revision: 1522384

URL: http://svn.apache.org/r1522384
Log:
fixed issue#64, add attachments region in message content view

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522384&r1=1522383&r2=1522384&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
 Thu Sep 12 04:44:36 2013
@@ -23,6 +23,9 @@ package org.apache.hupa.client.activity;
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
+===
+>>> fixed issue#64, add attachments region in message content view
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -184,6 +187,7 @@ import org.apache.hupa.client.ui.WidgetD
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
 import org.apache.hupa.shared.domain.GetMessageDetailsResult;
 import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.MessageAttachment;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.event.shared.EventBus;
@@ -194,8 +198,7 @@ import com.google.web.bindery.requestfac
 
 public class MessageContentActivity extends AppBaseActivity {
 
-   private static final Logger log = Logger
-   .getLogger(MessageContentActivity.class.getName());
+   private static final Logger log = 
Logger.getLogger(MessageContentActivity.class.getName());
 
@Inject private Displayable display;
private String fullName;
@@ -204,10 +207,8 @@ public class MessageContentActivity exte
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
if (isUidSet()) {
-   GetMessageDetailsRequest req = rf
-   .messageDetailsRequest();
-   GetMessageDetailsAction action = req
-   .create(GetMessageDetailsAction.class);
+   GetMessageDetailsRequest req = 
rf.messageDetailsRequest();
+   GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
final ImapFolder f = req.create(ImapFolder.class);
f.setFullName(fullName);
action.setFolder(f);
@@ -215,8 +216,8 @@ public class MessageContentActivity exte
req.get(action).fire(new 
Receiver() {
@Override
public void onSuccess(GetMessageDetailsResult 
response) {
-   
display.fillMessageContent(response.getMessageDetails()
-   .getText());
+   
display.fillMessageContent(response.getMessageDetails().getText());
+   
display.setAttachments(response.getMessageDetails().getMessageAttachments(), 
fullName, Long.parseLong(uid));
}
 
@Override
@@ -224,7 +225,7 @@ public class MessageContentActivity exte
if (error.isFatal()) {
log.log(Level.SEVERE, 
error.getMessage());
// TODO write the error message 
to status bar.
-throw new 
RuntimeException(error.getMessage());
+   throw new 
RuntimeException(error.getMessage());
}
}
});
@@ -250,10 +251,11 @@ public class MessageContentActivity exte
 >>> make reload message content work, use the same place with folder list, 
 >>> while separated with slash, that looks like Gmail's
public interface Displayable extends WidgetDisplayable {
void fillMessageContent(String messageContent);
+   vo

svn commit: r1522383 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LabelListView.java LabelNode.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:44:11 2013
New Revision: 1522383

URL: http://svn.apache.org/r1522383
Log:
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/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java

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=1522383&r1=1522382&r2=1522383&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
 Thu Sep 12 04:44:11 2013
@@ -288,7 +288,7 @@ public class LabelListView extends Compo
HasData display;
 
public List getDataList() {
-   return Collections.unmodifiableList(folderNodes);
+   return folderNodes;
}
 
public ImapLabelListDataProvider(HupaRequestFactory rf) {
@@ -312,7 +312,7 @@ public class LabelListView extends Compo
updateRowCount(-1, true);
} else {
for (ImapFolder folder : 
response) {
-   
fillCellList(folderNodes, folder, null);
+   
fillCellList(folderNodes, folder, LabelNode.ROOT);
}
updateRowData(0, folderNodes);
}

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=1522383&r1=1522382&r2=1522383&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 
Thu Sep 12 04:44:11 2013
@@ -4,6 +4,9 @@ import org.apache.hupa.shared.domain.Ima
 
 public class LabelNode implements Comparable {
 <<< HEAD
+<<< HEAD
+===
+>>> fixed issue#65, while this should be improved to add some cache or 
something like

public static LabelNode ROOT = new LabelNode("---"); 

@@ -56,15 +59,21 @@ public class LabelNode implements Compar
}
@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
}
 
 }



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

svn commit: r1522381 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/LabelListActivity.java ui/LabelListView.java ui/LabelPropertiesView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:43:31 2013
New Revision: 1522381

URL: http://svn.apache.org/r1522381
Log:
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/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522381&r1=1522380&r2=1522381&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 Thu Sep 12 04:43:31 2013
@@ -131,6 +131,8 @@ import org.apache.hupa.shared.domain.Gen
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.events.DeleteFolderEvent;
 import org.apache.hupa.shared.events.DeleteFolderEventHandler;
+import org.apache.hupa.shared.events.RefreshLabelListEvent;
+import org.apache.hupa.shared.events.RefreshLabelListEventHandler;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -171,6 +173,12 @@ public class LabelListActivity extends A
deleteSelected();
}
});
+   eventBus.addHandler(RefreshLabelListEvent.TYPE, new 
RefreshLabelListEventHandler(){
+   @Override
+   public void onRefreshEvent(RefreshLabelListEvent event) 
{
+   display.refresh();
+   }
+   });
}
 
 <<< HEAD
@@ -189,6 +197,7 @@ public class LabelListActivity extends A
SingleSelectionModel getSelectionModel();
HasClickHandlers getAdd();
HasClickHandlers getDelete();
+   void refresh();
}
 
public void deleteSelected() {
@@ -204,6 +213,7 @@ public class LabelListActivity extends A
@Override
public void onSuccess(GenericResult response) {
hupaController.hideTopLoading();
+   display.refresh();
hupaController.showNotice("The label \"" + 
f.getFullName() + "\" was deleted.", 1);
}
@Override

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=1522381&r1=1522380&r2=1522381&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
 Thu Sep 12 04:43:31 2013
@@ -218,7 +218,7 @@ import com.google.web.bindery.requestfac
 import com.google.web.bindery.requestfactory.shared.ServerFailure;
 
 public class LabelListView extends Composite implements 
LabelListActivity.Displayable {
-   
+
@Inject LabelPropertiesActivity.Displayable labelProperties;
@UiField SimplePanel thisView;
 
@@ -281,10 +281,11 @@ public class LabelListView extends Compo
}
}
 
-   public class ImapLabelListDataProvider extends 
AsyncDataProvider {
+   public class ImapLabelListDataProvider extends 
AsyncDataProvider implements HasRefresh {
 
private HupaRequestFactory rf;
private List folderNodes = new 
ArrayList();
+   HasData display;
 
public List getDataList() {
return Collections.unmodifiableList(folderNodes);
@@ -297,13 +298,16 @@ public class LabelListView extends Compo
@Override
public void addDataDisplay(HasData display) {
super.addDataDisplay(display);
+   this.display = display;
}
 
@Override
protected void onRangeChanged(HasData display) {
+
rf.fetchFoldersRequest().fetch(null, 
Boolean.TRUE).fire(new Receiver>() {
@Override
public void onSuccess(List 
response) {
+   folderNodes.clear();
if (response == null || response.size() 
== 0) {
  

svn commit: r1522382 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessageListView.java MessagesCellTable.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:43:51 2013
New Revision: 1522382

URL: http://svn.apache.org/r1522382
Log:
remove useless code

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

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=1522382&r1=1522381&r2=1522382&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
 Thu Sep 12 04:43:51 2013
@@ -96,12 +96,10 @@ 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.cellview.client.DataGrid;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.view.client.MultiSelectionModel;
-import com.google.gwt.view.client.NoSelectionModel;
 import com.google.inject.Inject;
 
 public class MessageListView extends Composite implements 
MessageListActivity.Displayable {
@@ -261,8 +259,6 @@ public class MessageListView extends Com
List selecteds = new ArrayList();
MultiSelectionModel selectionModel = 
(MultiSelectionModel) grid
.getSelectionModel();
-// NoSelectionModel noSelectionModel = 
(NoSelectionModel)grid.getSelectionModel();
-   
selectionModel.getSelectedSet();
for (Message msg : getSelectedMessages()) {
selecteds.add(msg.getUid());

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522382&r1=1522381&r2=1522382&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 Thu Sep 12 04:43:51 2013
@@ -506,20 +506,15 @@ import org.apache.hupa.client.HupaConsta
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.activity.ToolBarActivity;
 import org.apache.hupa.client.bundles.HupaImageBundle;
-import org.apache.hupa.client.place.AbstractPlace;
 import org.apache.hupa.client.place.FolderPlace;
 import org.apache.hupa.client.place.MessagePlace;
 import org.apache.hupa.client.rf.FetchMessagesRequest;
-import org.apache.hupa.client.rf.GetMessageDetailsRequest;
 import org.apache.hupa.client.rf.HupaRequestFactory;
 import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
 import org.apache.hupa.shared.domain.FetchMessagesAction;
 import org.apache.hupa.shared.domain.FetchMessagesResult;
-import org.apache.hupa.shared.domain.GetMessageDetailsAction;
-import org.apache.hupa.shared.domain.GetMessageDetailsResult;
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Message;
-import org.apache.hupa.shared.events.RefreshUnreadEvent;
 
 import com.google.gwt.cell.client.CheckboxCell;
 import com.google.gwt.cell.client.DateCell;
@@ -530,7 +525,6 @@ import com.google.gwt.cell.client.ValueU
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.place.shared.PlaceController;
@@ -543,9 +537,7 @@ import com.google.gwt.view.client.AsyncD
 import com.google.gwt.view.client.DefaultSelectionEventManager;
 import com.google.gwt.view.client.HasData;
 import com.google.gwt.view.client.MultiSelectionModel;
-import com.google.gwt.view.client.NoSelectionModel;
 import com.google.gwt.view.client.ProvidesKey;
-import com.google.gwt.view.client.SelectionChangeEvent;
 import com.google.inject.Inject;
 import com.google.web.bindery.requestfactory.shared.Receiver;
 import com.google.web.bindery.requestfactory.shared.ServerFailure;
@@ -585,7 +577,6 @@ public class MessagesCellTable extends D
}
};
private final MultiSelectionModel selectionModel = new 
MultiSelectionModel(KEY_PROVIDER);
-// public final NoSelectionModel noSelectionModel = new 
NoSelectionModel(KEY_PROVIDER);
 
PlaceController pc;
HupaRequestF

svn commit: r1522380 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:43:02 2013
New Revision: 1522380

URL: http://svn.apache.org/r1522380
Log:
add top Loading... bar when expanding a message

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522380&r1=1522379&r2=1522380&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:43:02 2013
@@ -326,6 +326,7 @@ public class MessageListActivity extends
@Override
public void onCellPreview(final 
CellPreviewEvent event) {
if (hasClickedButFirstCol(event)) {
+   hc.showTopLoading("Loading...");

antiSelectMessages(display.getGrid().getVisibleItems());
GetMessageDetailsRequest req = 
rf.messageDetailsRequest();
GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
@@ -349,6 +350,7 @@ public class MessageListActivity extends
+ 
event.getValue().getUid());
pc.goTo(place);
display.refresh();
+   hc.hideTopLoading();
eventBus.fireEvent(new 
RefreshUnreadEvent());
}
 
@@ -359,6 +361,7 @@ public class MessageListActivity extends
// TODO write 
the error message to
// status bar.

toolBar.enableAllTools(false);
+   
hc.hideTopLoading();
throw new 
RuntimeException(error.getMessage());
}
}



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

svn commit: r1522379 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:42:32 2013
New Revision: 1522379

URL: http://svn.apache.org/r1522379
Log:
add top Deleting... bar when delete message(s)

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522379&r1=1522378&r2=1522379&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:42:32 2013
@@ -421,6 +421,7 @@ public class MessageListActivity extends
}
}
private void deleteSelectedMessages() {
+   hc.showTopLoading("Deleting...");
String fullName = null;
if (pc.getWhere() instanceof FolderPlace) {
fullName = ((FolderPlace) pc.getWhere()).getToken();
@@ -439,6 +440,7 @@ public class MessageListActivity extends
public void onSuccess(DeleteMessageResult response) {

antiSelectMessages(display.getSelectedMessages());
display.refresh();
+   hc.hideTopLoading();
eventBus.fireEvent(new RefreshUnreadEvent());
}
});



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

svn commit: r1522377 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageListActivity.java ui/MessageListView.java ui/MessagesCellTable.java ui/ToolBarView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:41:52 2013
New Revision: 1522377

URL: http://svn.apache.org/r1522377
Log:
make folders list view refresh automatically according to the actual unread 
message

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522377&r1=1522376&r2=1522377&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:41:52 2013
@@ -296,6 +296,7 @@ import org.apache.hupa.shared.domain.Use
 import org.apache.hupa.shared.events.DeleteClickEvent;
 import org.apache.hupa.shared.events.DeleteClickEventHandler;
 import org.apache.hupa.shared.events.ExpandMessageEvent;
+import org.apache.hupa.shared.events.RefreshUnreadEvent;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -321,48 +322,54 @@ public class MessageListActivity extends
container.setWidget(display.asWidget());
bindTo(eventBus);
display.refresh();
-// 
this.registerHandler(display.getGrid().addCellPreviewHandler(new 
Handler() {
-// @Override
-// public void onCellPreview(final 
CellPreviewEvent event) {
-// if (hasClickedButFirstCol(event)) {
-// 
antiSelectMessages(display.getGrid().getVisibleItems());
-// GetMessageDetailsRequest req = 
rf.messageDetailsRequest();
-// GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
-// final ImapFolder f = 
req.create(ImapFolder.class);
-// f.setFullName(folderName);
-// action.setFolder(f);
-// 
action.setUid(event.getValue().getUid());
-// req.get(action).fire(new 
Receiver() {
-// @Override
-// public void 
onSuccess(GetMessageDetailsResult response) {
-// eventBus.fireEvent(new 
ExpandMessageEvent(user, new ImapFolderImpl(folderName), event
-// 
.getValue(), response.getMessageDetails()));
-   
display.getGrid().getSelectionModel().setSelected(event.getValue(), true);
-// 
display.getGrid().noSelectionModel.setSelected(event.getValue(), true);
-// 
toolBar.enableAllTools(true);
-// ToolBarView.Parameters 
p = new ToolBarView.Parameters(user, folderName, event.getValue(),
-// 
response.getMessageDetails());
-// 
toolBar.setParameters(p);
-// MessagePlace place = 
new MessagePlace(folderName + AbstractPlace.SPLITTER
-// + 
event.getValue().getUid());
-// pc.goTo(place);
-// }
-//
-// @Override
-// public void 
onFailure(ServerFailure error) {
-// if (error.isFatal()) {
-// // 
log.log(Level.SEVERE, error.getMessage());
-// // TODO write 
the error message to
-// // status bar.
-// 
toolBar.enableAllTools(false);
-// throw new 
RuntimeException(error.getMessage());
-// }
-//  

svn commit: r1522376 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageListActivity.java activity/ToolBarActivity.java ui/FoldersTreeViewModel.java ui/MessageListView

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:41:05 2013
New Revision: 1522376

URL: http://svn.apache.org/r1522376
Log:
try to make messages list better for user experience

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522376&r1=1522375&r2=1522376&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:41:05 2013
@@ -320,6 +320,7 @@ public class MessageListActivity extends
public void start(AcceptsOneWidget container, final EventBus eventBus) {
container.setWidget(display.asWidget());
bindTo(eventBus);
+   display.refresh();
 // 
this.registerHandler(display.getGrid().addCellPreviewHandler(new 
Handler() {
 // @Override
 // public void onCellPreview(final 
CellPreviewEvent event) {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522376&r1=1522375&r2=1522376&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:41:05 2013
@@ -34,6 +34,7 @@ import org.apache.hupa.client.place.Fold
 import org.apache.hupa.client.HupaController;
 <<< HEAD
 <<< HEAD
+<<< HEAD
 >>> fixed issue#61; add loading to mark, unmark.
 ===
 import org.apache.hupa.client.place.ComposePlace;
@@ -42,6 +43,9 @@ import org.apache.hupa.client.place.Mail
 >>> fixed issue#59, coupled with fixing some UI refreshment issues in 
 >>> toolsbar
 ===
 >>> fixed issue#57 - really disable the tools in toolbar
+===
+import org.apache.hupa.client.place.FolderPlace;
+>>> try to make messages list better for user experience
 import org.apache.hupa.client.rf.SetFlagRequest;
 import org.apache.hupa.client.ui.MessagesCellTable;
 import org.apache.hupa.client.ui.ToolBarView.Parameters;
@@ -184,6 +188,7 @@ import org.apache.hupa.shared.domain.Gen
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Message;
 import org.apache.hupa.shared.domain.SetFlagAction;
+import org.apache.hupa.shared.events.RefreshUnreadEvent;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -200,7 +205,6 @@ public class ToolBarActivity extends App
@Inject private Displayable display;
@Inject private MessagesCellTable table;
@Inject private MessageListActivity.Displayable messagesDisplay;
-   @Inject private FolderListActivity.Displayable folderListDisplay;
@Inject private HupaController hupaController;
private String folderName;
 
@@ -208,6 +212,9 @@ public class ToolBarActivity extends App
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
bindTo(eventBus);
+   if(pc.getWhere() instanceof FolderPlace){
+   display.enableAllTools(false);
+   }
}
 
public ToolBarActivity with(String folder) {
@@ -242,11 +249,11 @@ public class ToolBarActivity extends App
display.getPopup().hide();
}
}));
-   registerHandler(display.getDeleteReg());
-   registerHandler(display.getMarkReg());
-   registerHandler(display.getReplyReg());
-   registerHandler(display.getReplyAllReg());
-   registerHandler(display.getForwardReg());
+// registerHandler(display.getDeleteReg());
+// registerHandler(display.getMarkReg());
+// registerHandler(display.getReplyReg());
+// regist

Build failed in Jenkins: hupa-trunk #347

[Apache Jenkins Server]

See 

Changes:

[dongxu] try to make messages list better for user experience

[dongxu] change message list view to make it not refresh the whole list when 
click one of the messages

[dongxu] change place management and make refresh folder and message list more 
gentle

[dongxu] try to rearrange the places and history managment.

[dongxu] make add of label setting work in backend

[dongxu] make delete label in label setting work(backend now)

[dongxu] make navigation styles shufflling be working as expected

[dongxu] 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.

[dongxu] try to make switch to setting work

[dongxu] make tool bar's style work as expected

[dongxu] fixed issue#57 - really disable the tools in toolbar

[dongxu] add rename RF to label setting feature

[dongxu] layout the label setting view

[dongxu] pull all folders for label settings

[dongxu] fixed issue#62

[dongxu] make label settings prototype

--
Started by an SCM change
Building remotely on ubuntu1 in workspace 

Updating http://svn.apache.org/repos/asf/james/hupa/trunk at revision 
'2013-09-12T04:41:07.557 +'
U .gitignore
U 
server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.java
U 
server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java
U 
server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java
U widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
U client/src/main/webapp/styles.css
U client/src/main/webapp/Hupa.html
U client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
D client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java
U client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
U client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java
U client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java
U 
client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
U 
client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java
U client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
U client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
U client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
U 
client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java
U client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml
U 
client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
A 
client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml~HEAD
U client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
U client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
U client/src/main/java/org/apache/hupa/client/ui/LabelNode.java
U client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
U 
client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java
U client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java
U 
client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
U client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
U client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml
U client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
U 
client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
U client/src/main/java/org/apache/hupa/client/HupaController.java
D client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
D 
client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
U client/src/main/java/org/apache/hupa/client/place/FolderPlace.java
A 
client/src/main/java/org/apache/hupa/client/place/FolderPlace.java~HEAD
U client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
D 
client/src/main/java/org/apache/hupa/client/mapper/MainActivityMapper.java
D 
client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/m

svn commit: r1522374 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ place/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:39:59 2013
New Revision: 1522374

URL: http://svn.apache.org/r1522374
Log:
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/activity/AppBaseActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java

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/mapper/CachingMessageListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java?rev=1522374&r1=1522373&r2=1522374&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
 Thu Sep 12 04:39:59 2013
@@ -41,6 +41,7 @@ public abstract class AppBaseActivity ex
@Inject protected EventBus eventBus;
@Inject protected HupaController hc;
 <<< HEAD
+<<< HEAD
@Inject protected PlaceController pc;
@Inject protected HupaRequestFactory rf;
 
@@ -65,6 +66,10 @@ public abstract class AppBaseActivity ex
 >>> try to rearrange the places and history managment.
@Inject protected PlaceController placeController;
@Inject protected HupaRequestFactory requestFactory;
+===
+   @Inject protected PlaceController pc;
+   @Inject protected HupaRequestFactory rf;
+>>> change message list view to make it not refresh the whole list when 
click one of the messages
 
 >>> scrub code
protected List registrations = new 
ArrayList();

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522374&r1=1522373&r2=1522374&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:39:59 2013
@@ -699,6 +699,7 @@ public class ComposeActivity extends App
 
if ("new".equals(place.getToken())) {
SendMessageRequest sendReq = 
rf.sendMessageRequest();
+<<< HEAD
SendMessageAction sendAction = 
sendReq.create(SendMessageAction.class);
sendAction.setMessage(parseMessage(sendReq));
 ===
@@ -727,6 +728,8 @@ public class ComposeActivity extends App
 
if ("new".equals(place.getToken())) {
SendMessageRequest sendReq = 
request

svn commit: r1522371 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ activity/ ioc/ mapper/ place/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:37:35 2013
New Revision: 1522371

URL: http://svn.apache.org/r1522371
Log:
try to rearrange the places and history managment.

Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

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/mapper/MessageContentActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522371&r1=1522370&r2=1522371&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:37:35 2013
@@ -99,7 +99,12 @@ import org.apache.hupa.shared.domain.Idl
 import org.apache.hupa.shared.domain.User;
 import org.apache.hupa.shared.events.LoginEvent;
 
+<<< HEAD
 >>> move new theme ui from experiment to hupa evo
+===
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+>>> try to rearrange the places and history managment.
 import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.place.shared.Place;
@@ -409,7 +414,12 @@ public class HupaController {
}
 
public void hideTopLoading() {
-   topBar.hideLoading();
+   Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+   @Override
+   public void execute() {
+   topBar.hideLoading();
+   }
+   });
}
 
private final Timer hideNotice = new Timer() {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java?rev=1522371&r1=1522370&r2=1522371&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
 Thu Sep 12 04:37:35 2013
@@ -24,6 +24,9 @@ import java.util.List;
 
 <<< HEAD
 <<< HEAD
+<<< HEAD
+===
+>>> try to rearrange the places and history managment.
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.rf.HupaRequestFactory;
 
@@ -37,6 +40,7 @@ public abstract class AppBaseActivity ex
 
@Inject protected EventBus eventBus;
@Inject protected HupaController hc;
+<<< HEAD
@Inject protected PlaceController pc;
@Injec

svn commit: r1522370 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/LabelListActivity.java activity/LabelPropertiesActivity.java ui/LabelListView.java ui/LabelPropertiesV

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:36:58 2013
New Revision: 1522370

URL: http://svn.apache.org/r1522370
Log:
make add of label setting work in backend

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522370&r1=1522369&r2=1522370&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 Thu Sep 12 04:36:58 2013
@@ -145,7 +145,10 @@ import com.google.web.bindery.requestfac
 
 public class LabelListActivity extends AppBaseActivity {
 
-   @Inject HupaController hupaController;
+   @Inject private HupaController hupaController;
+   @Inject private Displayable display;
+   @Inject private LabelPropertiesActivity.Displayable labelProperties;
+
 
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
@@ -170,6 +173,7 @@ public class LabelListActivity extends A
});
}
 
+<<< HEAD
@Inject private Displayable display;
 <<< HEAD

@@ -177,14 +181,18 @@ public class LabelListActivity extends A
 >>> make label settings prototype
 ===
 
+===
+>>> make add of label setting work in backend
public interface Displayable extends WidgetDisplayable {
+   final int CASCADE_TYPE_ADD = 0x01;
+   final int CASCADE_TYPE_RENAME = 0x02;
SingleSelectionModel getSelectionModel();
HasClickHandlers getAdd();
HasClickHandlers getDelete();
}
 
public void deleteSelected() {
-   hupaController.showTopLoading("Deleting");
+   hupaController.showTopLoading("Deleting...");
SingleSelectionModel selectionModel = 
display.getSelectionModel();
LabelNode labelNode = selectionModel.getSelectedObject();
DeleteFolderRequest req = requestFactory.deleteFolderRequest();
@@ -203,9 +211,7 @@ public class LabelListActivity extends A
hupaController.hideTopLoading();
hupaController.showNotice(error.getMessage(), 
1);
}
-
});
-
}
 >>> add rename RF to label setting feature
 }

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java?rev=1522370&r1=1522369&r2=1522370&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
 Thu Sep 12 04:36:58 2013
@@ -24,6 +24,7 @@ import java.util.List;
 import org.apache.hupa.client.ui.LabelNode;
 import org.apache.hupa.client.ui.WidgetDisplayable;
 
+import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.inject.Inject;
@@ -38,7 +39,7 @@ public class LabelPropertiesActivity ext
@Inject private Displayable display;
 
public interface Displayable extends WidgetDisplayable {
-
-   void cascade(LabelNode labelNode, List list);
+   void cascade(LabelNode labelNode, List list, int 
cascadeTypeAdd);
+   HasClickHandlers getSave();
}
 }

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=1522370&r1=1522369&r2=1522370&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
 Thu Sep 12 04:36:58 2013
@@ -197,10 +197,12 @@ import org.apache.hupa.sha

svn commit: r1522369 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/activity/ java/org/apache/hupa/client/ui/ webapp/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:36:35 2013
New Revision: 1522369

URL: http://svn.apache.org/r1522369
Log:
make delete label in label setting work(backend now)

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
james/hupa/trunk/client/src/main/webapp/styles.css

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522369&r1=1522368&r2=1522369&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 Thu Sep 12 04:36:35 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.activity;
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.rf.DeleteFolderRequest;
 import org.apache.hupa.client.ui.LabelNode;
@@ -119,17 +120,54 @@ import org.apache.hupa.client.ui.LabelNo
 >>> add rename RF to label setting feature
 ===
 >>> fixed issue#57 - really disable the tools in toolbar
+===
+import org.apache.hupa.client.HupaController;
+import org.apache.hupa.client.rf.DeleteFolderRequest;
+import org.apache.hupa.client.ui.LabelNode;
+>>> make delete label in label setting work(backend now)
 import org.apache.hupa.client.ui.WidgetDisplayable;
+import org.apache.hupa.shared.domain.DeleteFolderAction;
+import org.apache.hupa.shared.domain.GenericResult;
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.events.DeleteFolderEvent;
+import org.apache.hupa.shared.events.DeleteFolderEventHandler;
 
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
+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 LabelListActivity extends AppBaseActivity {
 
+   @Inject HupaController hupaController;
+
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
+   bindTo(eventBus);
+   }
+
+   private void bindTo(final EventBus eventBus) {
+   this.registerHandler(display.getDelete().addClickHandler(new 
ClickHandler() {
+   @Override
+   public void onClick(ClickEvent event) {
+   if (Window.confirm("Are you sure?")) {
+   eventBus.fireEvent(new 
DeleteFolderEvent());
+   }
+   }
+   }));
+   eventBus.addHandler(DeleteFolderEvent.TYPE, new 
DeleteFolderEventHandler() {
+   @Override
+   public void onDeleteFolderEvent(DeleteFolderEvent 
event) {
+   deleteSelected();
+   }
+   });
}
 
@Inject private Displayable display;
@@ -140,6 +178,34 @@ public class LabelListActivity extends A
 ===
 
public interface Displayable extends WidgetDisplayable {
+   SingleSelectionModel getSelectionModel();
+   HasClickHandlers getAdd();
+   HasClickHandlers getDelete();
+   }
+
+   public void deleteSelected() {
+   hupaController.showTopLoading("Deleting");
+   SingleSelectionModel selectionModel = 
display.getSelectionModel();
+   LabelNode labelNode = selectionModel.getSelectedObject();
+   DeleteFolderRequest req = requestFactory.deleteFolderRequest();
+   DeleteFolderAction action = 
req.create(DeleteFolderAction.class);
+   final ImapFolder f = req.create(ImapFolder.class);
+   f.setFullName(labelNode.getFolder().getFullName());
+   action.setFolder(f);
+   req.delete(action).fire(new Recei

svn commit: r1522368 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: NavigationView.java NavigationView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:36:08 2013
New Revision: 1522368

URL: http://svn.apache.org/r1522368
Log:
make navigation styles shufflling be working as expected

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522368&r1=1522367&r2=1522368&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 Thu Sep 12 04:36:08 2013
@@ -34,6 +34,9 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.place.shared.PlaceController;
 <<< HEAD
+<<< HEAD
+===
+>>> make navigation styles shufflling be working as expected
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -43,6 +46,7 @@ import com.google.gwt.user.client.ui.Anc
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
+<<< HEAD
 ===
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -51,6 +55,8 @@ import com.google.gwt.user.client.ui.Anc
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
 >>> try to make switch to setting work
+===
+>>> make navigation styles shufflling be working as expected
 import com.google.inject.Inject;
 
 public class NavigationView extends Composite implements 
NavigationActivity.Displayable{
@@ -59,8 +65,12 @@ public class NavigationView extends Comp
@UiField Anchor mail;
@UiField Anchor setting;
 <<< HEAD
+<<< HEAD
@UiField Anchor contact;
@UiField SimplePanel contactOuter;
+===
+   @UiField Anchor contact;
+>>> make navigation styles shufflling be working as expected
@UiField SimplePanel mailOuter;
@UiField SimplePanel settingOuter;

@@ -71,6 +81,7 @@ public class NavigationView extends Comp
String selected();
String settingsInnerSelected();
String mailInnerSelected();
+<<< HEAD
String contactInnerSelected();
}
 ===
@@ -91,6 +102,9 @@ public class NavigationView extends Comp
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 ===
 >>> try to make switch to setting work
+===
+   }
+>>> make navigation styles shufflling be working as expected
 
public NavigationView() {
initWidget(binder.createAndBindUi(this));
@@ -151,11 +165,19 @@ public class NavigationView extends Comp

@UiHandler("mail")
public void onMailClick(ClickEvent e){
+   mailOuter.addStyleName(style.selected());
+   settingOuter.removeStyleName(style.selected());
+   mail.addStyleName(style.mailInnerSelected());
+   setting.removeStyleName(style.settingsInnerSelected());
placeController.goTo(new MailFolderPlace("Mock-Inbox"));
}

@UiHandler("setting")
public void onSettingClick(ClickEvent e){
+   mailOuter.removeStyleName(style.selected());
+   settingOuter.addStyleName(style.selected());
+   mail.removeStyleName(style.mailInnerSelected());
+   setting.addStyleName(style.settingsInnerSelected());
placeController.goTo(new SettingPlace("folders"));
}
 >>> try to make switch to setting work

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml?rev=1522368&r1=1522367&r2=1522368&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
 Thu Sep 12 04:36:08 2013
@@ -13,10 +13,14 @@
xmlns:g='urn:import:com.google.gwt.user.client.ui'>

 <<< HEAD
+<<< HEAD

 ===

 >>> make login page as one part of the overall layout & splite layout to 
 >>> little one
+===
+   
+>>> make navigation styles shufflling be working as expected

svn commit: r1522367 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:35:42 2013
New Revision: 1522367

URL: http://svn.apache.org/r1522367
Log:
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/HupaController.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522367&r1=1522366&r2=1522367&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:35:42 2013
@@ -90,6 +90,7 @@ import org.apache.hupa.client.place.Sett
 import org.apache.hupa.client.rf.CheckSessionRequest;
 import org.apache.hupa.client.rf.HupaRequestFactory;
 import org.apache.hupa.client.rf.IdleRequest;
+import org.apache.hupa.client.ui.HupaLayout;
 import org.apache.hupa.client.ui.HupaLayoutable;
 import org.apache.hupa.client.ui.LoginLayoutable;
 import org.apache.hupa.client.ui.LoginView;
@@ -348,14 +349,15 @@ public class HupaController {
if (place instanceof ComposePlace) {
ComposePlace here = (ComposePlace) place;
if (here.getParameters() != null) {
-   hupaLayout.switchToCompose();
+   hupaLayout.switchTo(HupaLayout.LAYOUT_COMPOSE);
} else {
+   //FIXME when gmail mode
this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
}
-   } else if(place instanceof SettingPlace) {
-   hupaLayout.switchToSetting();
+   } else if (place instanceof SettingPlace) {
+   hupaLayout.switchTo(HupaLayout.LAYOUT_SETTING);
} else {
-   hupaLayout.switchToMessage();
+   hupaLayout.switchTo(HupaLayout.LAYOUT_MESSAGE);
}
}
 

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=1522367&r1=1522366&r2=1522367&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 04:35:42 2013
@@ -278,7 +278,6 @@ import org.apache.hupa.client.ui.ToolBar
 import org.apache.hupa.client.ui.TopBarView;
 import org.apache.hupa.client.ui.TopView;
 import org.apache.hupa.client.ui.WestView;
-import org.apache.hupa.client.ui._CenterSettingPanel;
 
 import com.google.gwt.activity.shared.ActivityManager;
 <<< HEAD
@@ -569,11 +568,14 @@ public class AppGinModule extends Abstra
bind(LabelPropertiesActivity.class).in(Singleton.class);

 <<< HEAD
+<<< HEAD
bind(_CenterSettingPanel.class).in(Singleton.class);
 >>> attempt to add label setting feature
 ===
 // bind(_CenterSettingPanel.class).in(Singleton.class);
 >>> try to make switch to setting work
+===
+>>> 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.
 
 <<< HEAD
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
URL: 

svn commit: r1522365 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ioc/AppGinModule.java ui/HupaLayout.java ui/HupaLayout.ui.xml ui/NavigationView.java ui/NavigationView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:35:15 2013
New Revision: 1522365

URL: http://svn.apache.org/r1522365
Log:
try to make switch to setting work

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/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml

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=1522365&r1=1522364&r2=1522365&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 04:35:15 2013
@@ -568,8 +568,12 @@ public class AppGinModule extends Abstra
bind(LabelListActivity.class).in(Singleton.class);
bind(LabelPropertiesActivity.class).in(Singleton.class);

+<<< HEAD
bind(_CenterSettingPanel.class).in(Singleton.class);
 >>> attempt to add label setting feature
+===
+// bind(_CenterSettingPanel.class).in(Singleton.class);
+>>> try to make switch to setting work
 
 <<< HEAD
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers

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=1522365&r1=1522364&r2=1522365&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 
Thu Sep 12 04:35:15 2013
@@ -268,13 +268,11 @@ public class HupaLayout implements HupaL
@UiField _CenterPanel centerPanel;
@UiField DockLayoutPanel mainBox;

-   private _CenterSettingPanel settingPanel;
+   @UiField _CenterSettingPanel settingPanel;
 
private LayoutPanel hupaMainPanel;
 
-   @Inject
-   public HupaLayout(_CenterSettingPanel settingPanel) {
-   this.settingPanel = settingPanel;
+   public HupaLayout() {
hupaMainPanel = binder.createAndBindUi(this);
}
 
@@ -311,6 +309,9 @@ public class HupaLayout implements HupaL
}
 
private void changeToMessage() {
+// mainBox.remove(settingPanel);
+   mainBox.setWidgetHidden(settingPanel, true);
+   mainBox.setWidgetHidden(centerPanel,false);
centerPanel.thisPanel.remove(centerPanel.composeContainer);
centerPanel.thisPanel.add(centerPanel.contentPanel);
toolPanel.toggleToCompose(false);
@@ -471,8 +472,9 @@ public interface HupaLayout {
 
@Override
public void switchToSetting() {
-   centerPanel.removeFromParent();
-   mainBox.add(settingPanel);
+// centerPanel.removeFromParent();
+   mainBox.setWidgetHidden(centerPanel, true);
+   mainBox.setWidgetHidden(settingPanel, false);
}
 >>> attempt to add label setting feature
 }

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=1522365&r1=1522364&r2=1522365&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
 Thu Sep 12 04:35:15 2013
@@ -257,6 +257,9 @@



+   
+   
+   

 <<< HEAD
 -->

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522365&r1=1522364&r2=1522365&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
 (original)
+++ 
james/hupa/tru

svn commit: r1522364 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/ToolBarView.java ui/ToolBarView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:34:53 2013
New Revision: 1522364

URL: http://svn.apache.org/r1522364
Log:
make tool bar's style work as expected

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522364&r1=1522363&r2=1522364&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:34:53 2013
@@ -204,6 +204,11 @@ public class ToolBarActivity extends App
//FIXME messagesDisplay can not be injected into ToolBarView, why?
private String folderName;

+   @Override
+   public void onStop(){
+   //for tool bar work as expected, not to unbind event handlers
+   }
+   
 
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522364&r1=1522363&r2=1522364&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
 Thu Sep 12 04:34:53 2013
@@ -95,6 +95,7 @@ import com.google.gwt.resources.client.C
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 <<< HEAD
+<<< HEAD
 import com.google.gwt.uibinder.client.UiHandler;
 <<< HEAD
 import com.google.gwt.user.client.ui.Anchor;
@@ -389,6 +390,9 @@ import com.google.gwt.uibinder.client.Ui
 >>> composing composing panel
 ===
 >>> fixed issue#57 - really disable the tools in toolbar
+===
+import com.google.gwt.uibinder.client.UiHandler;
+>>> make tool bar's style work as expected
 import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DecoratedPopupPanel;
@@ -415,6 +419,9 @@ public class ToolBarView extends Composi
@UiField Anchor delete;
@UiField Anchor mark;
@UiField Anchor more;
+   
+   @UiField HTMLPanel replyAllTip;
+   @UiField HTMLPanel forwardTip;
 
HandlerRegistration replyReg;
HandlerRegistration replyAllReg;
@@ -546,7 +553,16 @@ public class ToolBarView extends Composi
replyReg = reply.addClickHandler(replyHandler);
replyAllReg = replyAll.addClickHandler(replyAllHandler);
forwardReg = forward.addClickHandler(forwardHandler);
+<<< HEAD
 >>> fixed issue#57 - really disable the tools in toolbar
+===
+   enableAllTools(false);
+   }
+
+   @UiHandler("compose")
+   void handleClick(ClickEvent e) {
+   placeController.goTo(new ComposePlace("new").with(parameters));
+>>> make tool bar's style work as expected
}
private ClickHandler forwardHandler = new ClickHandler(){
 
@@ -660,6 +676,8 @@ public class ToolBarView extends Composi
reply.addStyleName(style.disabledButton());
replyAllGroup.addStyleName(style.disabledButton());
forwardGroup.addStyleName(style.disabledButton());
+   replyAllTip.addStyleName(style.disabledButton());
+   forwardTip.addStyleName(style.disabledButton());

replyReg.removeHandler();
replyAllReg.removeHandler();
@@ -670,6 +688,8 @@ public class ToolBarView extends Composi
reply.removeStyleName(style.disabledButton());
replyAllGroup.removeStyleName(style.disabledButton());
forwardGroup.removeStyleName(style.disabledButton());
+   replyAllTip.removeStyleName(style.disabledButton());
+   forwardTip.removeStyleName(style.disabledButton());

replyReg = reply.addClickHandler(replyHandler);
replyAllReg = replyAll.addClickHandler(replyAllHandler);

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522364&r1=1522363&r2=1522364&view

svn commit: r1522362 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:34:08 2013
New Revision: 1522362

URL: http://svn.apache.org/r1522362
Log:
add rename RF to label setting feature

Added:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java~HEAD
  - copied, changed from r1522361, 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml~HEAD
  - copied, changed from r1522361, 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml
Removed:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522362&r1=1522361&r2=1522362&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 Thu Sep 12 04:34:08 2013
@@ -20,6 +20,7 @@
 package org.apache.hupa.client.activity;
 
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.rf.DeleteFolderRequest;
 import org.apache.hupa.client.ui.LabelNode;
@@ -112,6 +113,9 @@ public class LabelListActivity extends A
});
}
 ===
+===
+import org.apache.hupa.client.ui.LabelNode;
+>>> add rename RF to label setting feature
 import org.apache.hupa.client.ui.WidgetDisplayable;
 
 import com.google.gwt.event.shared.EventBus;
@@ -126,7 +130,13 @@ public class LabelListActivity extends A
}
 
@Inject private Displayable display;
+<<< HEAD

public interface Displayable extends WidgetDisplayable {}
 >>> make label settings prototype
+===
+
+   public interface Displayable extends WidgetDisplayable {
+   }
+>>> add rename RF to label setting feature
 }

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java?rev=1522362&r1=1522361&r2=1522362&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
 Thu Sep 12 04:34:08 2013
@@ -22,11 +22,10 @@ package org.apache.hupa.client.activity;
 import java.util.List;
 
 import org.apache.hupa.client.ui.LabelNode;
+import org.apache.hupa.client.ui.WidgetDisplayable;
 
-import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
 import com.google.inject.Inject;
 
 public class LabelPropertiesActivity extends AppBaseActivity {
@@ -38,8 +37,8 @@ public class LabelPropertiesActivity ext
 
@Inject private Displayable display;
 
-   public interface Displayable extends IsWidget {
-   void cascade(LabelNode labelNode, List list, int 
cascadeTypeAdd);
-   HasClickHandlers getSave();
+   public interface Displayable extends WidgetDisplayable {
+
+   void cascade(LabelNode labe

svn commit: r1522363 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/LabelListActivity.java activity/MessageListActivity.java activity/ToolBarActivity.java mapper/MessageL

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:34:31 2013
New Revision: 1522363

URL: http://svn.apache.org/r1522363
Log:
fixed issue#57 - really disable the tools in toolbar

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522363&r1=1522362&r2=1522363&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 Thu Sep 12 04:34:31 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.activity;
 
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.rf.DeleteFolderRequest;
 import org.apache.hupa.client.ui.LabelNode;
@@ -116,6 +117,8 @@ public class LabelListActivity extends A
 ===
 import org.apache.hupa.client.ui.LabelNode;
 >>> add rename RF to label setting feature
+===
+>>> fixed issue#57 - really disable the tools in toolbar
 import org.apache.hupa.client.ui.WidgetDisplayable;
 
 import com.google.gwt.event.shared.EventBus;

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522363&r1=1522362&r2=1522363&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:34:31 2013
@@ -282,6 +282,8 @@ import org.apache.hupa.shared.domain.Get
 import org.apache.hupa.shared.domain.ImapFolder;
 import org.apache.hupa.shared.domain.Message;
 import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.events.DeleteClickEvent;
+import org.apache.hupa.shared.events.DeleteClickEventHandler;
 import org.apache.hupa.shared.events.ExpandMessageEvent;
 import org.apache.hupa.shared.events.LoadMessagesEvent;
 import org.apache.hupa.shared.events.LoadMessagesEventHandler;
@@ -422,6 +424,12 @@ public class MessageListActivity extends
 
}
});
+   eventBus.addHandler(DeleteClickEvent.TYPE, new 
DeleteClickEventHandler(){
+   @Override
+   public void onDeleteClickEvent(DeleteClickEvent event) {
+   deleteSelectedMessages();
+   }
+   });
 
}
 
@@ -463,7 +471,7 @@ public class MessageListActivity extends
display.getGrid().getSelectionModel().setSelected(msg, 
false);
}
}
-   public void deleteSelectedMessages() {
+   private void deleteSelectedMessages() {
MailFolderPlace currentPlace = (MailFolderPlace) 
placeController.getWhere();
final List uids = display.getSelectedMessagesIds();
DeleteMessageByUidRequest req = 
requestFactory.deleteMessageByUidRequest();

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522363&r1=1522362&r2=1522363&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:34:31 2013
@@ -33,12 +33,15 @@ import org.apache.hupa.client.place.Fold
 ===
 import org.apache.hupa.client.HupaController;
 <<< HEAD
+<<< HEAD
 >>> fixed issue#61; add loading to mark, unmark.
 ===
 import org.apache.hupa.client.place.ComposePlace;
 >>> scrub code
 import org.apache.hupa.client.place.MailFolderPlace;
 >>> fixed issue#59, coupled with fixing some UI refreshment issues in 
 >>> toolsbar
+===
+>>> fixed issue#57 - really disable the tools in toolbar
 import org.apache.hupa.cli

svn commit: r1522360 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ioc/ client/src/main/java/org/apache/hupa/client/rf/ client/src/main/java/org/apache/hupa/client/ui/ server/src

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:32:57 2013
New Revision: 1522360

URL: http://svn.apache.org/r1522360
Log:
pull all folders for label settings

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/rf/FetchFoldersRequest.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersService.java

james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.java

james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/FetchFolderServiceTest.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=1522360&r1=1522359&r2=1522360&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 04:32:57 2013
@@ -353,6 +353,7 @@ public class AppGinModule extends Abstra

bind(ComposeToolBarActivity.Displayable.class).to(ComposeToolBarView.class);
 <<< HEAD
 <<< HEAD
+<<< HEAD
bind(ComposeActivity.Displayable.class).to(ComposeView.class);

bind(SearchBoxActivity.Displayable.class).to(SearchBoxView.class);

@@ -369,6 +370,9 @@ public class AppGinModule extends Abstra
 ===
 // 
bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class);
 >>> fixed issue#62
+===
+   bind(ComposeActivity.Displayable.class).to(ComposeView.class);
+>>> pull all folders for label settings


bind(LabelListActivity.Displayable.class).to(LabelListView.class).in(Singleton.class);
 >>> make label settings prototype

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=1522360&r1=1522359&r2=1522360&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
 Thu Sep 12 04:32:57 2013
@@ -32,8 +32,12 @@ import com.google.web.bindery.requestfac
 @Service(value = FetchFoldersService.class, locator = 
IocRfServiceLocator.class)
 public interface FetchFoldersRequest extends RequestContext {
 <<< HEAD
+<<< HEAD
Request> fetch(ImapFolder imapFolder, Boolean 
recursive);
 ===
Request> fetch(ImapFolder imapFolder);
 >>> Fix issue #15.
+===
+   Request> fetch(ImapFolder imapFolder, Boolean 
recursive);
+>>> pull all folders for label settings
 }

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522360&r1=1522359&r2=1522360&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 Thu Sep 12 04:32:57 2013
@@ -97,7 +97,7 @@ public class FoldersTreeViewModel implem
 */
@Override
public  NodeInfo getNodeInfo(T value) {
-   return new DefaultNodeInfo(new 
ImapFolderListDataProvider((ImapFolder) value), new FolderCell(
+   return new DefaultNodeInfo(new 
ImapFolderListDataProvider(rf, (ImapFolder) value), new FolderCell(
ClickEvent.getType().getName()), 
selectionModel, null);
}
 
@@ -158,11 +158,13 @@ public class FoldersTreeViewModel implem
}
}
 
-   class ImapFolderListDataProvider extends AsyncDataProvider {
+   public class ImapFolderListDataProvider extends 
AsyncDataProvider {
 
+   private HupaRequestFactory rf;
private ImapFolder folder;
 
-   public ImapFolderListDataProvider(ImapFolder folder) {
+   public ImapFolderListDataProvider(HupaRequestFactory rf, 
ImapFolder folder) {
+   this.rf = rf;
this.folder = folder;
}
 
@@ -173,7 +175,7 @@ public class 

svn commit: r1522361 - in /james/hupa/trunk: ./ client/src/main/java/org/apache/hupa/client/ui/ client/src/main/java/org/apache/hupa/client/ui/res/ client/src/main/webapp/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:33:24 2013
New Revision: 1522361

URL: http://svn.apache.org/r1522361
Log:
layout the label setting view

Added:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
Modified:
james/hupa/trunk/.gitignore

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
james/hupa/trunk/client/src/main/webapp/Hupa.html

Modified: james/hupa/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1522361&r1=1522360&r2=1522361&view=diff
==
--- james/hupa/trunk/.gitignore (original)
+++ james/hupa/trunk/.gitignore Thu Sep 12 04:33:24 2013
@@ -40,4 +40,10 @@ client/src/main/webapp/hupa/
 >>> add gitignore to ignore files by git
 ===
 
+<<< HEAD
 >>> update git ignore
+===
+client/src/main/gwt-unitCache/
+client/src/main/webapp/WEB-INF/deploy/
+client/src/main/webapp/hupa/
+>>> layout the label setting view

Added: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java?rev=1522361&view=auto
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
 (added)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.java
 Thu Sep 12 04:33:24 2013
@@ -0,0 +1,38 @@
+/
+ * 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.   *
+ /
+
+package org.apache.hupa.client.ui;
+
+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.DecoratorPanel;
+
+public class SettingFolderActionView extends Composite{
+
+   public SettingFolderActionView() {
+   initWidget(binder.createAndBindUi(this));
+   }
+
+   interface Binder extends UiBinder {
+   }
+
+   private static Binder binder = GWT.create(Binder.class);
+
+}

Added: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml?rev=1522361&view=auto
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
 (added)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SettingFolderActionView.ui.xml
 Thu Sep 12 04:33:24 2013
@@ -0,0 +1,94 @@
+
+http://dl.google.com/gwt/DTD/xhtml.ent'>
+
+   
+
+   .propform fieldset {
+   margin-bottom: 20px;
+   border: 0;
+   padding: 0;
+   }
+
+   .propform fieldset legend {
+   display: block;
+   font-size: 14px;
+   font-weight: bold;
+   padding-bottom: 10px;
+   margin-bottom: 0;
+   }
+
+   .propform fieldset fieldset legend {
+   color: #666;
+   font-size: 12px;
+   }
+
+   fieldset.floating {
+   float: left;
+   margin-right: 10px;
+   margin-bottom: 10px;
+   }
+
+   table{
+   border-collapse: collapse;
+   border-spacing:
+

svn commit: r1522359 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ioc/ client/src/main/java/org/apache/hupa/client/ui/ widg

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:32:18 2013
New Revision: 1522359

URL: http://svn.apache.org/r1522359
Log:
fixed issue#62

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java

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/ui/ComposeView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java

james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522359&r1=1522358&r2=1522359&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:32:18 2013
@@ -141,6 +141,7 @@ import com.google.web.bindery.requestfac
 public class ComposeActivity extends AppBaseActivity {
@Inject private Displayable display;
@Inject private HupaController hupaController;
+   @Inject private TopBarActivity topBar;
private List attachments = new 
ArrayList();
 <<< HEAD
 <<< HEAD
@@ -463,6 +464,9 @@ public class ComposeActivity extends App
if (user == null){
user = place.getParameters().getUser();
}
+   if(user == null){
+   user = topBar.getUser();
+   }
display.getFromList().addItem(user.getName());
if("new".equals(place.getToken())){
return;

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522359&r1=1522358&r2=1522359&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
 Thu Sep 12 04:32:18 2013
@@ -247,5 +247,12 @@ public class TopBarActivity extends AppB
void showLoading(String message);
void hideLoading();
}
+<<< HEAD
 >>> add logout support
+===
+   
+   public User getUser(){
+   return user;
+   }
+>>> fixed issue#62
 }

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=1522359&r1=1522358&r2=1522359&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 04:32:18 2013
@@ -352,6 +352,7 @@ public class AppGinModule extends Abstra
bind(StatusActivity.Displayable.class).to(StatusView.class);

bind(ComposeToolBarActivity.Displayable.class).to(ComposeToolBarView.class);
 <<< HEAD
+<<< HEAD
bind(ComposeActivity.Displayable.class).to(ComposeView.class);

bind(SearchBoxActivity.Displayable.class).to(SearchBoxView.class);

@@ -365,6 +366,9 @@ public class AppGinModule extends Abstra
 <<< HEAD
 >>> fixed issue#61; add loading to mark, unmark.
 ===
+===
+// 
bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class);
+>>> fixed issue#62


bind(LabelListActivity.Displayable.class).to(LabelListView.class).in(Singleton.class);
 >>> make label settings prototype

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=1522359&r1=1522358&r2=1522359&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apach

svn commit: r1522358 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:31:43 2013
New Revision: 1522358

URL: http://svn.apache.org/r1522358
Log:
make label settings prototype

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522358&r1=1522357&r2=1522358&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
 Thu Sep 12 04:31:43 2013
@@ -19,6 +19,7 @@
 
 package org.apache.hupa.client.activity;
 
+<<< HEAD
 import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.rf.DeleteFolderRequest;
 import org.apache.hupa.client.ui.LabelNode;
@@ -110,4 +111,22 @@ public class LabelListActivity extends A
}
});
}
+===
+import org.apache.hupa.client.ui.WidgetDisplayable;
+
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.inject.Inject;
+
+public class LabelListActivity extends AppBaseActivity {
+
+   @Override
+   public void start(AcceptsOneWidget container, EventBus eventBus) {
+   container.setWidget(display.asWidget());
+   }
+
+   @Inject private Displayable display;
+   
+   public interface Displayable extends WidgetDisplayable {}
+>>> make label settings prototype
 }

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=1522358&r1=1522357&r2=1522358&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 04:31:43 2013
@@ -146,6 +146,7 @@ import org.apache.hupa.client.activity.F
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 import org.apache.hupa.client.activity.IMAPMessageActivity;
 import org.apache.hupa.client.activity.IMAPMessageListActivity;
+import org.apache.hupa.client.activity.LabelListActivity;
 import org.apache.hupa.client.activity.LoginActivity;
 import org.apache.hupa.client.activity.LogoActivity;
 import org.apache.hupa.client.activity.MessageContentActivity;
@@ -223,6 +224,7 @@ import org.apache.hupa.client.mapper.Com
 import org.apache.hupa.client.mapper.ComposeToolBarActivityMapper;
 >>> toggle to display/hide the tool bar view to adjust the compose and 
 >>> message panel
 import org.apache.hupa.client.mapper.FolderListActivityMapper;
+import org.apache.hupa.client.mapper.LabelListActivityMapper;
 import org.apache.hupa.client.mapper.LoginActivityMapper;
 import org.apache.hupa.client.mapper.LogoActivityMapper;
 import org.apache.hupa.client.mapper.MessageContentActivityMapper;
@@ -256,6 +258,7 @@ import org.apache.hupa.client.ui.IMAPMes
 ===
 >>> 1. improve the inbox folder place.
 import org.apache.hupa.client.ui.IMAPMessageView;
+import org.apache.hupa.client.ui.LabelListView;
 import org.apache.hupa.client.ui.LoginLayout;
 import org.apache.hupa.client.ui.LoginLayoutable;
 import org.apache.hupa.client.ui.LoginView;
@@ -359,7 +362,12 @@ public class AppGinModule extends Abstra

bind(ContactPropertiesActivity.Displayable.class).to(ContactPropertiesView.class).in(Singleton.class);
 ===

bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class);
+<<< HEAD
 >>> fixed issue#61; add loading to mark, unmark.
+===
+   
+   
bind(LabelListActivity.Displayabl

svn commit: r1522357 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:31:08 2013
New Revision: 1522357

URL: http://svn.apache.org/r1522357
Log:
change setting playground's background to be different

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml?rev=1522357&r1=1522356&r2=1522357&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
 Thu Sep 12 04:31:08 2013
@@ -169,7 +169,7 @@
border-radius: 4px 4px 0 0;
}

-   .contentbox .boxtitle,body.iframe .boxtitle {
+   .contentbox .boxtitle {
color: #777;
background: #eee;
background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 
100%);
@@ -216,7 +216,7 @@



-   
+   

PlayGround




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

Build failed in Jenkins: hupa-trunk #346

[Apache Jenkins Server]

See 

Changes:

[dongxu] change setting playground's background to be different

[dongxu] add splitter

[dongxu] add layout styles to three part

[dongxu] attempt to add label setting feature

[dongxu] scrub code

[dongxu] fixed issue#55 ; relative the mark as (un)read

[dongxu] an exception in DEV-MODE

[dongxu] fixed issue#18

[dongxu] fixed issue#61; add loading to mark, unmark.

[dongxu] upgrade maven-processor-plugin to the latest 2.2.4; change the 
middle-man in MessageListActivityMapper to string instead of the whole 
MessageFolderPlace

[dongxu] scrub code

[dongxu] make the notification be able to cope with link

[dongxu] make a notification timer to be able to schedule the notice with 
millis time.

[dongxu] add loading and notification bar(finishing the folder list click 
event), related to the issue#18

[dongxu] fixed issue#59, coupled with fixing some UI refreshment issues in 
toolsbar

[dongxu] fixed issue#58, with the last commit

[dongxu] make the selected toolbar UI work

[dongxu] fix the bugs resulted from the no unit tests

[dongxu] fixed issue#48, and add the original IdleTimer

[dongxu] add the files leaved by last commit

[dongxu] fixed issue#11, write a subclass of SplitLayoutPanel to override its 
onResize but failed, use the native one, and then refactor some names

[dongxu] scrub code

--
Started by an SCM change
Building remotely on ubuntu1 in workspace 

Updating http://svn.apache.org/repos/asf/james/hupa/trunk at revision 
'2013-09-12T04:31:19.092 +'
U pom.xml
U README.txt
U client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
U client/src/main/webapp/styles.css
U client/src/main/webapp/Hupa.html
U client/src/main/webapp/Hupa.css
U client/src/main/webapp/WEB-INF/web.xml
U client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
U client/src/main/java/org/apache/hupa/client/HupaController.java
U 
client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java
A 
client/src/main/java/org/apache/hupa/client/mapper/MainActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java
U 
client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
A 
client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java~HEAD
U 
client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java
A 
client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java~HEAD
U 
client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java
U 
client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java
U client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
U 
client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
U client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
U client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
U client/src/main/java/org/apache/hupa/client/place/ComposePlace.java
U 
client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
U 
client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
U client/src/main/java/org/apache/hupa/client/evo/AppController.java
U client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
U 
client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
U 
client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
U 
client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
U 
client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
U 
cl

svn commit: r1522356 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:30:41 2013
New Revision: 1522356

URL: http://svn.apache.org/r1522356
Log:
add splitter

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css?rev=1522356&r1=1522355&r2=1522356&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssSplitLayoutPanel.css
 Thu Sep 12 04:30:41 2013
@@ -27,6 +27,7 @@
cursor: row-resize;
background-position: center 0;
 }
+<<< HEAD
 
 @external .gwt-SplitLayoutPanel-HDragger;
 @external .gwt-SplitLayoutPanel-VDragger;
@@ -49,4 +50,8 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
-}
\ No newline at end of file
+}
+===
+@external .gwt-SplitLayoutPanel-HDragger;
+@external .gwt-SplitLayoutPanel-VDragger;
+>>> add splitter



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

svn commit: r1522354 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: _CenterSettingPanel.java _CenterSettingPanel.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:29:41 2013
New Revision: 1522354

URL: http://svn.apache.org/r1522354
Log:
add layout styles to three part

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522354&r1=1522353&r2=1522354&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
 Thu Sep 12 04:29:41 2013
@@ -90,17 +90,24 @@ public class _CenterSettingPanel extends
 ===
 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.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
+import com.google.gwt.user.client.ui.SplitLayoutPanel;
 
 public class _CenterSettingPanel extends Composite {
+   
+   @UiField SplitLayoutPanel thisPanel;
 
public _CenterSettingPanel() {
initWidget(binder.createAndBindUi(this));
}
 
+<<< HEAD
interface _CeterSettingPanelUiBinder extends UiBinder {
 >>> attempt to add label setting feature
+===
+   interface _CeterSettingPanelUiBinder extends UiBinder {
+>>> add layout styles to three part
}
 
private static _CeterSettingPanelUiBinder binder = 
GWT.create(_CeterSettingPanelUiBinder.class);

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml?rev=1522354&r1=1522353&r2=1522354&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml
 Thu Sep 12 04:29:41 2013
@@ -134,20 +134,100 @@
 
 
-   
-   
-   Settings
+
+   
+   .uibox {
+   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: #fff;
+   }
+   
+   .listbox {
+   background: #d9ecf4;
+   overflow: hidden;
+   }
+   
+   .boxtitle,.uibox .listing thead td {
+   font-size: 12px;
+   font-weight: bold;
+   padding: 10px 8px 3px 8px;
+   height: 20px; /* doesn't affect table-cells in FF */
+   margin: 0;
+   text-shadow: 0px 1px 1px #fff;
+   border-bottom: 1px solid #bbd3da;
+   white-space: nowrap;
+   }
+   
+   .uibox .boxtitle,.uibox .listing thead td {
+   background: #b0ccd7;
+   color: #004458;
+   border-radius: 4px 4px 0 0;
+   }
+   
+   .contentbox .boxtitle,body.iframe .boxtitle {
+   color: #777;
+   background: #eee;
+   background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 
100%);
+   background: -webkit-gradient(linear, left top, left 
bottom, color-stop(0%, #eee),
+   color-stop(100%, #dfdfdf) );
+   background: -o-linear-gradient(top, #eee 0%, #dfdfdf 
100%);
+   background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 
100%);
+   background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
+   border-bottom: 1px solid #ccc;
+   }
+   
+   body.iframe .boxtitle {
+   position: fixed;
+   top: 0;
+   left: 0;
+   width: 100%;
+   z-index: 100;
+   }
+   
+
+   
+   
+   
+   
+   
+

svn commit: r1522353 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:29:20 2013
New Revision: 1522353

URL: http://svn.apache.org/r1522353
Log:
attempt to add label setting feature

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

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/mapper/AppPlaceHistoryMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:29:20 2013
@@ -82,7 +82,11 @@ import org.apache.hupa.client.place.Defa
 ===
 >>> fixed issue#48, and add the original IdleTimer
 import org.apache.hupa.client.place.MailFolderPlace;
+<<< HEAD
 >>> prepare to make composeView's reload work
+===
+import org.apache.hupa.client.place.SettingPlace;
+>>> attempt to add label setting feature
 import org.apache.hupa.client.rf.CheckSessionRequest;
 import org.apache.hupa.client.rf.HupaRequestFactory;
 import org.apache.hupa.client.rf.IdleRequest;
@@ -348,6 +352,8 @@ public class HupaController {
} else {
this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
}
+   } else if(place instanceof SettingPlace) {
+   hupaLayout.switchToSetting();
} else {
hupaLayout.switchToMessage();
}

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=1522353&r1=1522352&r2=1522353&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 04:29:20 2013
@@ -272,6 +272,7 @@ import org.apache.hupa.client.ui.ToolBar
 import org.apache.hupa.client.ui.TopBarView;
 import org.apache.hupa.client.ui.TopView;
 import org.apache.hupa.client.ui.WestView;
+import org.apache.hupa.client.ui._CenterSettingPanel;
 
 import com.google.gwt.activity.shared.ActivityManager;
 <<< HEAD
@@ -370,6 +371,7 @@ public class AppGinModule extends Abstra
bind(MessageListActivity.class).in(Singleton.class);
bind(ComposeToolBarActivity.class).in(Singleton.class);
bind(ComposeActivity.class).in(Singleton.class);
+<<< HEAD
bind(SearchBoxActivity.class).in(Singleton.class);

bind(LabelListActivity.class).in(Singleton.class);
@@ -538,6 +540,10 @@ public class AppGinModule extends Abstra
bind(MessageListActivity.class).in(Singleton.class);
bind(ComposeToolBarActivity.class).in(Singleton.class);
bind(ComposeActivity.class).in(Singleton.class);
+===
+   
+   bind(_CenterSettingPanel.class).in(Singleton.class);
+>>> attempt to add label setting feature
 
 <<< HEAD
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java?rev=1522353&r1=1522352&r2=1522353&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
 Thu Sep 12 04:29:20 2013
@@ -24,6 +24,7 @@ import org.ap

svn commit: r1522351 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:28:35 2013
New Revision: 1522351

URL: http://svn.apache.org/r1522351
Log:
fixed issue#55 ; relative the mark as (un)read

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522351&r1=1522350&r2=1522351&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
 Thu Sep 12 04:28:35 2013
@@ -718,10 +718,15 @@ public class MessagesCellTable extends D
return object.getReceivedDate();
}
}
+   
+   @Override
+   public void onResize(){
+   super.onResize();
+   refresh();
+   }
 
public void refresh() {
redraw();
-   onResize();
flush();
}
 

Modified: 
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?rev=1522351&r1=1522350&r2=1522351&view=diff
==
--- 
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
 (original)
+++ 
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
 Thu Sep 12 04:28:35 2013
@@ -406,6 +406,7 @@ public class MockIMAPFolder extends IMAP
 for (int i = 0; i < ints.length; i++) {
 <<< HEAD
 <<< HEAD
+<<< HEAD
 int mInt = ints[i];
 if (mInt > messages.size() || mInt < 0) {
 throw new MessagingException();
@@ -423,6 +424,13 @@ public class MockIMAPFolder extends IMAP
 >>> first commit
 ===
 >>> first commit
+===
+int mInt = ints[i];
+if (mInt > messages.size() || mInt < 0) {
+throw new MessagingException();
+}
+array[i] = messages.get(ints[i]);
+>>> fixed issue#55 ; relative the mark as (un)read
 }
 return array;
 }



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

svn commit: r1522352 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/ToolBarView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:28:55 2013
New Revision: 1522352

URL: http://svn.apache.org/r1522352
Log:
scrub code

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522352&r1=1522351&r2=1522352&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
 Thu Sep 12 04:28:55 2013
@@ -32,7 +32,11 @@ import org.apache.hupa.client.place.Fold
 ===
 ===
 import org.apache.hupa.client.HupaController;
+<<< HEAD
 >>> fixed issue#61; add loading to mark, unmark.
+===
+import org.apache.hupa.client.place.ComposePlace;
+>>> scrub code
 import org.apache.hupa.client.place.MailFolderPlace;
 >>> fixed issue#59, coupled with fixing some UI refreshment issues in 
 >>> toolsbar
 import org.apache.hupa.client.rf.SetFlagRequest;
@@ -220,6 +224,7 @@ public class ToolBarActivity extends App
 >>> integrate all of the views to their corresponding activities and 
 >>> mappers
 ===
private void bindTo(EventBus eventBus) {
+
registerHandler(display.getMark().addClickHandler(new 
ClickHandler() {
public void onClick(ClickEvent event) {
Widget source = (Widget) event.getSource();

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522352&r1=1522351&r2=1522352&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
 Thu Sep 12 04:28:55 2013
@@ -475,10 +475,10 @@ public class ToolBarView extends Composi
}
 
@UiHandler("compose")
-   void handleClick(ClickEvent e) {
+   void handleCompose(ClickEvent e){
placeController.goTo(new ComposePlace("new").with(parameters));
}
-
+   
@UiHandler("reply")
void handleReplyClick(ClickEvent e) {
placeController.goTo(new 
ComposePlace("reply").with(parameters));
@@ -633,6 +633,7 @@ public class ToolBarView extends Composi
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
@Override
public HasClickHandlers getRefresh() {
return refresh;
@@ -647,4 +648,7 @@ public class ToolBarView extends Composi
 >>> dynamical style tool bar
 ===
 >>> add enable tool bar buttons toggling event, with being related to 
 >>> issue #31
+===
+
+>>> scrub code
 }



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

svn commit: r1522350 - /james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:28:09 2013
New Revision: 1522350

URL: http://svn.apache.org/r1522350
Log:
an exception in DEV-MODE

Modified:

james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java

Modified: 
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?rev=1522350&r1=1522349&r2=1522350&view=diff
==
--- 
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
 (original)
+++ 
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
 Thu Sep 12 04:28:09 2013
@@ -415,7 +415,7 @@ public class MockIMAPFolder extends IMAP
 ===
 >>> first commit
 int mInt = ints[i] - 1;
-if (mInt > messages.size() || mInt < messages.size()) {
+if (mInt > messages.size() || mInt < messages.size()) {//TODO will 
throw an exception when mark as read
 throw new MessagingException();
 }
 array[i] = messages.get(i);



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

svn commit: r1522348 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ activity/ ioc/ mapper/ ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:26:53 2013
New Revision: 1522348

URL: http://svn.apache.org/r1522348
Log:
fixed issue#61; add loading to mark, unmark.

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java

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/mapper/ComposeActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522348&r1=1522347&r2=1522348&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:26:53 2013
@@ -26,11 +26,15 @@ package org.apache.hupa.client;
 <<< HEAD
 <<< HEAD
 import org.apache.hupa.client.activity.NotificationActivity;
+<<< HEAD
 import org.apache.hupa.client.activity.ToolBarActivity;
 import org.apache.hupa.client.activity.TopBarActivity;
 ===
 import org.apache.hupa.client.activity.NotificationActivity;
 >>> make a notification timer to be able to schedule the notice with 
 >>> millis time.
+===
+import org.apache.hupa.client.activity.TopBarActivity;
+>>> fixed issue#61; add loading to mark, unmark.
 import org.apache.hupa.client.mapper.ActivityManagerInitializer;
 import org.apache.hupa.client.place.ComposePlace;
 <<< HEAD
@@ -148,6 +152,7 @@ public class HupaController {
@Inject private HupaRequestFactory requestFactory;
@Inject private LoginLayoutable loginLayout;
@Inject private NotificationActivity.Displayable noticeRegion;
+   @Inject private TopBarActivity.Displayable topBar;
private EventBus eventBus;
 
private Timer noopTimer = new IdleTimer();
@@ -334,11 +339,11 @@ public class HupaController {
Place place = event.getNewPlace();
 
if (place instanceof ComposePlace) {
-// if (((ComposePlace) place).getParameters() != null) {
+   if (((ComposePlace) place).getParameters() != null) {
hupaLayout.switchToCompose();
-// } else {
-// this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
-// }
+   } else {
+   this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
+   }
} else {
hupaLayout.switchToMessage();
}
@@ -387,6 +392,14 @@ public class HupaController {
hideNotice.schedule(millis);
 }
 
+public void showTopLoading(String message){
+   topBar.showLoading(message);
+}
+
+public void hideTopLoading(){
+   topBar.hideLoading();
+}
+
 private final Timer hideNotice = new Timer() {
 public void run() {
noticeRegion.hideNotification();

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522348&r1=1522347&r2=1522348&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:26:53 2013
@@ -66,6 +66,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.hupa.client.HupaController;
 import org.apache.hupa.client.place.ComposePlace;
 import org.apache.hupa.client.rf.SendForwardMessageRequest;
 import org.apache.hupa.client.rf.SendMessageRequest;
@@ -83,6 +84,9 @@ import o

svn commit: r1522349 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java activity/ComposeActivity.java activity/ToolBarActivity.java mapper/ComposeActivityMapper.ja

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:27:16 2013
New Revision: 1522349

URL: http://svn.apache.org/r1522349
Log:
fixed issue#18

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522349&r1=1522348&r2=1522349&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:27:16 2013
@@ -27,6 +27,9 @@ package org.apache.hupa.client;
 <<< HEAD
 import org.apache.hupa.client.activity.NotificationActivity;
 <<< HEAD
+<<< HEAD
+===
+>>> fixed issue#18
 import org.apache.hupa.client.activity.ToolBarActivity;
 import org.apache.hupa.client.activity.TopBarActivity;
 ===
@@ -153,6 +156,7 @@ public class HupaController {
@Inject private LoginLayoutable loginLayout;
@Inject private NotificationActivity.Displayable noticeRegion;
@Inject private TopBarActivity.Displayable topBar;
+   @Inject private ToolBarActivity.Displayable toolBar;
private EventBus eventBus;
 
private Timer noopTimer = new IdleTimer();
@@ -337,9 +341,9 @@ public class HupaController {
 
private void adjustLayout(PlaceChangeEvent event) {
Place place = event.getNewPlace();
-
if (place instanceof ComposePlace) {
-   if (((ComposePlace) place).getParameters() != null) {
+   ComposePlace here = (ComposePlace) place;
+   if (here.getParameters() != null) {
hupaLayout.switchToCompose();
} else {
this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
@@ -386,25 +390,25 @@ public class HupaController {
});
}
 
-public void showNotice(String html, int millis){
-   noticeRegion.notice(html);
-if (millis > 0)
-   hideNotice.schedule(millis);
-}
-
-public void showTopLoading(String message){
-   topBar.showLoading(message);
-}
-
-public void hideTopLoading(){
-   topBar.hideLoading();
-}
-
-private final Timer hideNotice = new Timer() {
-public void run() {
-   noticeRegion.hideNotification();
-}
-};
+   public void showNotice(String html, int millis) {
+   noticeRegion.notice(html);
+   if (millis > 0)
+   hideNotice.schedule(millis);
+   }
+
+   public void showTopLoading(String message) {
+   topBar.showLoading(message);
+   }
+
+   public void hideTopLoading() {
+   topBar.hideLoading();
+   }
+
+   private final Timer hideNotice = new Timer() {
+   public void run() {
+   noticeRegion.hideNotification();
+   }
+   };
 
private class IdleTimer extends Timer {
boolean running = false;

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522349&r1=1522348&r2=1522349&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
 Thu Sep 12 04:27:16 2013
@@ -458,11 +458,16 @@ public class ComposeActivity extends App
}
 
private void fillHeader() {
-   if (place == null)
+   if (place == null || place.getParameters() == null)
return;
+   if (user == null){
+   user = place.getParameters().getUser();
+   }
+   display.getFromList().addItem(user.getName());
+   if("new".equals(place.getToken())){
+   return;
+   }
Message oldMessage = place.getParameters().getOldmessage();
-   if (user != null)
-   display.getFromList().addItem(user.getName());
  

svn commit: r1522347 - in /james/hupa/trunk/client: ./ src/main/java/org/apache/hupa/client/ src/main/java/org/apache/hupa/client/activity/ src/main/java/org/apache/hupa/client/evo/ src/main/java/org/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:26:28 2013
New Revision: 1522347

URL: http://svn.apache.org/r1522347
Log:
upgrade maven-processor-plugin to the latest 2.2.4; change the middle-man in 
MessageListActivityMapper to string instead of the whole MessageFolderPlace

Modified:
james/hupa/trunk/client/pom.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java

james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java

Modified: james/hupa/trunk/client/pom.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522347&r1=1522346&r2=1522347&view=diff
==
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 04:26:28 2013
@@ -327,7 +327,7 @@
 
 org.bsc.maven
 maven-processor-plugin
-2.0.5
+2.2.4
 
 
 process

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:26:28 2013
@@ -334,11 +334,11 @@ public class HupaController {
Place place = event.getNewPlace();
 
if (place instanceof ComposePlace) {
-   if (((ComposePlace) place).getParameters() != null) {
+// if (((ComposePlace) place).getParameters() != null) {
hupaLayout.switchToCompose();
-   } else {
-   this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
-   }
+// } else {
+// this.placeController.goTo(new 
MailFolderPlace("Mock-Inbox"));
+// }
} else {
hupaLayout.switchToMessage();
}

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:26:28 2013
@@ -301,7 +301,7 @@ public class MessageListActivity extends
@Inject private PlaceController placeController;
@Inject private ToolBarActivity.Displayable toolBar;
@Inject private TopBarActivity.Displayable topBar;
-   private ImapFolder folder;
+   private String folderName;
private String searchValue;
private User user;
private boolean pending;
@@ -318,13 +318,13 @@ public class MessageListActivity extends
GetMessageDetailsRequest req = 
requestFactory.messageDetailsRequest();
GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
final ImapFolder f = 
req.create(ImapFolder.class);
-   f.setFullName(folder.getFullName());
+   f.setFullName(folderName);
action.setFolder(f);

action.setUid(event.getValue().getUid());
req.get(action).fire(new 
Receiver() {
@Override
public void 
onSuccess(GetMessageDetailsResult response) {
-  

svn commit: r1522345 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java activity/NotificationActivity.java ui/FoldersTreeViewModel.java ui/NotificationView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:25:36 2013
New Revision: 1522345

URL: http://svn.apache.org/r1522345
Log:
make the notification be able to cope with link

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522345&r1=1522344&r2=1522345&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:25:36 2013
@@ -97,6 +97,7 @@ import com.google.gwt.place.shared.Place
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
 import com.google.inject.Inject;
@@ -129,6 +130,8 @@ public class HupaController {
 ===
 import com.google.gwt.safehtml.shared.SafeHtml;
 >>> make a notification timer to be able to schedule the notice with 
 >>> millis time.
+===
+>>> make the notification be able to cope with link
 import com.google.gwt.user.client.Timer;
 >>> fixed issue#48, and add the original IdleTimer
 import com.google.gwt.user.client.ui.RootLayoutPanel;
@@ -378,7 +381,7 @@ public class HupaController {
});
}
 
-public void showNotice(SafeHtml html, int millis){
+public void showNotice(String html, int millis){
noticeRegion.notice(html);
 if (millis > 0)
hideNotice.schedule(millis);

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java?rev=1522345&r1=1522344&r2=1522345&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
 Thu Sep 12 04:25:36 2013
@@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.IsW
 import org.apache.hupa.client.ui.WidgetDisplayable;
 
 import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 >>> add loading and notification bar(finishing the folder list click 
 >>> event), related to the issue#18
 import com.google.inject.Inject;
@@ -48,7 +47,11 @@ public class NotificationActivity extend
 ===
public interface Displayable extends WidgetDisplayable {
void hideNotification();
+<<< HEAD
void notice(SafeHtml html);
 >>> add loading and notification bar(finishing the folder list click 
 >>> event), related to the issue#18
+===
+   void notice(String html);
+>>> make the notification be able to cope with link
}
 }

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522345&r1=1522344&r2=1522345&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 Thu Sep 12 04:25:36 2013
@@ -71,7 +71,7 @@ public class FoldersTreeViewModel implem
@Override
public void onSelectionChange(SelectionChangeEvent 
event) {
topBar.showLoading();//FIXME delay to show, why
-   
controller.showNotice(SafeHtmlUtils.fromString("Hi, this is the notification 
test.Link"), 3000);
+   controller.showNotice("Hi, this is the 
notification test.Link", 1);
 // notice.notice(SafeHtmlUtils.fromString("Hi, 
this is the notification test.Link"));
SingleSelectionModel selectionModel 
= (SingleSelectionModel) event.getSource();
currentFolder = 
selectionModel.getSelectedObject();

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui

svn commit: r1522346 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:25:55 2013
New Revision: 1522346

URL: http://svn.apache.org/r1522346
Log:
scrub code

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522346&r1=1522345&r2=1522346&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
 Thu Sep 12 04:25:55 2013
@@ -41,7 +41,6 @@ import com.google.gwt.event.dom.client.C
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.place.shared.PlaceController;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.view.client.AsyncDataProvider;
 import com.google.gwt.view.client.HasData;
 import com.google.gwt.view.client.ProvidesKey;
@@ -72,7 +71,6 @@ public class FoldersTreeViewModel implem
public void onSelectionChange(SelectionChangeEvent 
event) {
topBar.showLoading();//FIXME delay to show, why
controller.showNotice("Hi, this is the 
notification test.Link", 1);
-// notice.notice(SafeHtmlUtils.fromString("Hi, 
this is the notification test.Link"));
SingleSelectionModel selectionModel 
= (SingleSelectionModel) event.getSource();
currentFolder = 
selectionModel.getSelectedObject();
eventBus.fireEvent(new LoadMessagesEvent(user, 
selectionModel.getSelectedObject()));



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

svn commit: r1522344 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java activity/MessageListActivity.java ui/FoldersTreeViewModel.java ui/NotificationView.ui.xml

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:25:13 2013
New Revision: 1522344

URL: http://svn.apache.org/r1522344
Log:
make a notification timer to be able to schedule the notice with millis time.

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.ui.xml

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522344&r1=1522343&r2=1522344&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
 Thu Sep 12 04:25:13 2013
@@ -24,9 +24,13 @@ package org.apache.hupa.client;
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import org.apache.hupa.client.activity.NotificationActivity;
 import org.apache.hupa.client.activity.ToolBarActivity;
 import org.apache.hupa.client.activity.TopBarActivity;
+===
+import org.apache.hupa.client.activity.NotificationActivity;
+>>> make a notification timer to be able to schedule the notice with 
millis time.
 import org.apache.hupa.client.mapper.ActivityManagerInitializer;
 import org.apache.hupa.client.place.ComposePlace;
 <<< HEAD
@@ -92,6 +96,7 @@ import com.google.gwt.place.shared.Place
 import com.google.gwt.place.shared.PlaceHistoryHandler;
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
 import com.google.inject.Inject;
@@ -121,6 +126,9 @@ public class HupaController {
this.eventBus = eventBus;
 ===
 ===
+===
+import com.google.gwt.safehtml.shared.SafeHtml;
+>>> make a notification timer to be able to schedule the notice with 
millis time.
 import com.google.gwt.user.client.Timer;
 >>> fixed issue#48, and add the original IdleTimer
 import com.google.gwt.user.client.ui.RootLayoutPanel;
@@ -136,6 +144,7 @@ public class HupaController {
@Inject private HupaLayoutable hupaLayout;
@Inject private HupaRequestFactory requestFactory;
@Inject private LoginLayoutable loginLayout;
+   @Inject private NotificationActivity.Displayable noticeRegion;
private EventBus eventBus;
 
private Timer noopTimer = new IdleTimer();
@@ -369,6 +378,18 @@ public class HupaController {
});
}
 
+public void showNotice(SafeHtml html, int millis){
+   noticeRegion.notice(html);
+if (millis > 0)
+   hideNotice.schedule(millis);
+}
+
+private final Timer hideNotice = new Timer() {
+public void run() {
+   noticeRegion.hideNotification();
+}
+};
+
private class IdleTimer extends Timer {
boolean running = false;
 

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522344&r1=1522343&r2=1522344&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:25:13 2013
@@ -380,12 +380,12 @@ public class MessageListActivity extends
assert result != null;

display.getGrid().setRowCount(result.getRealCount());
display.getGrid().setRowData(start, 
result.getMessages());
-// Scheduler.get().scheduleDeferred(new 
ScheduledCommand() {
-// @Override
-// public void execute() {
-// topBar.hideLoading();
-// }
-// });
+   Scheduler.get().scheduleDeferred(new 
ScheduledCommand() {
+   @Override
+   public void execute() {
+   topBar.hideLoading();
+   }
+   });
}
 
@Override

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL: 
http://svn.a

svn commit: r1522343 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/activity/ java/org/apache/hupa/client/ioc/ java/org/apache/hupa/client/mapper/ java/org/apache/hupa/client/ui/

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:24:50 2013
New Revision: 1522343

URL: http://svn.apache.org/r1522343
Log:
add loading and notification bar(finishing the folder list click event), 
related to the issue#18

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java

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/mapper/ActivityManagerInitializer.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.ui.xml

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml
james/hupa/trunk/client/src/main/webapp/Hupa.html

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:24:50 2013
@@ -299,7 +299,8 @@ public class MessageListActivity extends
@Inject private Displayable display;
@Inject private HupaRequestFactory requestFactory;
@Inject private PlaceController placeController;
-   @Inject private ToolBarActivity.Displayable toolBarDisplay;
+   @Inject private ToolBarActivity.Displayable toolBar;
+   @Inject private TopBarActivity.Displayable topBar;
private ImapFolder folder;
private String searchValue;
private User user;
@@ -379,6 +380,12 @@ public class MessageListActivity extends
assert result != null;

display.getGrid().setRowCount(result.getRealCount());
display.getGrid().setRowData(start, 
result.getMessages());
+// Scheduler.get().scheduleDeferred(new 
ScheduledCommand() {
+// @Override
+// public void execute() {
+// topBar.hideLoading();
+// }
+// });
}
 
@Override
@@ -443,7 +450,7 @@ public class MessageListActivity extends
private void antiSelectMessages(Collection c) {
for (Message msg : c) {
display.getGrid().getSelectionModel().setSelected(msg, 
false);
-   toolBarDisplay.enableAllTools(false);
+   toolBar.enableAllTools(false);
}
}
public void deleteSelectedMessages() {

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java?rev=1522343&r1=1522342&r2=1522343&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
 Thu Sep 12 04:24:50 2013
@@ -19,9 +19,17 @@
 
 package org.apache.hupa.client.activity;
 
+<<< HEAD
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.IsWidget;
+===
+import org.apache.hupa.client.ui.WidgetDisplayable;
+
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+>>> add loading and notification bar(finishing the folder list click 
event), related to the issue#18
 import com.google.inject.Inject;

svn commit: r1522342 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageListActivity.java activity/ToolBarActivity.java ioc/AppGinModule.java ui/MessageListView.java u

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:24:21 2013
New Revision: 1522342

URL: http://svn.apache.org/r1522342
Log:
fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java

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/ui/MessageListView.java

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522342&r1=1522341&r2=1522342&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:24:21 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.client.activity;
 <<< HEAD
 <<< HEAD
 <<< HEAD
+<<< HEAD
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -252,10 +253,15 @@ import org.apache.hupa.client.rf.GetMess
 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 java.util.Collection;
+>>> fixed issue#59, coupled with fixing some UI refreshment issues in 
toolsbar
 import java.util.List;
+import java.util.Set;
 
 import org.apache.hupa.client.place.DefaultPlace;
 import org.apache.hupa.client.place.MailFolderPlace;
+import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
 import org.apache.hupa.client.rf.FetchMessagesRequest;
 import org.apache.hupa.client.rf.GetMessageDetailsRequest;
 import org.apache.hupa.client.rf.HupaRequestFactory;
@@ -263,6 +269,8 @@ import org.apache.hupa.client.ui.Message
 >>> let messages list activity make use of mvp
 import org.apache.hupa.client.ui.WidgetDisplayable;
 import org.apache.hupa.shared.data.ImapFolderImpl;
+import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
+import org.apache.hupa.shared.domain.DeleteMessageResult;
 import org.apache.hupa.shared.domain.FetchMessagesAction;
 import org.apache.hupa.shared.domain.FetchMessagesResult;
 import org.apache.hupa.shared.domain.GetMessageDetailsAction;
@@ -305,11 +313,7 @@ public class MessageListActivity extends
@Override
public void onCellPreview(final 
CellPreviewEvent event) {
if (hasClickedButFirstCol(event)) {
-   List displayedItems = 
display.getGrid().getVisibleItems();
-   for (Message msg : displayedItems) {
-   
display.getGrid().getSelectionModel().setSelected(msg, false);
-   
toolBarDisplay.enableAllTools(false);
-   }
+   
antiSelectMessages(display.getGrid().getVisibleItems());
GetMessageDetailsRequest req = 
requestFactory.messageDetailsRequest();
GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
final ImapFolder f = 
req.create(ImapFolder.class);
@@ -424,12 +428,41 @@ public class MessageListActivity extends
 >>> make reload message content work, use the same place with folder list, 
 >>> while separated with slash, that looks like Gmail's
public interface Displayable extends WidgetDisplayable {
MessagesCellTable getGrid();
+
+   List getSelectedMessagesIds();
+
+   void refresh();
+
+   Set getSelectedMessages();
}
 
public void setFolder(ImapFolder folder) {
this.folder = folder;
-   // if (folder != null)
-   // fetch(0);
+   }
+
+   private void antiSelectMessages(Collection c) {
+   for (Message msg : c) {
+   display.getGrid().getSelectionModel().setSelected(msg, 
false);
+   toolBarDisplay.enableAllTools(false);
+   }
+   }
+   public void deleteSelectedMessages() {
+   MailFolderPlace currentPlace = (MailFolderPlace) 
placeController.getWhere();
+   final List uids = display.getSelectedMessagesIds();
+   DeleteMessageByUidRequest req = 
requestFactory

svn commit: r1522341 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:23:52 2013
New Revision: 1522341

URL: http://svn.apache.org/r1522341
Log:
fixed issue#58, with the last commit

Modified:

james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522341&r1=1522340&r2=1522341&view=diff
==
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
 Thu Sep 12 04:23:52 2013
@@ -308,6 +308,7 @@ public class MessageListActivity extends
List displayedItems = 
display.getGrid().getVisibleItems();
for (Message msg : displayedItems) {

display.getGrid().getSelectionModel().setSelected(msg, false);
+   
toolBarDisplay.enableAllTools(false);
}
GetMessageDetailsRequest req = 
requestFactory.messageDetailsRequest();
GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);



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