You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2009/12/26 10:48:40 UTC

svn commit: r893953 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/mvp/ client/src/main/java/org/apache/hupa/client/widgets/ client/war/ client/war/WEB-INF/classes/ server/src/main/java/org/apache/hupa/server/utils/ server/src/test...

Author: manolo
Date: Sat Dec 26 09:48:40 2009
New Revision: 893953

URL: http://svn.apache.org/viewvc?rev=893953&view=rev
Log:
Fixed a bug escaping html tags in text/plain messages.
Fixed an issue when new folders are created in gmail imap servers.
Styling of Hupa dialog box. 

Added:
    james/hupa/trunk/client/war/WEB-INF/classes/
Modified:
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/MyDialogBox.java
    james/hupa/trunk/client/war/Hupa.css
    james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
    james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=893953&r1=893952&r2=893953&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java Sat Dec 26 09:48:40 2009
@@ -432,6 +432,10 @@
      */
     public HasEditable createFolder(EditHandler handler) {
         final IMAPTreeItem selected = (IMAPTreeItem) folderTree.getSelectedItem();
+        
+        if (selected.isEdit())
+            return null;
+        
         IMAPFolder oldFolder = (IMAPFolder) selected.getUserObject();
 
         // Generate a new folder with a whitespace as name, this is needed as
@@ -450,13 +454,14 @@
                 if (event.getEventType().equals(EditEvent.EventType.Cancel)) {
                     // remove the folder
                     newItem.remove();
-                    folderTree.setSelectedItem(selected, false);
                 } else if (event.getEventType().equals(EditEvent.EventType.Stop)) {
-                    // Select the new created folder and fire an event
-                    folderTree.setSelectedItem(newItem, true);
+                    // add the new item to dnd controller 
                     bindDropController(newItem);
                 }
-
+                // In both cases, select the parent folder. 
+                // This avoid an issue in creating folder in gmail where the new 
+                // folder takes a while until it is available
+                folderTree.setSelectedItem(selected, false);
             }
 
         });

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java?rev=893953&r1=893952&r2=893953&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/ConfirmDialogBox.java Sat Dec 26 09:48:40 2009
@@ -28,6 +28,7 @@
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.HasClickHandlers;
 import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.rpc.client.ast.SetCommand;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.VerticalPanel;
 
@@ -44,6 +45,7 @@
         setModal(true);
         setAnimationEnabled(true);
         setAutoHideEnabled(false);
+        super.setText(constants.productName());
         panel.setSpacing(10);
         panel.add(text);
         bar.add(okButton);

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/MyDialogBox.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/MyDialogBox.java?rev=893953&r1=893952&r2=893953&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/MyDialogBox.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/MyDialogBox.java Sat Dec 26 09:48:40 2009
@@ -3,5 +3,10 @@
 import com.google.gwt.user.client.ui.DialogBox;
 
 public class MyDialogBox extends DialogBox implements HasDialog{
+    public static final String C_dialog = "hupa-dialog-box";
+    public MyDialogBox () {
+        super();
+        super.addStyleName(C_dialog);
+    }
     
 }

Modified: james/hupa/trunk/client/war/Hupa.css
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/war/Hupa.css?rev=893953&r1=893952&r2=893953&view=diff
==============================================================================
--- james/hupa/trunk/client/war/Hupa.css (original)
+++ james/hupa/trunk/client/war/Hupa.css Sat Dec 26 09:48:40 2009
@@ -5,6 +5,18 @@
     font-size: 12px;
 }
 
+/************[ widget: MyDialogBox ]****************/
+.hupa-dialog-box td.dialogMiddleCenter  {
+	background: #fae5b0 !important;
+}
+.hupa-dialog-box .dialogContent .gwt-Label {
+	font-weight: bold;
+	margin: 15px;
+}
+.hupa-dialog-box .Caption {
+    font-size: 14px;
+}
+
 /************[ widget: RndPanel ]****************/
 .hupa-rounded {
    border: 1px solid #7FAAFF; 
@@ -129,7 +141,6 @@
 }
 /************[ view: LoginView ]*******************/
 table.hupa-login {
-    /*margin: 30px auto auto auto; */
     text-align: right;
 	margin-left: auto;
 	margin-right: auto; 
@@ -141,7 +152,6 @@
 	padding-top: 6px;
 }
 table.hupa-login-form {
-	/*margin: 5px 10px 5px 10px;*/
 	padding: 10px;
 }
 

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=893953&r1=893952&r2=893953&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 Sat Dec 26 09:48:40 2009
@@ -33,7 +33,7 @@
     public static final String repl_lt = "<";
     
     public static final Pattern regex_gt = Pattern.compile(">");
-    public static final String repl_gt = "<";
+    public static final String repl_gt = ">";
 
     public static final Pattern regex_nl = Pattern.compile("\n");
     public static final String repl_nl = "<br/>";

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java?rev=893953&r1=893952&r2=893953&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java Sat Dec 26 09:48:40 2009
@@ -52,6 +52,10 @@
         res = getDetailsMsgHndl.txtDocumentToHtml("", "aFolder", 9999l);
         assertTrue(res.length()==0);
         
+        msg = "...<atag>...";
+        res = getDetailsMsgHndl.txtDocumentToHtml(msg, "aFolder", 9999l);
+        assertNotSame(msg, res);
+        assertEquals("...&lt;atag&gt;...", res);
     }
 
     public void testFilterHtmlDocument() throws Exception {



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