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 do...@apache.org on 2013/08/22 18:17:05 UTC

svn commit: r1516500 - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/bundles/ client/src/main/java/org/apache/hupa/client/dnd/ server/src/...

Author: dongxu
Date: Thu Aug 22 16:17:04 2013
New Revision: 1516500

URL: http://svn.apache.org/r1516500
Log:
commit

Modified:
    james/hupa/trunk/README.txt
    james/hupa/trunk/client/pom.xml
    james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
    james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaConstants.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaImageBundle.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java
    james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
    james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java

Modified: james/hupa/trunk/README.txt
URL: http://svn.apache.org/viewvc/james/hupa/trunk/README.txt?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/README.txt (original)
+++ james/hupa/trunk/README.txt Thu Aug 22 16:17:04 2013
@@ -1,9 +1,9 @@
-###### Bulding #######
+###### Bulding ######
 Hupa use maven2 as build tool. To build hupa download maven2 (http://maven.apache.org), unpack maven2 and install it.
 After that change to hupa directory and execute the following cmd:
 $ mvn clean package
 
-###### Configuring server side  ########
+###### Configuring server side  ################
 Hupa uses a properties file to know the IMAP and SMTP servers configuration.
 There is an example configuration file in 'server/src/main/webapp/WEB-INF/conf/config.properties'
 
@@ -13,7 +13,7 @@ There is an example configuration file i
 - Or in any other file if you start your application server with the parameter:
   -Dhupa.config.file=full_path_to_your_properties_file
 
-##### Running Hupa #####
+##### Running Hupa ##################
 Hupa comes packaged with a servlet-container, so once you have compiled the app just run:
 $ java -jar target/hupa-${version}.war
 
@@ -54,4 +54,5 @@ shared, mock, server, widget and client.
   >> 'GWT module hupa needs to be (re)compiled, please run a compile or use the Compile/Browse button in hosted mode'
  
   Configure the plugin to compile only the 'Hupa' module.
-  Properties -> Google -> Web Toolkit -> Entry Point Modules -> Hupa - org.apache.hupa 
+  Properties -> Google -> Web Toolkit -> Entry Point Modules -> Hupa - org.apache.hupa
+ 

Modified: james/hupa/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Aug 22 16:17:04 2013
@@ -17,12 +17,15 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.james.hupa</groupId>
+        <groupId>org.apache.hupa</groupId>
         <artifactId>hupa-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>hupa</artifactId>
@@ -31,33 +34,15 @@
     <description>A GWT based IMAP webmail</description>
     <dependencies>
         <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-dev</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.hupa</groupId>
             <artifactId>hupa-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>hupa-mock</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.hupa</groupId>
             <artifactId>hupa-shared</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.hupa</groupId>
             <artifactId>hupa-widgets</artifactId>
         </dependency>
         <dependency>
@@ -65,6 +50,14 @@
             <artifactId>cobogw</artifactId>
         </dependency>
         <dependency>
+            <groupId>net.customware.gwt.dispatch</groupId>
+            <artifactId>gwt-dispatch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.customware.gwt.presenter</groupId>
+            <artifactId>gwt-presenter</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.google.code.gwt-dnd</groupId>
             <artifactId>gwt-dnd</artifactId>
         </dependency>
@@ -77,22 +70,32 @@
             <artifactId>gwtupload</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-user</artifactId>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-dev</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.google.gwt.inject</groupId>
             <artifactId>gin</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
+            <scope>provided</scope>
         </dependency>
-	    <dependency>
-	      <groupId>javax.validation</groupId>
-	      <artifactId>validation-api</artifactId>
-	      <classifier>sources</classifier>
-	    </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>4.2.0.Final</version>
+        <dependency>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-validator</artifactId>
+          <version>4.2.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -110,14 +113,14 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-        </dependency>
+		<dependency>
+		    <groupId>org.eclipse.jetty</groupId>
+		    <artifactId>jetty-server</artifactId>
+		</dependency>
+		<dependency>
+		    <groupId>org.eclipse.jetty</groupId>
+		    <artifactId>jetty-webapp</artifactId>
+		</dependency>        
     </dependencies>
     <build>
         <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
@@ -127,19 +130,17 @@
                 <artifactId>gwt-maven-plugin</artifactId>
                 <configuration>
                     <runTarget>Hupa.html</runTarget>
+                    <extraJvmArgs>
+                        -Xmx512M -Xss128M -Dhupa.config.file=${project.parent.basedir}/server/src/main/webapp/WEB-INF/conf/config.properties
+                    </extraJvmArgs>
                     <localWorkers>1</localWorkers>
-                    <compileReport>${gwt.compileReport}</compileReport>
+                    <compileReport>true</compileReport>
                     <disableClassMetadata>${gwt.disableClassMetadata}</disableClassMetadata>
                     <disableCastChecking>${gwt.disableCastChecking}</disableCastChecking>
                     <logLevel>${gwt.logLevel}</logLevel>
-                    <style>${gwt.style}</style>
-                    <fragmentCount>10</fragmentCount>
-                    <enableClosureCompiler>${gwt.enableClosureCompiler}</enableClosureCompiler>
-                    <disableRunAsync>${gwt.disableRunAsync}</disableRunAsync>
                     <modules>
                         <module>org.apache.hupa.Hupa${gwt.moduleSuffix}</module>
                     </modules>
-                    <extraJvmArgs>-XX:MaxPermSize=512M -Xmx1024M</extraJvmArgs>
                 </configuration>
                 <executions>
                     <execution>
@@ -182,11 +183,11 @@
                         </resource>
                     </webResources>
                     <warName>${project.artifactId}-${project.version}</warName>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.hupa.Launcher</mainClass>
-                        </manifest>
-                    </archive>
+  			        <archive>
+			           <manifest>
+			              <mainClass>org.apache.hupa.Launcher</mainClass>
+			           </manifest>
+			        </archive>
                 </configuration>
             </plugin>
             <plugin>
@@ -210,7 +211,7 @@
             <plugin>
                 <groupId>org.bsc.maven</groupId>
                 <artifactId>maven-processor-plugin</artifactId>
-                <version>2.2.4</version>
+                <version>2.0.5</version>
                 <executions>
                     <execution>
                         <id>process</id>
@@ -241,7 +242,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+               <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -270,33 +271,48 @@
                             <resources>
                                 <resource>
                                     <directory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</directory>
-                                    <include>org/apache/hupa/Launcher.class</include>
+                                     <include>org/apache/hupa/Launcher.class</include>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>jetty-classpath</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeGroupIds>org.eclipse.jetty,javax.servlet</includeGroupIds>
-                            <excludeArtifactIds>jsp-api,jstl</excludeArtifactIds>
-                            <outputDirectory>
-                                ${project.build.directory}/${project.artifactId}-${project.version}
-                        </outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+			   <groupId>org.apache.maven.plugins</groupId>
+			   <artifactId>maven-dependency-plugin</artifactId>
+			   <executions>
+			      <execution>
+			         <id>jetty-classpath</id>
+			         <phase>prepare-package</phase>
+			         <goals>
+			            <goal>unpack-dependencies</goal>
+			         </goals>
+			         <configuration>
+			            <includeGroupIds>org.eclipse.jetty,javax.servlet</includeGroupIds>
+			            <excludeArtifactIds>jsp-api,jstl</excludeArtifactIds>
+			            <outputDirectory>
+			               ${project.build.directory}/${project.artifactId}-${project.version}
+			            </outputDirectory>
+			         </configuration>
+			      </execution>
+			   </executions>
+			</plugin>            
         </plugins>
     </build>
+    <profiles>
+      <profile>
+        <id>prod</id>
+        <properties>
+          <gwt.moduleSuffix>Prod</gwt.moduleSuffix>
+          <gwt.disableClassMetadata>true</gwt.disableClassMetadata>
+          <gwt.disableCastChecking>true</gwt.disableCastChecking>
+          <gwt.logLevel>TRACE</gwt.logLevel>
+        </properties>
+      </profile>
+    </profiles>
+    <properties>
+      <gwt.moduleSuffix></gwt.moduleSuffix>
+      <gwt.logLevel>ERROR</gwt.logLevel>
+    </properties>
 </project>

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Thu Aug 22 16:17:04 2013
@@ -19,17 +19,6 @@
   <!-- Inherit the core Web Toolkit stuff.                        -->
   <inherits name='com.google.gwt.user.User'/>
   <inherits name="com.google.gwt.i18n.I18N"/> 
-  <!-- inherits Logging module -->
-  <inherits name="com.google.gwt.logging.Logging"/>
-  <set-property name="gwt.logging.enabled" value="TRUE"/>
-  <set-property name="gwt.logging.logLevel" value="FINE"/>
-  <set-property name="gwt.logging.consoleHandler" value="DISABLED"/>
-  <set-property name="gwt.logging.developmentModeHandler" value="ENABLED"/>
-  <set-property name="gwt.logging.firebugHandler" value="ENABLED"/>
-  <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED"/>
-  <set-property name="gwt.logging.popupHandler" value="DISABLED"/>
-  <set-property name="gwt.logging.systemHandler" value="ENABLED"/>
-  <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED"/>
   <!-- Hupa modules -->  
   <inherits name='org.apache.hupa.Shared'/> 
   <inherits name='org.apache.hupa.Widgets'/> 
@@ -39,14 +28,9 @@
   <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' />
   <inherits name='com.google.gwt.gen2.table.override.Override'/>
   <inherits name='com.google.gwt.gen2.table.ScrollTable'/>
-  <inherits name="com.google.gwt.activity.Activity"/>
-  <inherits name="com.google.gwt.place.Place"/>
+  <inherits name='net.customware.gwt.dispatch.Dispatch' />
+  <inherits name='net.customware.gwt.presenter.Presenter' />
   <inherits name="com.google.gwt.inject.Inject"/>
-  
-  <inherits name="com.google.gwt.cell.Cell"/>
-  <inherits name="com.google.gwt.editor.Editor"/>
-  <inherits name="com.google.gwt.resources.Resources" />
-  
   <inherits name="gwtupload.GWTUpload"/>
   <inherits name="eu.maydu.gwt.validation.ValidationLibrary"/>
   <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/>
@@ -54,14 +38,13 @@
   <!-- <inherits name="com.google.gwt.junit.JUnit"/> -->
   
   <!-- Inherit the default GWT style sheet.                       -->
-<!--   <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
-<!--   <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
-<!--   <inherits name='com.google.gwt.user.theme.dark.Dark'/>     -->
- <!--  <inherits name='com.google.gwt.user.theme.clean.Clean'/>    --> 
-  
+  <inherits name='com.google.gwt.user.theme.standard.Standard'/>
+  <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
+  <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/>     -->
   
   <!-- CSS loaded asynchronously -->
-  <stylesheet src="../styles.css"/>
+  <stylesheet src="../Hupa.css"/>
+  <stylesheet src="Upload.css"/>
   
   <!--  xsiframe would be the default in gwt soon -->
   <add-linker name="xsiframe"/>

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=1516500&r1=1516499&r2=1516500&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 Aug 22 16:17:04 2013
@@ -26,7 +26,7 @@
 
   <!-- Set the languages to compile -->
   <!-- It multiplies the number of permutations -->
-  <!-- <extend-property name="locale" values="es,de"/>  -->
+  <extend-property name="locale" values="es,de"/> 
   <set-configuration-property name="locale.useragent" value="Y"/>
 
   <!-- Compile for all browsers -->

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCSS.java Thu Aug 22 16:17:04 2013
@@ -26,8 +26,6 @@ import org.apache.hupa.widgets.WidgetsCS
  * CSS class names used in Hupa
  */
 public class HupaCSS extends WidgetsCSS {
-	
-	public static final String C_app_body="body";
     
     public static final String C_app_container ="Hupa";
 
@@ -44,14 +42,12 @@ public class HupaCSS extends WidgetsCSS 
     public static final String C_flash ="hupa-flash";
 
     public static final String C_top_container ="hupa-top";
-    public static final String C_central_container ="hupa-central";
     public static final String C_main_container ="hupa-main";
     public static final String C_bottom_container ="hupa-bottom";
     
     public static final String C_login_container = "hupa-login";
-    public static final String C_login_box = "hupa-login-box";
     public static final String C_login_form = "hupa-login-form";
-    public static final String C_login_textbox = "hupa-login-textbox";
+    public static final String C_login_box = "hupa-login-textbox";
     
     public static final String C_contacts_container = "hupa-contacts";
 
@@ -81,6 +77,4 @@ public class HupaCSS extends WidgetsCSS 
     public static final String C_dialog = "hupa-dialog-box";
     
     public static final String C_validate = "hupa-validate-error";
-    
-    public static final String C_button = "hupa-button";
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaConstants.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaConstants.java?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaConstants.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaConstants.java Thu Aug 22 16:17:04 2013
@@ -19,13 +19,14 @@
 
 package org.apache.hupa.client;
 
+import com.google.gwt.i18n.client.Constants;
+
+import eu.maydu.gwt.validation.client.i18n.StandardValidationMessagesImpl;
 import gwtupload.client.IUploader.UploaderConstants;
 
 import org.apache.hupa.widgets.PagingOptionsConstants;
 import org.apache.hupa.widgets.editor.ToolbarConstants;
 
-import com.google.gwt.i18n.client.Constants;
-
 public interface HupaConstants extends Constants, UploaderConstants, PagingOptionsConstants, ToolbarConstants {
 
     public String usernameLabel();

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaImageBundle.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaImageBundle.java?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaImageBundle.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaImageBundle.java Thu Aug 22 16:17:04 2013
@@ -32,6 +32,4 @@ public interface HupaImageBundle extends
     
     @Source("email.png")
     ImageResource moveMailIcon();
-    
-    
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java Thu Aug 22 16:17:04 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.dnd;
 import org.apache.hupa.client.HupaMessages;
 import org.apache.hupa.client.bundles.HupaImageBundle;
 import org.apache.hupa.widgets.ui.RndPanel;
+import org.cobogw.gwt.user.client.ui.RoundedPanel;
 
 import com.allen_sauer.gwt.dnd.client.DragContext;
 import com.allen_sauer.gwt.dnd.client.PickupDragController;
@@ -43,7 +44,7 @@ public class PagingScrollTableRowDragCon
     private HupaMessages messages = GWT.create(HupaMessages.class);
     private HupaImageBundle bundle =GWT.create(HupaImageBundle.class);
     private FixedWidthGrid draggableTable;
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings("unchecked")
     private PagingScrollTable parentTable;
     private int dragRow;
     private RowDragProxy proxyWidget;
@@ -89,7 +90,7 @@ public class PagingScrollTableRowDragCon
     }
 
     
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings("unchecked")
     protected Widget newDragProxy(DragContext context) {
         
         draggableTable = (FixedWidthGrid) context.draggable.getParent();

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java Thu Aug 22 16:17:04 2013
@@ -59,7 +59,7 @@ public abstract class UserPreferencesSto
     final public void addContact(List<String> mails) {
         if (mails != null) {
             for (String mail: mails) {
-            	if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) {
+            	if (!mail.matches(REGEX_OMITTED_EMAILS)) {
                     Contact contact = new Contact(mail);
                     addContact(contact);
             	}

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java?rev=1516500&r1=1516499&r2=1516500&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java Thu Aug 22 16:17:04 2013
@@ -30,7 +30,7 @@ public class ReplyMessageEvent extends G
 
     public final static Type<ReplyMessageEventHandler> TYPE = new Type<ReplyMessageEventHandler>();
     private User user;
-    private ImapFolder folder;
+    private IMAPFolder folder;
     private Message message;
     private MessageDetails details;
     private boolean replyAll;
@@ -45,7 +45,7 @@ public class ReplyMessageEvent extends G
         return TYPE;
     }
     
-    public ReplyMessageEvent(User user, ImapFolder folder, Message message, MessageDetails details, boolean replyAll) {
+    public ReplyMessageEvent(User user, IMAPFolder folder, Message message, MessageDetails details, boolean replyAll) {
         this.user = user;
         this.folder = folder;
         this.message = message;
@@ -57,7 +57,7 @@ public class ReplyMessageEvent extends G
         return user;
     }
     
-    public ImapFolder getFolder() {
+    public IMAPFolder getFolder() {
         return folder;
     }
     



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