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/09/12 04:42:12 UTC
svn commit: r1522132 [1/4] - 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/gin/
client/src/main/java/org/apache/hupa/client/mvp/ client/sr...
Author: dongxu
Date: Thu Sep 12 02:42:10 2013
New Revision: 1522132
URL: http://svn.apache.org/r1522132
Log:
first commit
Added:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/JavaMailSessionProvider.java
- copied, changed from r1522129, james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/LogProvider.java
- copied, changed from r1522129, james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
Modified:
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/client/CachingDispatchAsync.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
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/gin/HupaClientModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
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/mvp/MessageSendPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
james/hupa/trunk/client/src/main/webapp/Hupa.css
james/hupa/trunk/client/src/main/webapp/Hupa.html
james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
james/hupa/trunk/mock/pom.xml
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java
james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
james/hupa/trunk/pom.xml
james/hupa/trunk/server/pom.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/CachedIMAPStore.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/DispatchServletModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServletConfig.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/DefaultUserSettingsProvider.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/providers/LogProvider.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/JavamailUtil.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorage.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
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/servlet/MessageSourceServlet.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/ConfigurationProperties.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/RegexPatterns.java
james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/HupaGuiceTestCase.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/ServerModulTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java
james/hupa/trunk/shared/pom.xml
james/hupa/trunk/shared/src/main/java/org/apache/hupa/Shared.gwt.xml
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/SConsts.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoginEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java
james/hupa/trunk/src/site/resources/demo/index.html
james/hupa/trunk/src/site/xdoc/index.xml
james/hupa/trunk/widgets/pom.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/PagingOptions.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java
Modified: james/hupa/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 02:42:10 2013
@@ -17,12 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<<<<<<< HEAD
<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">
+>>>>>>> first commit
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-parent</artifactId>
+<<<<<<< HEAD
<version>0.0.3-SNAPSHOT</version>
+=======
+ <version>0.0.2-SNAPSHOT</version>
+>>>>>>> first commit
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa</artifactId>
@@ -36,10 +47,13 @@
</dependency>
<dependency>
<groupId>org.apache.hupa</groupId>
+<<<<<<< HEAD
<artifactId>hupa-mock</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hupa</groupId>
+=======
+>>>>>>> first commit
<artifactId>hupa-shared</artifactId>
</dependency>
<dependency>
@@ -74,10 +88,17 @@
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<exclusions>
+<<<<<<< HEAD
<exclusion>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</exclusion>
+=======
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+>>>>>>> first commit
</exclusions>
</dependency>
<dependency>
@@ -94,9 +115,15 @@
<scope>provided</scope>
</dependency>
<dependency>
+<<<<<<< HEAD
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.2.0.Final</version>
+=======
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.2.0.Final</version>
+>>>>>>> first commit
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -114,6 +141,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+<<<<<<< HEAD
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -122,6 +150,16 @@
<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>
+>>>>>>> first commit
</dependencies>
<build>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
@@ -132,7 +170,11 @@
<configuration>
<runTarget>Hupa.html</runTarget>
<extraJvmArgs>
+<<<<<<< HEAD
-Xmx512M -Xss128M
+=======
+ -Xmx512M -Xss128M -Dhupa.config.file=${project.parent.basedir}/server/src/main/webapp/WEB-INF/conf/config.properties
+>>>>>>> first commit
</extraJvmArgs>
<localWorkers>1</localWorkers>
<compileReport>true</compileReport>
@@ -184,11 +226,19 @@
</resource>
</webResources>
<warName>${project.artifactId}-${project.version}</warName>
+<<<<<<< HEAD
<archive>
<manifest>
<mainClass>org.apache.hupa.Launcher</mainClass>
</manifest>
</archive>
+=======
+ <archive>
+ <manifest>
+ <mainClass>org.apache.hupa.Launcher</mainClass>
+ </manifest>
+ </archive>
+>>>>>>> first commit
</configuration>
</plugin>
<plugin>
@@ -243,7 +293,11 @@
</executions>
</plugin>
<plugin>
+<<<<<<< HEAD
<groupId>org.apache.maven.plugins</groupId>
+=======
+ <groupId>org.apache.maven.plugins</groupId>
+>>>>>>> first commit
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -272,13 +326,18 @@
<resources>
<resource>
<directory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</directory>
+<<<<<<< HEAD
<include>org/apache/hupa/Launcher.class</include>
+=======
+ <include>org/apache/hupa/Launcher.class</include>
+>>>>>>> first commit
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
+<<<<<<< HEAD
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -301,4 +360,43 @@
</plugin>
</plugins>
</build>
+=======
+ <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>
+>>>>>>> first commit
</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=1522132&r1=1522131&r2=1522132&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 Sep 12 02:42:10 2013
@@ -19,6 +19,7 @@
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.google.gwt.i18n.I18N"/>
+<<<<<<< HEAD
<!-- inherits Logging module -->
<inherits name="com.google.gwt.logging.Logging"/>
<set-property name="gwt.logging.enabled" value="TRUE"/>
@@ -30,6 +31,8 @@
<set-property name="gwt.logging.popupHandler" value="DISABLED"/>
<set-property name="gwt.logging.systemHandler" value="ENABLED"/>
<set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED"/>
+=======
+>>>>>>> first commit
<!-- Hupa modules -->
<inherits name='org.apache.hupa.Shared'/>
<inherits name='org.apache.hupa.Widgets'/>
@@ -41,6 +44,7 @@
<inherits name='com.google.gwt.gen2.table.ScrollTable'/>
<inherits name='net.customware.gwt.dispatch.Dispatch' />
<inherits name='net.customware.gwt.presenter.Presenter' />
+<<<<<<< HEAD
<inherits name="com.google.gwt.activity.Activity"/>
<inherits name="com.google.gwt.place.Place"/>
<inherits name="com.google.gwt.inject.Inject"/>
@@ -48,6 +52,9 @@
<inherits name="com.google.gwt.cell.Cell"/>
<inherits name="com.google.gwt.editor.Editor"/>
+=======
+ <inherits name="com.google.gwt.inject.Inject"/>
+>>>>>>> first commit
<inherits name="gwtupload.GWTUpload"/>
<inherits name="eu.maydu.gwt.validation.ValidationLibrary"/>
<inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/>
@@ -75,5 +82,9 @@
<set-property name="user.agent" value="gecko1_8,safari"/>
<!-- Specify the app entry point class. -->
+<<<<<<< HEAD
<entry-point class='org.apache.hupa.client.evo.HupaEvo'/>
+=======
+ <entry-point class='org.apache.hupa.client.Hupa'/>
+>>>>>>> first commit
</module>
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java Thu Sep 12 02:42:10 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client;
import java.util.HashMap;
+<<<<<<< HEAD
import java.util.HashSet;
import java.util.Map;
@@ -103,11 +104,53 @@ public class CachingDispatchAsync extend
/**
* If the Action was executed before it will get fetched from the cache
+=======
+import java.util.Map;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.inject.Inject;
+
+import net.customware.gwt.dispatch.client.DispatchAsync;
+import net.customware.gwt.dispatch.shared.Action;
+import net.customware.gwt.dispatch.shared.Result;
+
+/**
+ * Dispatcher which support caching of data in memory
+ *
+ */
+public class CachingDispatchAsync implements DispatchAsync {
+
+ private DispatchAsync dispatcher;
+ private Map<Action<Result>, Result> cache = new HashMap<Action<Result>, Result>();
+
+ @Inject
+ public CachingDispatchAsync(DispatchAsync dispatcher) {
+ this.dispatcher = dispatcher;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.client.DispatchAsync#execute(A, com.google.gwt.user.client.rpc.AsyncCallback)
+ */
+ public <A extends Action<R>, R extends Result> void execute(final A action,
+ final AsyncCallback<R> callback) {
+ dispatcher.execute(action, callback);
+ }
+
+ /**
+ * Execute the give Action. If the Action was executed before it will get fetched from the cache
+ *
+ * @param <A> Action implementation
+ * @param <R> Result implementation
+ * @param action the action
+ * @param callback the callback
+>>>>>>> first commit
*/
@SuppressWarnings("unchecked")
public <A extends Action<R>, R extends Result> void executeWithCache(
final A action, final AsyncCallback<R> callback) {
Result r = cache.get(action);
+<<<<<<< HEAD
final Class<?> clz = action.getClass();
if (running.contains(clz)) {
@@ -124,14 +167,29 @@ public class CachingDispatchAsync extend
super.execute(action, new AsyncCallback<R>() {
public void onFailure(Throwable caught) {
running.remove(clz);
+=======
+ if (r != null) {
+ callback.onSuccess((R) r);
+ } else {
+ dispatcher.execute(action, new AsyncCallback<R>() {
+
+ public void onFailure(Throwable caught) {
+>>>>>>> first commit
callback.onFailure(caught);
}
public void onSuccess(R result) {
+<<<<<<< HEAD
running.remove(clz);
cache.put((Action<Result>) action, (Result) result);
callback.onSuccess(result);
}
+=======
+ cache.put((Action<Result>) action, (Result) result);
+ callback.onSuccess(result);
+ }
+
+>>>>>>> first commit
});
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java Thu Sep 12 02:42:10 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.ioc.AppGinjector;
import com.google.gwt.core.client.EntryPoint;
@@ -59,11 +60,14 @@ public class Hupa implements EntryPoint
=======
=======
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> first commit
import net.customware.gwt.presenter.client.place.PlaceManager;
import org.apache.hupa.client.gin.HupaGinjector;
import org.apache.hupa.client.mvp.AppPresenter;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import org.apache.hupa.client.gin.HupaEvoGinjector;
import org.apache.hupa.client.mvp.AppPlaceFactory;
@@ -72,12 +76,15 @@ import org.apache.hupa.client.place.Logi
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> first commit
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.RootPanel;
+<<<<<<< HEAD
public class Hupa implements EntryPoint {
private final HupaGinjector injector = GWT.create(HupaGinjector.class);
@@ -115,5 +122,24 @@ public class Hupa implements EntryPoint
=======
}
>>>>>>> Change to new mvp framework - first step
+=======
+public class Hupa implements EntryPoint{
+ private final HupaGinjector injector = GWT.create(HupaGinjector.class);
+
+ public void onModuleLoad() {
+ // remove the loading message from the browser
+ com.google.gwt.user.client.Element loading = DOM.getElementById("loading");
+
+ DOM.removeChild(RootPanel.getBodyElement(), loading);
+
+ AppPresenter aPres = injector.getAppPresenter();
+ aPres.bind();
+
+ RootPanel.get().add(aPres.getDisplay().asWidget());
+
+ PlaceManager placeManager = injector.getPlaceManager();
+ placeManager.fireCurrentPlace();
+ }
+>>>>>>> first commit
}
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=1522132&r1=1522131&r2=1522132&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 Sep 12 02:42:10 2013
@@ -77,6 +77,9 @@ public class HupaCSS extends WidgetsCSS
public static final String C_dialog = "hupa-dialog-box";
public static final String C_validate = "hupa-validate-error";
+<<<<<<< HEAD
public static final String C_button = "hupa-button";
+=======
+>>>>>>> first commit
}
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=1522132&r1=1522131&r2=1522132&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 Sep 12 02:42:10 2013
@@ -19,13 +19,22 @@
package org.apache.hupa.client;
+<<<<<<< HEAD
+=======
+import com.google.gwt.i18n.client.Constants;
+
+import eu.maydu.gwt.validation.client.i18n.StandardValidationMessagesImpl;
+>>>>>>> first commit
import gwtupload.client.IUploader.UploaderConstants;
import org.apache.hupa.widgets.PagingOptionsConstants;
import org.apache.hupa.widgets.editor.ToolbarConstants;
+<<<<<<< HEAD
import com.google.gwt.i18n.client.Constants;
+=======
+>>>>>>> first commit
public interface HupaConstants extends Constants, UploaderConstants, PagingOptionsConstants, ToolbarConstants {
public String usernameLabel();
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java Thu Sep 12 02:42:10 2013
@@ -19,9 +19,12 @@
package org.apache.hupa.client.gin;
+<<<<<<< HEAD
import net.customware.gwt.dispatch.client.DefaultExceptionHandler;
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.dispatch.client.ExceptionHandler;
+=======
+>>>>>>> first commit
import net.customware.gwt.presenter.client.DefaultEventBus;
import net.customware.gwt.presenter.client.EventBus;
import net.customware.gwt.presenter.client.gin.AbstractPresenterModule;
@@ -56,7 +59,10 @@ import org.apache.hupa.client.rf.HupaReq
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.SimpleEventBus;
import com.google.inject.Provider;
+<<<<<<< HEAD
import com.google.inject.Provides;
+=======
+>>>>>>> first commit
import com.google.inject.Singleton;
public class HupaClientModule extends AbstractPresenterModule {
@@ -73,23 +79,32 @@ public class HupaClientModule extends Ab
bindPresenter(MessageSendPresenter.class, MessageSendPresenter.Display.class, MessageSendView.class);
bindPresenter(AppPresenter.class, AppPresenter.Display.class, AppView.class);
bindPresenter(ContactsPresenter.class, ContactsPresenter.Display.class, ContactsView.class);
+<<<<<<< HEAD
+=======
+ bind(CachingDispatchAsync.class);
+>>>>>>> first commit
bind(PagingScrollTableRowDragController.class).in(Singleton.class);
bind(MessageTableModel.class).in(Singleton.class);
bind(LoginPresenterPlace.class).in(Singleton.class);
bind(IMAPMessageListPresenterPlace.class).in(Singleton.class);
bind(MessageSendPresenterPlace.class).in(Singleton.class);
bind(ContactsPresenterPlace.class).in(Singleton.class);
+<<<<<<< HEAD
// Used by dispatch. Note that GWT 2.4 has its own ExceptionHandler etc in other namespace
bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
// RF Stuff, Eventbus has a different namespace than gwt-dispatch
+=======
+
+>>>>>>> first commit
bind(com.google.gwt.event.shared.EventBus.class)
.to(SimpleEventBus.class)
.in(Singleton.class);
bind(HupaRequestFactory.class)
.toProvider(HupaClientModule.RequestFactoryProvider.class)
.in(Singleton.class);
+<<<<<<< HEAD
}
@@ -102,6 +117,10 @@ public class HupaClientModule extends Ab
/**
* RF Stuff
*/
+=======
+ }
+
+>>>>>>> first commit
public static class RequestFactoryProvider implements Provider<HupaRequestFactory> {
private static final com.google.gwt.event.shared.EventBus eventBus = new SimpleEventBus();
public HupaRequestFactory get() {
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java Thu Sep 12 02:42:10 2013
@@ -28,7 +28,11 @@ import org.apache.hupa.client.rf.HupaReq
import com.google.gwt.inject.client.GinModules;
import com.google.gwt.inject.client.Ginjector;
+<<<<<<< HEAD
@GinModules({/*StandardDispatchModule.class,*/ HupaClientModule.class})
+=======
+@GinModules({StandardDispatchModule.class,HupaClientModule.class})
+>>>>>>> first commit
public interface HupaGinjector extends Ginjector {
AppPresenter getAppPresenter();
PlaceManager getPlaceManager();
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java Thu Sep 12 02:42:10 2013
@@ -31,8 +31,13 @@ import org.apache.hupa.client.HupaCallba
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.User;
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.data.Message.IMAPFlag;
+>>>>>>> first commit
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.FolderSelectionEvent;
@@ -46,7 +51,10 @@ import org.apache.hupa.shared.events.Mes
import org.apache.hupa.shared.events.MoveMessageEvent;
import org.apache.hupa.shared.events.MoveMessageEventHandler;
import org.apache.hupa.shared.events.NewMessageEvent;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.DeleteAllMessages;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -120,7 +128,11 @@ public class IMAPMessageListPresenter ex
private String searchValue;
private User user;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
+=======
+ private IMAPFolder folder;
+>>>>>>> first commit
private DispatchAsync dispatcher;
private ShowMessageTableListener tableListener = new ShowMessageTableListener();
@@ -405,6 +417,7 @@ public class IMAPMessageListPresenter ex
@Override
protected void onRevealDisplay() {
+<<<<<<< HEAD
if (user != null && folder != null) {
display.reloadData();
}
@@ -419,14 +432,27 @@ public class IMAPMessageListPresenter ex
|| !this.folder.getFullName().equals(folder.getFullName())
|| (searchValue == null && this.searchValue != null)
|| (searchValue != null && searchValue.equals(this.searchValue) == false)) {
+=======
+ display.reloadData();
+ }
+
+ public void revealDisplay(User user, IMAPFolder folder, String searchValue) {
+ this.user = user;
+
+ if (this.folder == null || this.folder.getFullName().equals(folder.getFullName()) == false
+ || (searchValue == null && this.searchValue != null) || (searchValue != null && searchValue.equals(this.searchValue) == false)) {
+>>>>>>> first commit
display.reset();
display.deselectAllMessages();
}
display.setExpandLoading(false);
this.searchValue = searchValue;
this.folder = folder;
+<<<<<<< HEAD
+=======
+>>>>>>> first commit
revealDisplay();
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java Thu Sep 12 02:42:10 2013
@@ -474,7 +474,11 @@ public class IMAPMessageListView extends
pageBox.setSelectedIndex(0);
cTableModel.clearCache();
cTableModel.setRowCount(CachedTableModel.UNKNOWN_ROW_COUNT);
+<<<<<<< HEAD
mailTable.gotoPage(0, false);
+=======
+ mailTable.gotoFirstPage();
+>>>>>>> first commit
}
/*
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java Thu Sep 12 02:42:10 2013
@@ -38,7 +38,10 @@ import org.apache.hupa.shared.events.Bac
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.ReplyMessageEvent;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -68,7 +71,11 @@ public class IMAPMessagePresenter extend
private MessageDetails messageDetails;
private Message message;
private CachingDispatchAsync dispatcher;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
+=======
+ private IMAPFolder folder;
+>>>>>>> first commit
private User user;
@Inject
@@ -78,7 +85,11 @@ public class IMAPMessagePresenter extend
}
+<<<<<<< HEAD
public void revealDisplay(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails) {
+=======
+ public void revealDisplay(User user, IMAPFolder folder, Message message, MessageDetails messageDetails) {
+>>>>>>> first commit
this.message = message;
this.messageDetails = messageDetails;
this.folder = folder;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java Thu Sep 12 02:42:10 2013
@@ -49,6 +49,11 @@ import com.google.inject.Inject;
public class LoginPresenter extends WidgetPresenter<LoginPresenter.Display>{
private HupaConstants constants = GWT.create(HupaConstants.class);
+<<<<<<< HEAD
+=======
+ private int minUsernameLength = 1;
+ private int minPasswordLength = 1;
+>>>>>>> first commit
public interface Display extends WidgetDisplay{
public HasClickHandlers getLoginClick();
@@ -71,10 +76,17 @@ public class LoginPresenter extends Widg
* Try to login the user
*/
private void doLogin() {
+<<<<<<< HEAD
String user = display.getUserNameValue().getValue().trim();
String pass = display.getPasswordValue().getValue().trim();
if (user.isEmpty() || pass.isEmpty())
+=======
+ String user = display.getUserNameValue().getValue();
+ String pass = display.getPasswordValue().getValue();
+
+ if (user.length() < minUsernameLength || pass.length() < minPasswordLength)
+>>>>>>> first commit
return;
display.setLoading(true);
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/LoginView.java Thu Sep 12 02:42:10 2013
@@ -23,11 +23,17 @@ import org.apache.hupa.client.HupaCSS;
import org.apache.hupa.client.HupaConstants;
import org.apache.hupa.widgets.ui.Loading;
import org.apache.hupa.widgets.ui.RndPanel;
+<<<<<<< HEAD
+=======
+import org.cobogw.gwt.user.client.ui.Button;
+import org.cobogw.gwt.user.client.ui.ButtonBar;
+>>>>>>> first commit
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
+<<<<<<< HEAD
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
@@ -40,6 +46,13 @@ import com.google.gwt.user.client.ui.Has
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.PasswordTextBox;
import com.google.gwt.user.client.ui.SubmitButton;
+=======
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.Focusable;
+import com.google.gwt.user.client.ui.HasValue;
+import com.google.gwt.user.client.ui.PasswordTextBox;
+>>>>>>> first commit
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -51,6 +64,7 @@ import com.google.inject.Inject;
*/
public class LoginView extends Composite implements KeyUpHandler,LoginPresenter.Display{
+<<<<<<< HEAD
private Button loginButton = new Button();
private SubmitButton submitButton;
private Button resetButton;
@@ -64,11 +78,19 @@ public class LoginView extends Composite
// wrap the form after inputs so as they are in the dom when are wrapped
final private FormPanel formPanel = FormPanel.wrap(DOM.getElementById("loginForm"), true);
+=======
+ private Button loginButton;
+ private Button resetButton;
+ private TextBox usernameTextBox = new TextBox();
+ private PasswordTextBox passwordTextBox = new PasswordTextBox();
+ private Loading loading;
+>>>>>>> first commit
@Inject
public LoginView(HupaConstants constants) {
VerticalPanel mainContainer = new VerticalPanel();
RndPanel rPanel = new RndPanel();
+<<<<<<< HEAD
FlexTable flexTable = new FlexTable();
Panel buttonBar = new FlowPanel();
submitButton = new SubmitButton(constants.loginButton());
@@ -95,6 +117,30 @@ public class LoginView extends Composite
rPanel.add(formPanel);
formPanel.add(flexTable);
+=======
+ FlexTable formPanel = new FlexTable();
+ ButtonBar buttonBar = new ButtonBar();
+ loginButton = new Button(constants.loginButton());
+ resetButton = new Button(constants.resetButton());
+ loading = new Loading(constants.loading());
+
+ mainContainer.setStyleName(HupaCSS.C_login_container);
+ formPanel.addStyleName(HupaCSS.C_login_form);
+ usernameTextBox.addStyleName(HupaCSS.C_login_box);
+ passwordTextBox.addStyleName(HupaCSS.C_login_box);
+
+ buttonBar.add(loginButton);
+ buttonBar.add(resetButton);
+
+ formPanel.setText(0, 0, constants.usernameLabel());
+ formPanel.setWidget(0, 1, usernameTextBox);
+ formPanel.setText(1, 0, constants.passwordLabel());
+ formPanel.setWidget(1, 1, passwordTextBox);
+ formPanel.getFlexCellFormatter().setColSpan(2, 0, 2);
+ formPanel.setWidget(2, 0, buttonBar);
+
+ rPanel.add(formPanel);
+>>>>>>> first commit
mainContainer.add(rPanel);
mainContainer.add(loading);
initWidget(mainContainer);
@@ -104,6 +150,7 @@ public class LoginView extends Composite
passwordTextBox.addKeyUpHandler(this);
loading.hide();
+<<<<<<< HEAD
// The user submits the form so as the browser detect it and displays
// the save password dialog. Then we click on the hidden loginButton which
@@ -119,6 +166,8 @@ public class LoginView extends Composite
// loginButton must be in the document to handle the click() method
mainContainer.add(loginButton);
loginButton.setVisible(false);
+=======
+>>>>>>> first commit
}
/*
@@ -133,8 +182,12 @@ public class LoginView extends Composite
if (event.getSource().equals(usernameTextBox)) {
passwordTextBox.setFocus(true);
} else if (event.getSource().equals(passwordTextBox)) {
+<<<<<<< HEAD
submitButton.click();
// formPanel.submit();
+=======
+ loginButton.click();
+>>>>>>> first commit
}
}
}
@@ -144,7 +197,11 @@ public class LoginView extends Composite
* @see org.apache.hupa.client.mvp.LoginPresenter.Display#getLoginClick()
*/
public HasClickHandlers getLoginClick() {
+<<<<<<< HEAD
return submitButton;
+=======
+ return loginButton;
+>>>>>>> first commit
}
/*
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java Thu Sep 12 02:42:10 2013
@@ -24,20 +24,33 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+<<<<<<< HEAD
import net.customware.gwt.dispatch.client.DispatchAsync;
+=======
+>>>>>>> first commit
import net.customware.gwt.presenter.client.EventBus;
import net.customware.gwt.presenter.client.widget.WidgetContainerDisplay;
import net.customware.gwt.presenter.client.widget.WidgetContainerPresenter;
+<<<<<<< HEAD
+=======
+import org.apache.hupa.client.CachingDispatchAsync;
+>>>>>>> first commit
import org.apache.hupa.client.HupaCallback;
import org.apache.hupa.client.mvp.MessageSendPresenter.Type;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
+=======
+import org.apache.hupa.shared.data.MessageDetails;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.data.Message.IMAPFlag;
+>>>>>>> first commit
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.BackEventHandler;
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
@@ -62,7 +75,10 @@ import org.apache.hupa.shared.events.Rep
import org.apache.hupa.shared.events.ReplyMessageEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
import org.apache.hupa.shared.events.SentMessageEventHandler;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.FetchFolders;
@@ -115,24 +131,40 @@ public class MainPresenter extends Widge
public HasEnable getNewEnable();
+<<<<<<< HEAD
public void updateTreeItem(IMAPFolderProxy folder);
+=======
+ public void updateTreeItem(IMAPFolder folder);
+>>>>>>> first commit
public void deleteSelectedFolder();
public HasEditable createFolder(EditHandler handler);
+<<<<<<< HEAD
public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
+=======
+ public void increaseUnseenMessageCount(IMAPFolder folder, int amount);
+
+ public void decreaseUnseenMessageCount(IMAPFolder folder, int amount);
+>>>>>>> first commit
public void setLoadingFolders(boolean loading);
public void setLoadingMessage(boolean loading);
}
+<<<<<<< HEAD
private DispatchAsync dispatcher;
private User user;
private IMAPFolderProxy folder;
+=======
+ private CachingDispatchAsync cachingDispatcher;
+ private User user;
+ private IMAPFolder folder;
+>>>>>>> first commit
private String searchValue;
private IMAPMessageListPresenter messageListPresenter;
private IMAPMessagePresenter messagePresenter;
@@ -141,10 +173,17 @@ public class MainPresenter extends Widge
private HasEditable editableTreeItem;
@Inject
+<<<<<<< HEAD
public MainPresenter(MainPresenter.Display display, EventBus bus, DispatchAsync cachingDispatcher, IMAPMessageListPresenter messageListPresenter, IMAPMessagePresenter messagePresenter,
MessageSendPresenter sendPresenter) {
super(display, bus, messageListPresenter, messagePresenter, sendPresenter);
this.dispatcher = cachingDispatcher;
+=======
+ public MainPresenter(MainPresenter.Display display, EventBus bus, CachingDispatchAsync cachingDispatcher, IMAPMessageListPresenter messageListPresenter, IMAPMessagePresenter messagePresenter,
+ MessageSendPresenter sendPresenter) {
+ super(display, bus, messageListPresenter, messagePresenter, sendPresenter);
+ this.cachingDispatcher = cachingDispatcher;
+>>>>>>> first commit
this.messageListPresenter = messageListPresenter;
this.messagePresenter = messagePresenter;
this.sendPresenter = sendPresenter;
@@ -153,7 +192,11 @@ public class MainPresenter extends Widge
protected void loadTreeItems() {
display.setLoadingFolders(true);
+<<<<<<< HEAD
dispatcher.execute(new FetchFolders(), new HupaCallback<FetchFoldersResult>(dispatcher, eventBus, display) {
+=======
+ cachingDispatcher.execute(new FetchFolders(), new HupaCallback<FetchFoldersResult>(cachingDispatcher, eventBus, display) {
+>>>>>>> first commit
public void callback(FetchFoldersResult result) {
display.bindTreeItems(createTreeNodes(result.getFolders()));
// disable
@@ -171,10 +214,17 @@ public class MainPresenter extends Widge
* @param list
* @return
*/
+<<<<<<< HEAD
private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
for (IMAPFolderProxy iFolder : list) {
+=======
+ private List<IMAPTreeItem> createTreeNodes(List<IMAPFolder> list) {
+ List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
+
+ for (IMAPFolder iFolder : list) {
+>>>>>>> first commit
final IMAPTreeItem record = new IMAPTreeItem(iFolder);
record.addEditHandler(new EditHandler() {
@@ -184,7 +234,11 @@ public class MainPresenter extends Widge
IMAPFolder iFolder = new IMAPFolder((String) event.getOldValue());
final String newName = (String) event.getNewValue();
if (iFolder.getFullName().equalsIgnoreCase(newName) == false) {
+<<<<<<< HEAD
dispatcher.execute(new RenameFolder(iFolder, newName), new HupaCallback<GenericResult>(dispatcher, eventBus) {
+=======
+ cachingDispatcher.execute(new RenameFolder(iFolder, newName), new HupaCallback<GenericResult>(cachingDispatcher, eventBus) {
+>>>>>>> first commit
public void callback(GenericResult result) {
folder.setFullName(newName);
}
@@ -199,7 +253,11 @@ public class MainPresenter extends Widge
});
record.setUserObject(iFolder);
+<<<<<<< HEAD
List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
+=======
+ List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
+>>>>>>> first commit
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
@@ -225,7 +283,11 @@ public class MainPresenter extends Widge
return tList;
}
+<<<<<<< HEAD
private void showMessageTable(User user, IMAPFolderProxy folder, String searchValue) {
+=======
+ private void showMessageTable(User user, IMAPFolder folder, String searchValue) {
+>>>>>>> first commit
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
@@ -234,7 +296,11 @@ public class MainPresenter extends Widge
messageListPresenter.revealDisplay(user, folder, searchValue);
}
+<<<<<<< HEAD
private void showMessage(User user, IMAPFolderProxy folder, Message message, MessageDetails details) {
+=======
+ private void showMessage(User user, IMAPFolder folder, Message message, MessageDetails details) {
+>>>>>>> first commit
messagePresenter.revealDisplay(user, folder, message, details);
}
@@ -256,6 +322,17 @@ public class MainPresenter extends Widge
sendPresenter.revealDisplay();
}
+<<<<<<< HEAD
+=======
+ /**
+ * Reset the presenter and display
+ */
+ private void reset() {
+ // clear the cache
+ cachingDispatcher.clear();
+ }
+
+>>>>>>> first commit
@Override
protected void onBind() {
@@ -282,7 +359,11 @@ public class MainPresenter extends Widge
}
display.setLoadingMessage(true);
+<<<<<<< HEAD
dispatcher.execute(new GetMessageDetails(event.getFolder(), message.getUid()), new HupaCallback<GetMessageDetailsResult>(dispatcher, eventBus, display) {
+=======
+ cachingDispatcher.executeWithCache(new GetMessageDetails(event.getFolder(), message.getUid()), new HupaCallback<GetMessageDetailsResult>(cachingDispatcher, eventBus, display) {
+>>>>>>> first commit
public void callback(GetMessageDetailsResult result) {
if (decreaseUnseen) {
eventBus.fireEvent(new DecreaseUnseenEvent(user, folder));
@@ -380,7 +461,11 @@ public class MainPresenter extends Widge
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
+<<<<<<< HEAD
folder = (IMAPFolderProxy) tItem.getUserObject();
+=======
+ folder = (IMAPFolder) tItem.getUserObject();
+>>>>>>> first commit
eventBus.fireEvent(new LoadMessagesEvent(user, folder));
}
@@ -392,7 +477,11 @@ public class MainPresenter extends Widge
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
+<<<<<<< HEAD
folder = (IMAPFolderProxy) tItem.getUserObject();
+=======
+ folder = (IMAPFolder) tItem.getUserObject();
+>>>>>>> first commit
if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) {
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -423,7 +512,11 @@ public class MainPresenter extends Widge
registerHandler(display.getDeleteConfirmClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
+<<<<<<< HEAD
dispatcher.execute(new DeleteFolder(folder), new AsyncCallback<GenericResult>() {
+=======
+ cachingDispatcher.execute(new DeleteFolder(folder), new AsyncCallback<GenericResult>() {
+>>>>>>> first commit
public void onFailure(Throwable caught) {
GWT.log("ERROR while deleting", caught);
@@ -447,7 +540,11 @@ public class MainPresenter extends Widge
final IMAPTreeItem item = (IMAPTreeItem) event.getSource();
final String newValue = (String) event.getNewValue();
if (event.getEventType().equals(EditEvent.EventType.Stop)) {
+<<<<<<< HEAD
dispatcher.execute(new CreateFolder(new IMAPFolder(newValue.trim())), new AsyncCallback<GenericResult>() {
+=======
+ cachingDispatcher.execute(new CreateFolder(new IMAPFolder(newValue.trim())), new AsyncCallback<GenericResult>() {
+>>>>>>> first commit
public void onFailure(Throwable caught) {
GWT.log("Error while create folder", caught);
@@ -470,7 +567,11 @@ public class MainPresenter extends Widge
registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new MessagesReceivedEventHandler() {
public void onMessagesReceived(MessagesReceivedEvent event) {
+<<<<<<< HEAD
IMAPFolderProxy f = event.getFolder();
+=======
+ IMAPFolder f = event.getFolder();
+>>>>>>> first commit
display.updateTreeItem(f);
}
@@ -480,9 +581,14 @@ public class MainPresenter extends Widge
public void onLogin(LoginEvent event) {
user = event.getUser();
+<<<<<<< HEAD
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
showMessageTable(user, folder, searchValue);
+=======
+ folder = new IMAPFolder(user.getSettings().getInboxFolderName());
+ messageListPresenter.revealDisplay(user, folder, null);
+>>>>>>> first commit
}
}));
@@ -492,6 +598,18 @@ public class MainPresenter extends Widge
}
+<<<<<<< HEAD
+=======
+
+ @Override
+ protected void onUnbind() {
+ reset();
+
+ super.onUnbind();
+ }
+
+
+>>>>>>> first commit
public void revealDisplay(User user) {
this.user = user;
loadTreeItems();
@@ -500,8 +618,13 @@ public class MainPresenter extends Widge
@Override
protected void onRevealDisplay() {
+<<<<<<< HEAD
// showMessageTable(user, folder, searchValue);
// super.onRevealDisplay();
+=======
+ showMessageTable(user, folder, searchValue);
+ super.onRevealDisplay();
+>>>>>>> first commit
}
public void openLink(String url) {
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=1522132&r1=1522131&r2=1522132&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 Thu Sep 12 02:42:10 2013
@@ -34,14 +34,22 @@ import org.apache.hupa.client.widgets.Ha
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.User;
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.data.Message.IMAPFlag;
+>>>>>>> first commit
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MoveMessageEvent;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.event.EditHandler;
import org.apache.hupa.widgets.ui.EnableHyperlink;
@@ -60,7 +68,11 @@ import com.google.gwt.event.logical.shar
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.Panel;
+=======
+import com.google.gwt.user.client.ui.SimplePanel;
+>>>>>>> first commit
import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -86,7 +98,11 @@ public class MainView extends Composite
private IMAPMessageListView mListView;
private HupaMessages messages;
private VerticalPanel folderPanel = new VerticalPanel();
+<<<<<<< HEAD
private Panel westPanel = new HorizontalPanel();
+=======
+ private SimplePanel panel = new SimplePanel();
+>>>>>>> first commit
private HorizontalPanel folderButtonBar = new HorizontalPanel();
private EnableHyperlink newFolderButton;
private EnableHyperlink renameFolderButton;
@@ -115,6 +131,7 @@ public class MainView extends Composite
dockPanel.setSpacing(10);
dockPanel.setWidth("100%");
+<<<<<<< HEAD
// Not used so far
// createNorth();
// dockPanel.add(north, DockPanel.NORTH);
@@ -126,6 +143,17 @@ public class MainView extends Composite
createCenter();
dockPanel.add(center, DockPanel.CENTER);
+=======
+ createNorth();
+ createWest();
+ createCenter();
+
+ dockPanel.add(north, DockPanel.NORTH);
+ dockPanel.add(west, DockPanel.WEST);
+ dockPanel.setCellWidth(west, "160px");
+ dockPanel.add(center, DockPanel.CENTER);
+ dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT);
+>>>>>>> first commit
dockPanel.setCellHorizontalAlignment(center, DockPanel.ALIGN_LEFT);
initWidget(dockPanel);
@@ -145,7 +173,11 @@ public class MainView extends Composite
folderButtonBar.add(deleteFolderButton);
folderPanel.add(folderButtonBar);
folderPanel.add(folderTree);
+<<<<<<< HEAD
westPanel.add(loader);
+=======
+ panel.add(loader);
+>>>>>>> first commit
confirmFolderDeleteBox.setText(messages.confirmDeleteFolder());
bus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
@@ -161,10 +193,16 @@ public class MainView extends Composite
}
});
+<<<<<<< HEAD
west.add(westPanel);
}
@SuppressWarnings("unused")
+=======
+ west.add(panel);
+ }
+
+>>>>>>> first commit
private void createNorth() {
north = new VerticalPanel();
north.setWidth("100%");
@@ -243,11 +281,19 @@ public class MainView extends Composite
public void setLoadingFolders(boolean load) {
if (load) {
loader.show();
+<<<<<<< HEAD
// panel.clear();
westPanel.add(loader);
} else {
westPanel.clear();
westPanel.add(folderPanel);
+=======
+ panel.clear();
+ panel.add(loader);
+ } else {
+ panel.clear();
+ panel.add(folderPanel);
+>>>>>>> first commit
}
}
@@ -441,7 +487,11 @@ public class MainView extends Composite
// Generate a new folder with a whitespace as name, this is needed as
// workaround
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy)new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+=======
+ IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+>>>>>>> first commit
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
@@ -485,7 +535,11 @@ public class MainView extends Composite
* @seeorg.apache.hupa.client.mvp.IMAPFolderPresenter.Display#
* decreaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
+<<<<<<< HEAD
public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
+=======
+ public void decreaseUnseenMessageCount(IMAPFolder folder, int amount) {
+>>>>>>> first commit
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -503,7 +557,11 @@ public class MainView extends Composite
* @seeorg.apache.hupa.client.mvp.IMAPFolderPresenter.Display#
* increaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
+<<<<<<< HEAD
public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
+=======
+ public void increaseUnseenMessageCount(IMAPFolder folder, int amount) {
+>>>>>>> first commit
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -516,8 +574,13 @@ public class MainView extends Composite
}
+<<<<<<< HEAD
private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolderProxy folder) {
if (folder.getFullName().equalsIgnoreCase(((IMAPFolderProxy) item.getUserObject()).getFullName())) {
+=======
+ private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolder folder) {
+ if (folder.getFullName().equalsIgnoreCase(((IMAPFolder) item.getUserObject()).getFullName())) {
+>>>>>>> first commit
return item;
}
for (int i = 0; i < item.getChildCount(); i++) {
@@ -533,7 +596,11 @@ public class MainView extends Composite
* (non-Javadoc)
* @see org.apache.hupa.client.mvp.MainPresenter.Display#updateTreeItem(org.apache.hupa.shared.data.IMAPFolder)
*/
+<<<<<<< HEAD
public void updateTreeItem(IMAPFolderProxy folder) {
+=======
+ public void updateTreeItem(IMAPFolder folder) {
+>>>>>>> first commit
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java Thu Sep 12 02:42:10 2013
@@ -19,15 +19,31 @@
package org.apache.hupa.client.mvp;
+<<<<<<< HEAD
import gwtupload.client.IUploadStatus.Status;
import gwtupload.client.IUploader;
+=======
+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.user.client.ui.Focusable;
+import com.google.gwt.user.client.ui.HasHTML;
+import com.google.gwt.user.client.ui.HasText;
+import com.google.inject.Inject;
+
+import gwtupload.client.IUploader;
+import gwtupload.client.IUploadStatus.Status;
+>>>>>>> first commit
import gwtupload.client.IUploader.OnCancelUploaderHandler;
import gwtupload.client.IUploader.OnFinishUploaderHandler;
import gwtupload.client.IUploader.OnStatusChangedHandler;
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
+=======
+>>>>>>> first commit
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.dispatch.shared.Action;
import net.customware.gwt.presenter.client.EventBus;
@@ -52,12 +68,16 @@ import org.apache.hupa.shared.events.Fol
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.ForwardMessage;
import org.apache.hupa.shared.rpc.GenericResult;
import org.apache.hupa.shared.rpc.ReplyMessage;
import org.apache.hupa.shared.rpc.SendMessage;
+<<<<<<< HEAD
import org.apache.hupa.widgets.ui.HasEnable;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -67,6 +87,13 @@ import com.google.gwt.user.client.ui.Foc
import com.google.gwt.user.client.ui.HasHTML;
import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
+=======
+import org.apache.hupa.shared.rpc.ContactsResult.Contact;
+import org.apache.hupa.widgets.ui.HasEnable;
+
+import java.util.ArrayList;
+import java.util.List;
+>>>>>>> first commit
/**
* Presenter which handles the sending, reply, replay-all, forward of mails
@@ -77,7 +104,11 @@ public class MessageSendPresenter extend
private DispatchAsync dispatcher;
private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
private Type type = Type.NEW;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
+=======
+ private IMAPFolder folder;
+>>>>>>> first commit
private Message oldmessage;
protected SMTPMessage message = null;
@@ -282,7 +313,11 @@ public class MessageSendPresenter extend
* @param type
* the type
*/
+<<<<<<< HEAD
public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
+=======
+ public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
+>>>>>>> first commit
this.reset();
this.oldmessage = oldmessage;
this.oldDetails = oldDetails;
@@ -295,6 +330,7 @@ public class MessageSendPresenter extend
if (type.equals(Type.NEW) && mailto != null) {
display.getToText().setText(mailto);
} else if (type.equals(Type.FORWARD)) {
+<<<<<<< HEAD
String subject = oldmessage.getSubject() != null ? oldmessage.getSubject().trim() : "";
if (!subject.toLowerCase().startsWith("fwd:")){
subject = "Fwd: " + subject;
@@ -306,6 +342,15 @@ public class MessageSendPresenter extend
subject = "Re: " + subject;
}
display.getSubjectText().setText(subject);
+=======
+ if (oldmessage.getSubject() != null && !oldmessage.getSubject().toLowerCase().startsWith("fwd:")) {
+ display.getSubjectText().setText("Fwd: " + oldmessage.getSubject());
+ }
+ } else if (type.equals(Type.REPLY) || type.equals(Type.REPLY_ALL)) {
+ if (oldmessage.getSubject() != null && !oldmessage.getSubject().toLowerCase().startsWith("re:")) {
+ display.getSubjectText().setText("Re: " + oldmessage.getSubject());
+ }
+>>>>>>> first commit
if (type.equals(Type.REPLY)) {
if (oldmessage.getReplyto() != null && !oldmessage.getFrom().contains(oldmessage.getReplyto())) {
display.getToText().setText(oldmessage.getReplyto());
@@ -334,7 +379,11 @@ public class MessageSendPresenter extend
display.getEditorFocus().setFocus(true);
}
+<<<<<<< HEAD
public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, Type type) {
+=======
+ public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, Type type) {
+>>>>>>> first commit
this.revealDisplay(user, folder, oldmessage, oldDetails, null, type);
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java Thu Sep 12 02:42:10 2013
@@ -130,6 +130,12 @@ public class MessageSendView extends Com
new EmailListValidator(getToText()).addActionForFailure(sAction).addActionForFailure(fAction),
new NotEmptyValidator(getToText()).addActionForFailure(sAction).addActionForFailure(fAction));
+<<<<<<< HEAD
+=======
+ try {
+ } catch (Exception e) {
+ }
+>>>>>>> first commit
}
/*
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageTableModel.java Thu Sep 12 02:42:10 2013
@@ -37,7 +37,10 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> first commit
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -55,7 +58,11 @@ public class MessageTableModel extends M
private EventBus eventBus;
private DispatchAsync dispatcher;
private User user;
+<<<<<<< HEAD
private IMAPFolderProxy folder;
+=======
+ private IMAPFolder folder;
+>>>>>>> first commit
private String searchValue;
@Inject
@@ -85,7 +92,11 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
+<<<<<<< HEAD
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
+=======
+ folder = new IMAPFolder(user.getSettings().getInboxFolderName());
+>>>>>>> first commit
searchValue = null;
}
});
@@ -123,9 +134,15 @@ public class MessageTableModel extends M
// Update folder information before notifying presenter
folder.setMessageCount(result.getRealCount());
folder.setUnseenMessageCount(result.getRealUnreadCount());
+<<<<<<< HEAD
setRowCount(result.getRealCount());
callback.onRowsReady(request, new TableModelHelper.Response<Message>() {
+=======
+ // Notify presenter to update folder tree view
+ eventBus.fireEvent(new MessagesReceivedEvent(folder, result.getMessages()));
+ TableModelHelper.Response<Message> response = new TableModelHelper.Response<Message>() {
+>>>>>>> first commit
@Override
public Iterator<Message> getRowValues() {
if (result != null && result.getMessages() != null) {
@@ -134,10 +151,16 @@ public class MessageTableModel extends M
return new ArrayList<Message>().iterator();
}
}
+<<<<<<< HEAD
});
// Notify presenter to update folder tree view
eventBus.fireEvent(new MessagesReceivedEvent(folder, result.getMessages()));
+=======
+ };
+ setRowCount(result.getRealCount());
+ callback.onRowsReady(request,response);
+>>>>>>> first commit
}
});
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessageListPresenterPlace.java Thu Sep 12 02:42:10 2013
@@ -55,6 +55,10 @@ public class IMAPMessageListPresenterPla
} catch (NumberFormatException e) {
// ignore
}
+<<<<<<< HEAD
+=======
+ presenter.getDisplay().goToPage(page);
+>>>>>>> first commit
int rowsPerPageIndex = 0;
try {
@@ -69,9 +73,14 @@ public class IMAPMessageListPresenterPla
String searchValue = request.getParameter(SEARCH, "");
presenter.getDisplay().getSearchValue().setValue(searchValue);
+<<<<<<< HEAD
presenter.getDisplay().goToPage(page);
GWT.log("PRES="+request.toString(),null);
+=======
+ GWT.log("PRES="+request.toString(),null);
+
+>>>>>>> first commit
}
@Override
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=1522132&r1=1522131&r2=1522132&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 02:42:10 2013
@@ -22,6 +22,7 @@ import com.google.web.bindery.requestfac
public interface HupaRequestFactory extends RequestFactory {
<<<<<<< HEAD
+<<<<<<< HEAD
SubjectRequest subjectRequest();
ImapFolderRequest folderRequest();
@@ -67,4 +68,7 @@ public interface HupaRequestFactory exte
UserRequest userRequest();
IMAPFolderRequestContext folderRequest();
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
+=======
+ SubjectRequest subjectRequest();
+>>>>>>> first commit
}
\ No newline at end of file
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java Thu Sep 12 02:42:10 2013
@@ -34,10 +34,14 @@ import eu.maydu.gwt.validation.client.i1
*/
public class EmailListValidator extends Validator<EmailListValidator>{
<<<<<<< HEAD
+<<<<<<< HEAD
private static final String emailRegex = "^(.*<)?[A-Za-z0-9._%'*/=+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
=======
private static final String emailRegex = "^(.*<)?[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
>>>>>>> first commit
+=======
+ private static final String emailRegex = "^(.*<)?[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(>)?\\s*$";
+>>>>>>> first commit
private HasText text;
public EmailListValidator(HasText text) {
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java?rev=1522132&r1=1522131&r2=1522132&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java Thu Sep 12 02:42:10 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.widgets;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -174,6 +175,9 @@ public class IMAPTreeItem extends Editab
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+import org.apache.hupa.shared.data.IMAPFolder;
+>>>>>>> first commit
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -181,7 +185,11 @@ public class IMAPTreeItem extends Editab
protected String oldFullName;
protected String oldName;
+<<<<<<< HEAD
public IMAPTreeItem(IMAPFolderProxy folder) {
+=======
+ public IMAPTreeItem(IMAPFolder folder) {
+>>>>>>> first commit
setUserObject(folder);
setFolderText(folder);
}
@@ -204,7 +212,11 @@ public class IMAPTreeItem extends Editab
}
public void setUnseenMessageCount(int cound) {
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+=======
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+>>>>>>> first commit
int count = folder.getUnseeMessageCount();
folder.setUnseenMessageCount(count);
setFolderText(folder);
@@ -216,7 +228,11 @@ public class IMAPTreeItem extends Editab
* Decrease the unseen messagecount of this folder
*/
public void descreaseUnseenMessageCount(int decreaseCount) {
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+=======
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+>>>>>>> first commit
int count = folder.getUnseeMessageCount();
if (count > 0) {
count = count - decreaseCount;
@@ -238,21 +254,35 @@ public class IMAPTreeItem extends Editab
* Increase the unseen messagecount of this folder
*/
public void increaseUnseenMessageCount( int increaseCount) {
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+=======
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+>>>>>>> first commit
int count = folder.getUnseeMessageCount();
count = count+ increaseCount;
folder.setUnseenMessageCount(count);
setFolderText(folder);
}
+<<<<<<< HEAD
private void setFolderText(IMAPFolderProxy folder) {
+=======
+ private void setFolderText(IMAPFolder folder) {
+>>>>>>> first commit
setText(getFolderName(folder));
setUnseenMessageCountStyle(folder);
}
+<<<<<<< HEAD
private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
for (IMAPFolderProxy fold : folder.getChildIMAPFolders()) {
+=======
+ private void setUnseenMessageCountStyle(IMAPFolder folder) {
+ boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
+ for (IMAPFolder fold : folder.getChildIMAPFolders()) {
+>>>>>>> first commit
if (fold.getUnseeMessageCount() > 0) {
containsUnseen = true;
break;
@@ -271,7 +301,11 @@ public class IMAPTreeItem extends Editab
* @param folder
* @return name
*/
+<<<<<<< HEAD
private String getFolderName(IMAPFolderProxy folder) {
+=======
+ private String getFolderName(IMAPFolder folder) {
+>>>>>>> first commit
if (folder.getUnseeMessageCount() > 0) {
return folder.getName() + " ("+folder.getUnseeMessageCount()+")";
}
@@ -280,17 +314,28 @@ public class IMAPTreeItem extends Editab
@Override
public void setUserObject(Object obj) {
+<<<<<<< HEAD
if ((obj instanceof IMAPFolderProxy) == false) {
throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
}
setFolderText((IMAPFolderProxy)obj);
+=======
+ if ((obj instanceof IMAPFolder) == false) {
+ throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
+ }
+ setFolderText((IMAPFolder)obj);
+>>>>>>> first commit
super.setUserObject(obj);
}
@Override
public void startEdit() {
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+=======
+ IMAPFolder folder = (IMAPFolder) getUserObject();
+>>>>>>> first commit
oldFullName = folder.getFullName();
oldName = folder.getName();
showEditBox(oldName);
@@ -299,7 +344,11 @@ public class IMAPTreeItem extends Editab
@Override
public void cancelEdit() {
+<<<<<<< HEAD
IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+=======
+ IMAPFolder folder = ((IMAPFolder) getUserObject());
+>>>>>>> first commit
folder.setFullName(oldFullName);
showItem(getFolderName(folder));
@@ -315,7 +364,11 @@ public class IMAPTreeItem extends Editab
} else {
String newFolderName = editBox.getText();
String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length()) + newFolderName;
+<<<<<<< HEAD
IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+=======
+ IMAPFolder folder = ((IMAPFolder) getUserObject());
+>>>>>>> first commit
folder.setFullName(newFullFolderName);
showItem(getFolderName(folder));
@@ -323,5 +376,8 @@ public class IMAPTreeItem extends Editab
}
}
+<<<<<<< HEAD
+>>>>>>> first commit
+=======
>>>>>>> first commit
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org