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 05:00:49 UTC
svn commit: r1522159 [1/2] - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/activity/
client/src/main/java/org/apache/hupa/client/evo/
client/src/main/java/org/apache/hupa/client/ioc/
client/src/main/java/org/apache/hupa/client/mvp/ ...
Author: dongxu
Date: Thu Sep 12 03:00:47 2013
New Revision: 1522159
URL: http://svn.apache.org/r1522159
Log:
Make chechsession and login work with RF, with refactoring fetch folders.
...there are so many handlers should be changed to RF...
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java~HEAD
- copied, changed from r1522158, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java~HEAD
- copied, changed from r1522158, james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequestContext.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/UserProxy.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/UserRequest.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/locator/ImapFolderServiceLocator.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/locator/UserDaoLocator.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/locator/UserLocator.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractServcie.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/UserDao.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/Settings.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/User.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/locator/EntityLocator.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/AbstractEntityProxy.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rf/Entity.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rf/EntityBase.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.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/IMAPMessagePresenter.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/MessageTableModel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.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/rf/ImapFolderRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
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/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/DefaultUserSettingsProvider.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/guice/GuiceServerModule.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/HttpSessionProvider.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/AbstractSessionHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/CheckSessionHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/CreateFolderHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteAllMessagesHandler.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/GetRawMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/LogoutUserHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/MoveMessageHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.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/handler/TagMessagesHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceListener.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceWebModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceDecorator.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServiceLocator.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/IocRfServlet.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/service/AbstractService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CheckSessionServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/LoginUserServiceImpl.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/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/handler/LoginUserHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/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/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/rpc/CheckSessionResult.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/LoginUserResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/LogoutUserResult.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 03:00:47 2013
@@ -27,8 +27,8 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
@@ -91,11 +91,11 @@ public class IMAPMessageActivity extend
public void onClick(ClickEvent event) {
ArrayList<Long> uidList = new ArrayList<Long>();
uidList.add(message.getUid());
- dispatcher.execute(new DeleteMessageByUid(folder, uidList), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) {
- public void callback(DeleteMessageResult result) {
- eventBus.fireEvent(new LoadMessagesEvent(user,folder));
- }
- });
+// dispatcher.execute(new DeleteMessageByUid(folder, uidList), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) {
+// public void callback(DeleteMessageResult result) {
+// eventBus.fireEvent(new LoadMessagesEvent(user,folder));
+// }
+// });
}
});
@@ -160,7 +160,7 @@ public class IMAPMessageActivity extend
private ImapFolder folder;
>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
private User user;
- @Inject private CachingDispatchAsync dispatcher;
+// @Inject private CachingDispatchAsync dispatcher;
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java Thu Sep 12 03:00:47 2013
@@ -381,26 +381,27 @@ package org.apache.hupa.client.activity;
import java.util.ArrayList;
+<<<<<<< HEAD
import net.customware.gwt.dispatch.client.DispatchAsync;
<<<<<<< HEAD
<<<<<<< HEAD
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.client.HandlerRegistrationAdapter;
import org.apache.hupa.client.activity.MessageSendActivity.Type;
-import org.apache.hupa.client.evo.HupaEvoCallback;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.FolderSelectionEvent;
import org.apache.hupa.shared.events.FolderSelectionEventHandler;
-import org.apache.hupa.shared.events.IncreaseUnseenEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
@@ -409,6 +410,7 @@ import org.apache.hupa.shared.events.Mes
import org.apache.hupa.shared.events.MoveMessageEvent;
import org.apache.hupa.shared.events.MoveMessageEventHandler;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteAllMessages;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
@@ -469,6 +471,8 @@ import org.apache.hupa.shared.rpc.Generi
import org.apache.hupa.shared.rpc.MoveMessage;
import org.apache.hupa.shared.rpc.MoveMessageResult;
import org.apache.hupa.shared.rpc.SetFlag;
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.widgets.ui.HasEnable;
import com.google.gwt.activity.shared.AbstractActivity;
@@ -539,7 +543,7 @@ public class IMAPMessageListActivity ext
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
- @Inject private DispatchAsync dispatcher;
+// @Inject private DispatchAsync dispatcher;
@Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
@@ -603,13 +607,13 @@ public class IMAPMessageListActivity ext
public void onMoveMessageHandler(MoveMessageEvent event) {
final Message message = event.getMessage();
- dispatcher.execute(new MoveMessage(event.getOldFolder(), event.getNewFolder(), message.getUid()), new HupaEvoCallback<MoveMessageResult>(dispatcher, eventBus) {
- public void callback(MoveMessageResult result) {
- ArrayList<Message> messageArray = new ArrayList<Message>();
- messageArray.add(message);
- display.removeMessages(messageArray);
- }
- });
+// dispatcher.execute(new MoveMessage(event.getOldFolder(), event.getNewFolder(), message.getUid()), new HupaEvoCallback<MoveMessageResult>(dispatcher, eventBus) {
+// public void callback(MoveMessageResult result) {
+// ArrayList<Message> messageArray = new ArrayList<Message>();
+// messageArray.add(message);
+// display.removeMessages(messageArray);
+// }
+// });
}
});
@@ -665,13 +669,13 @@ public class IMAPMessageListActivity ext
display.getConfirmDeleteAllDialogClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- dispatcher.execute(new DeleteAllMessages(folder), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) {
- public void callback(DeleteMessageResult result) {
- display.reset();
- display.reloadData();
-// eventBus.fireEvent(new DecreaseUnseenEvent(user,folder,result.getCount()));
- }
- });
+// dispatcher.execute(new DeleteAllMessages(folder), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) {
+// public void callback(DeleteMessageResult result) {
+// display.reset();
+// display.reloadData();
+//// eventBus.fireEvent(new DecreaseUnseenEvent(user,folder,result.getCount()));
+// }
+// });
}
});
@@ -686,17 +690,17 @@ public class IMAPMessageListActivity ext
selectedMessages.remove(m);
}
}
- dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, true, uids), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
- public void callback(GenericResult result) {
- for (Message m : selectedMessages) {
- if (m.getFlags().contains(IMAPFlag.SEEN) == false) {
- m.getFlags().add(IMAPFlag.SEEN);
- }
- }
- display.redraw();
- eventBus.fireEvent(new DecreaseUnseenEvent(user, folder,selectedMessages.size()));
- }
- });
+// dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, true, uids), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
+// public void callback(GenericResult result) {
+// for (Message m : selectedMessages) {
+// if (m.getFlags().contains(IMAPFlag.SEEN) == false) {
+// m.getFlags().add(IMAPFlag.SEEN);
+// }
+// }
+// display.redraw();
+// eventBus.fireEvent(new DecreaseUnseenEvent(user, folder,selectedMessages.size()));
+// }
+// });
}
});
@@ -713,17 +717,17 @@ public class IMAPMessageListActivity ext
}
}
- dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, false, uids), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
- public void callback(GenericResult result) {
- for (Message m : selectedMessages) {
- if (m.getFlags().contains(IMAPFlag.SEEN)) {
- m.getFlags().remove(IMAPFlag.SEEN);
- }
- }
- display.redraw();
- eventBus.fireEvent(new IncreaseUnseenEvent(user, folder,selectedMessages.size()));
- }
- });
+// dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, false, uids), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
+// public void callback(GenericResult result) {
+// for (Message m : selectedMessages) {
+// if (m.getFlags().contains(IMAPFlag.SEEN)) {
+// m.getFlags().remove(IMAPFlag.SEEN);
+// }
+// }
+// display.redraw();
+// eventBus.fireEvent(new IncreaseUnseenEvent(user, folder,selectedMessages.size()));
+// }
+// });
}
@@ -788,11 +792,11 @@ public class IMAPMessageListActivity ext
// maybe its better to just remove the messages from the table and expect the removal will work
display.removeMessages(selectedMessages);
- dispatcher.execute(new DeleteMessageByUid(folder,uids), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) {
- public void callback(DeleteMessageResult result) {
- eventBus.fireEvent(new DecreaseUnseenEvent(user,folder,result.getCount()));
- }
- });
+// dispatcher.execute(new DeleteMessageByUid(folder,uids), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) {
+// public void callback(DeleteMessageResult result) {
+// eventBus.fireEvent(new DecreaseUnseenEvent(user,folder,result.getCount()));
+// }
+// });
}
public IMAPMessageListActivity with(MailFolderPlace place){
this.user = place.getUser();
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 03:00:47 2013
@@ -36,6 +36,7 @@ import org.apache.hupa.shared.events.Ses
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
package org.apache.hupa.client.activity;
+<<<<<<< HEAD
import net.customware.gwt.dispatch.client.DispatchAsync;
<<<<<<< HEAD
@@ -58,16 +59,24 @@ import org.apache.hupa.client.mvp.Widget
import org.apache.hupa.client.place.MailInboxPlace;
>>>>>>> Change to new mvp framework - first step
=======
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.client.HupaConstants;
-import org.apache.hupa.client.evo.HupaEvoCallback;
+import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.place.MailFolderPlace;
+import org.apache.hupa.client.rf.HupaRequestFactory;
+import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.SessionExpireEvent;
import org.apache.hupa.shared.events.SessionExpireEventHandler;
+<<<<<<< HEAD
>>>>>>> decorate the theme
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
@@ -144,6 +153,8 @@ import com.google.gwt.user.client.ui.Foc
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
+import com.google.web.bindery.requestfactory.shared.Receiver;
+import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class LoginActivity extends AbstractActivity {
@@ -189,9 +200,13 @@ public class LoginActivity extends Abstr
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
- @Inject private DispatchAsync dispatcher;
+ // @Inject private DispatchAsync dispatcher;
@Inject private HupaConstants constants;
+<<<<<<< HEAD
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
+=======
+ @Inject private HupaRequestFactory requestFactory;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
@@ -303,6 +318,7 @@ public class LoginActivity extends Abstr
display.setLoading(true);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
// HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
@@ -403,6 +419,21 @@ public class LoginActivity extends Abstr
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
+=======
+
+ LoginUserRequest loginRequest = requestFactory.loginRequest();
+ loginRequest.login(user, pass).fire(new Receiver<User>() {
+ @Override
+ public void onSuccess(User response) {
+ placeController.goTo(new MailFolderPlace().with(response));
+ }
+ @Override
+ public void onFailure(ServerFailure error){
+ placeController.goTo(new DefaultPlace());
+ }
+ });
+
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
/**
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 03:00:47 2013
@@ -36,6 +36,7 @@ import java.util.List;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.SendForwardMessageRequest;
import org.apache.hupa.client.rf.SendMessageRequest;
@@ -64,6 +65,8 @@ import org.apache.hupa.client.ui.WidgetD
=======
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.dispatch.shared.Action;
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.client.evo.HupaEvoCallback;
import org.apache.hupa.client.place.MessageSendPlace;
@@ -79,6 +82,7 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.SMTPMessage;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -88,6 +92,10 @@ import org.apache.hupa.shared.data.User;
=======
import org.apache.hupa.shared.domain.ImapFolder;
>>>>>>> Allow client can use the domain entity interface.
+=======
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.ContactsUpdatedEvent;
import org.apache.hupa.shared.events.ContactsUpdatedEventHandler;
@@ -178,7 +186,7 @@ public class MessageSendActivity extends
@SuppressWarnings("unused")
private MessageDetails oldDetails;
- @Inject private DispatchAsync dispatcher;
+// @Inject private DispatchAsync dispatcher;
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
@@ -578,7 +586,7 @@ public class MessageSendActivity extends
} else {
command = new ReplyMessage(message, folder, oldmessage.getUid());
}
- dispatchMessage(dispatcher, eventBus, command);
+// dispatchMessage(dispatcher, eventBus, command);
}
}
};
@@ -604,20 +612,20 @@ public class MessageSendActivity extends
}
// Although dispatcher and eventBus parameters are not necessary, they are needed for testability
- protected void dispatchMessage(DispatchAsync dispatcher, final EventBus eventBus, Action<GenericResult> command) {
- display.setLoading(true);
- dispatcher.execute(command, new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
- public void callback(GenericResult result) {
- if (result.isSuccess()) {
- eventBus.fireEvent(new SentMessageEvent());
- reset();
- } else {
- eventBus.fireEvent(new FlashEvent(result.getMessage(), 6000));
- }
- display.setLoading(false);
- }
- });
- }
+// protected void dispatchMessage(DispatchAsync dispatcher, final EventBus eventBus, Action<GenericResult> command) {
+// display.setLoading(true);
+// dispatcher.execute(command, new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
+// public void callback(GenericResult result) {
+// if (result.isSuccess()) {
+// eventBus.fireEvent(new SentMessageEvent());
+// reset();
+// } else {
+// eventBus.fireEvent(new FlashEvent(result.getMessage(), 6000));
+// }
+// display.setLoading(false);
+// }
+// });
+// }
<<<<<<< HEAD
<<<<<<< HEAD
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java Thu Sep 12 03:00:47 2013
@@ -34,11 +34,10 @@ import org.apache.hupa.shared.domain.Use
>>>>>>> introduce the top activity
package org.apache.hupa.client.activity;
-import net.customware.gwt.dispatch.client.DispatchAsync;
-
import org.apache.hupa.client.HupaConstants;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.evo.HupaEvoCallback;
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.ui.WidgetDisplayable;
@@ -54,6 +53,11 @@ import org.apache.hupa.client.place.Defa
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.shared.data.User;
>>>>>>> introduce the top activity
+=======
+import org.apache.hupa.client.place.DefaultPlace;
+import org.apache.hupa.client.ui.WidgetDisplayable;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.FlashEventHandler;
import org.apache.hupa.shared.events.LoginEvent;
@@ -65,6 +69,7 @@ import org.apache.hupa.shared.events.Ser
import org.apache.hupa.shared.events.ServerStatusEventHandler;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
@@ -75,6 +80,8 @@ import org.apache.hupa.shared.rpc.Idle;
import org.apache.hupa.shared.rpc.IdleResult;
import org.apache.hupa.shared.rpc.LogoutUser;
import org.apache.hupa.shared.rpc.LogoutUserResult;
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
@@ -103,7 +110,6 @@ public class TopActivity extends AppBase
>>>>>>> introduce the top activity
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
@@ -133,12 +139,16 @@ public class TopActivity extends Abstrac
bind();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
checkSession();
>>>>>>> introduce the top activity
=======
checkSession();
>>>>>>> introduce the top activity
+=======
+// checkSession();
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
private void bind() {
@@ -175,6 +185,7 @@ public class TopActivity extends Abstrac
noopTimer.cancel();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
TopActivity.this.placeController.goTo(defaultPlaceProvider.get());
}
<<<<<<< HEAD
@@ -200,6 +211,9 @@ public class TopActivity extends Abstrac
=======
TopActivity.this.placeController.goTo(defaultPlaceProvider.get());
>>>>>>>
+=======
+// TopActivity.this.placeController.goTo(defaultPlaceProvider.get());
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
>>>>>>> introduce the top activity
@@ -270,24 +284,26 @@ public class TopActivity extends Abstrac
}
private void checkSession() {
- dispatcher.execute(new CheckSession(), new AsyncCallback<CheckSessionResult>() {
- public void onFailure(Throwable caught) {
- serverStatus = ServerStatus.Unavailable;
- display.setServerStatus(serverStatus);
- showLogin(null);
- }
- public void onSuccess(CheckSessionResult result) {
- serverStatus = ServerStatus.Available;
- display.setServerStatus(serverStatus);
- if (result.isValid()) {
- eventBus.fireEvent(new LoginEvent(result.getUser()));
- } else {
- showLogin(null);
- }
- }
- });
+ System.out.println("+++++++++++++");
+// dispatcher.execute(new CheckSession(), new AsyncCallback<CheckSessionResult>() {
+// public void onFailure(Throwable caught) {
+// serverStatus = ServerStatus.Unavailable;
+// display.setServerStatus(serverStatus);
+// showLogin(null);
+// }
+// public void onSuccess(CheckSessionResult result) {
+// serverStatus = ServerStatus.Available;
+// display.setServerStatus(serverStatus);
+// if (result.isValid()) {
+// eventBus.fireEvent(new LoginEvent(result.getUser()));
+// } else {
+// showLogin(null);
+// }
+// }
+// });
}
private void doLogout() {
+<<<<<<< HEAD
if (user != null) {
dispatcher.execute(new LogoutUser(), new HupaEvoCallback<LogoutUserResult>(dispatcher, eventBus) {
public void callback(LogoutUserResult result) {
@@ -299,6 +315,15 @@ public class TopActivity extends Abstrac
}
});
}
+=======
+// if (user != null) {
+// dispatcher.execute(new LogoutUser(), new HupaEvoCallback<LogoutUserResult>(dispatcher, eventBus) {
+// public void callback(LogoutUserResult result) {
+// eventBus.fireEvent(new LogoutEvent(result.getUser()));
+// }
+// });
+// }
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
private void showMain(User user) {
@@ -417,8 +442,8 @@ public class TopActivity extends Abstrac
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
- @Inject private DispatchAsync dispatcher;
- @Inject private Provider<DefaultPlace> defaultPlaceProvider;
+// @Inject private DispatchAsync dispatcher;
+// @Inject private Provider<DefaultPlace> defaultPlaceProvider;
@Inject private HupaConstants constants;
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
@@ -430,6 +455,7 @@ public class TopActivity extends Abstrac
public void run() {
if (!running) {
running = true;
+<<<<<<< HEAD
dispatcher.execute(new Idle(), new HupaEvoCallback<IdleResult>(dispatcher, eventBus) {
public void callback(IdleResult result) {
<<<<<<< HEAD
@@ -463,6 +489,22 @@ public class TopActivity extends Abstrac
>>>>>>> introduce the top activity
}
});
+=======
+// dispatcher.execute(new Idle(), new HupaEvoCallback<IdleResult>(dispatcher, eventBus) {
+// public void callback(IdleResult result) {
+// running = false;
+// // check if the server is not supporting the Idle
+// // command.
+// // if so cancel this Timer
+// if (result.isSupported() == false) {
+// IdleTimer.this.cancel();
+// }
+// // Noop
+// // TODO: put code here to read new events from server
+// // (new messages ...)
+// }
+// });
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 03:00:47 2013
@@ -252,7 +252,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import net.customware.gwt.dispatch.client.DispatchAsync;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -262,7 +261,7 @@ import org.apache.hupa.client.place.IMAP
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.rf.ImapFolderRequestContext;
+import org.apache.hupa.client.rf.ImapFolderRequest;
import org.apache.hupa.client.ui.WidgetContainerDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
@@ -270,8 +269,8 @@ import org.apache.hupa.shared.data.ImapF
import org.apache.hupa.shared.data.Message;
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.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.BackEventHandler;
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
@@ -448,7 +447,7 @@ public class WestActivity extends Abstra
container.setWidget(display.asWidget());
}
- @Inject private DispatchAsync dispatcher;
+// @Inject private DispatchAsync dispatcher;
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
@@ -548,7 +547,7 @@ public class WestActivity extends Abstra
HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
rf.initialize(eventBus);
- ImapFolderRequestContext folderRequest = rf.folderRequest();
+ ImapFolderRequest folderRequest = rf.folderRequest();
// IMAPFolderProxy folder = folderRequest.create(IMAPFolderProxy.class);
// folderRequest.echo("..........Hi++++").fire(new Receiver<String>(){
//
@@ -648,26 +647,26 @@ System.out.println("1111111"+response);
>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
final IMAPTreeItem record = new IMAPTreeItem(iFolder);
- record.addEditHandler(new EditHandler() {
-
- public void onEditEvent(EditEvent event) {
- if (event.getEventType().equals(EditEvent.EventType.Stop)) {
- ImapFolderImpl iFolder = new ImapFolderImpl((String) event.getOldValue());
- final String newName = (String) event.getNewValue();
- if (iFolder.getFullName().equalsIgnoreCase(newName) == false) {
- dispatcher.execute(new RenameFolder(iFolder, newName), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
- public void callback(GenericResult result) {
- folder.setFullName(newName);
- }
- public void callbackError(Throwable caught) {
- record.cancelEdit();
- }
- });
- }
- }
- }
-
- });
+// record.addEditHandler(new EditHandler() {
+//
+// public void onEditEvent(EditEvent event) {
+// if (event.getEventType().equals(EditEvent.EventType.Stop)) {
+// ImapFolderImpl iFolder = new ImapFolderImpl((String) event.getOldValue());
+// final String newName = (String) event.getNewValue();
+// if (iFolder.getFullName().equalsIgnoreCase(newName) == false) {
+// dispatcher.execute(new RenameFolder(iFolder, newName), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
+// public void callback(GenericResult result) {
+// folder.setFullName(newName);
+// }
+// public void callbackError(Throwable caught) {
+// record.cancelEdit();
+// }
+// });
+// }
+// }
+// }
+//
+// });
record.setUserObject(iFolder);
<<<<<<< HEAD
@@ -736,6 +735,7 @@ System.out.println("1111111"+response);
}
display.setLoadingMessage(true);
+<<<<<<< HEAD
dispatcher.execute(new GetMessageDetails(event.getFolder(), message.getUid()), new HupaEvoCallback<GetMessageDetailsResult>(dispatcher, eventBus, display) {
public void callback(GetMessageDetailsResult result) {
if (decreaseUnseen) {
@@ -757,6 +757,19 @@ System.out.println("1111111"+response);
>>>>>>> 1. improve the inbox folder place.
}
});
+=======
+// dispatcher.execute(new GetMessageDetails(event.getFolder(), message.getUid()), new HupaEvoCallback<GetMessageDetailsResult>(dispatcher, eventBus, display) {
+// public void callback(GetMessageDetailsResult result) {
+// if (decreaseUnseen) {
+// eventBus.fireEvent(new DecreaseUnseenEvent(user, folder));
+// }
+// display.setLoadingMessage(false);
+//// showMessage(user, folder, message, result.getMessageDetails());
+//
+// placeController.goTo(messagePlaceProvider.get().with(user,folder, message,result.getMessageDetails()));
+// }
+// });
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
});
@@ -905,17 +918,17 @@ System.out.println("1111111"+response);
display.getDeleteConfirmClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- dispatcher.execute(new DeleteFolder(folder), new AsyncCallback<GenericResult>() {
-
- public void onFailure(Throwable caught) {
- GWT.log("ERROR while deleting", caught);
- }
-
- public void onSuccess(GenericResult result) {
- display.deleteSelectedFolder();
- }
-
- });
+// dispatcher.execute(new DeleteFolder(folder), new AsyncCallback<GenericResult>() {
+//
+// public void onFailure(Throwable caught) {
+// GWT.log("ERROR while deleting", caught);
+// }
+//
+// public void onSuccess(GenericResult result) {
+// display.deleteSelectedFolder();
+// }
+//
+// });
}
});
@@ -927,20 +940,20 @@ System.out.println("1111111"+response);
public void onEditEvent(EditEvent event) {
final IMAPTreeItem item = (IMAPTreeItem) event.getSource();
final String newValue = (String) event.getNewValue();
- if (event.getEventType().equals(EditEvent.EventType.Stop)) {
- dispatcher.execute(new CreateFolder(new ImapFolderImpl(newValue.trim())), new AsyncCallback<GenericResult>() {
-
- public void onFailure(Throwable caught) {
- GWT.log("Error while create folder", caught);
- item.cancelEdit();
- }
-
- public void onSuccess(GenericResult result) {
- // Nothing todo
- }
-
- });
- }
+// if (event.getEventType().equals(EditEvent.EventType.Stop)) {
+// dispatcher.execute(new CreateFolder(new ImapFolderImpl(newValue.trim())), new AsyncCallback<GenericResult>() {
+//
+// public void onFailure(Throwable caught) {
+// GWT.log("Error while create folder", caught);
+// item.cancelEdit();
+// }
+//
+// public void onSuccess(GenericResult result) {
+// // Nothing todo
+// }
+//
+// });
+// }
}
});
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java Thu Sep 12 03:00:47 2013
@@ -2,6 +2,8 @@ package org.apache.hupa.client.evo;
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.place.MailFolderPlace;
+import org.apache.hupa.client.rf.HupaRequestFactory;
+import org.apache.hupa.client.rf.CheckSessionRequest;
import org.apache.hupa.client.ui.AppLayout;
import com.google.gwt.event.shared.EventBus;
@@ -11,40 +13,18 @@ import com.google.gwt.place.shared.Place
import com.google.gwt.place.shared.PlaceHistoryHandler;
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.inject.Inject;
+import com.google.web.bindery.requestfactory.shared.Receiver;
-/**
- * This is the main controller of the application.
- */
public class AppController {
- private final PlaceController placeController;
- private final PlaceHistoryHandler placeHistoryHandler;
- private final AppLayout appPanelView;
+ @Inject private PlaceHistoryHandler placeHistoryHandler;
+ @Inject private AppLayout appPanelView;
+ @Inject private PlaceController placeController;
+ @Inject private HupaRequestFactory requestFactory;
private Place currentPlace;
- /**
- * All parameters are injected by GIN
- *
- * @param placeController
- * the application's PlaceController
- * @param eventBus
- * the application's EventBus
- * @param placeHistoryHandler
- * the application's PlaceHistoryHandler
- * @param appLayout
- * this is the application's main panel
- * @param mainMenuView
- * this is the application's navigation top bar
- * @param activityManagerInitializer
- * unused parameter, it's here just to force GIN's initialization
- * of ActivityManagers
- */
@Inject
- public AppController(PlaceController placeController, EventBus eventBus, PlaceHistoryHandler placeHistoryHandler,
- AppLayout appLayout, ActivityManagerInitializer activityManagerInitializer) {
- this.placeController = placeController;
- this.placeHistoryHandler = placeHistoryHandler;
- this.appPanelView = appLayout;
+ public AppController(EventBus eventBus, ActivityManagerInitializer initializeActivityManagerByGin) {
eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceLayoutHandler());
}
@@ -56,6 +36,13 @@ public class AppController {
private final class PlaceLayoutHandler implements PlaceChangeEvent.Handler {
@Override
public void onPlaceChange(PlaceChangeEvent event) {
+ if (placeChange(event)) {
+ checkSession();
+ }
+ refreshActivities(event);
+ }
+
+ private void refreshActivities(PlaceChangeEvent event) {
Place newPlace = event.getNewPlace();
if (newPlace != currentPlace) {
if (isAuth(newPlace, currentPlace)) {
@@ -66,8 +53,24 @@ public class AppController {
currentPlace = newPlace;
}
}
-
- public boolean isAuth(Place newPlace, Place currentPlace){
+
+ private void checkSession() {
+ CheckSessionRequest checkSession = requestFactory.sessionRequest();
+ checkSession.isValid().fire(new Receiver<Boolean>() {
+ @Override
+ public void onSuccess(Boolean sessionValid) {
+ if (!sessionValid) {
+ AppController.this.placeController.goTo(new DefaultPlace());
+ }
+ }
+ });
+ }
+
+ private boolean placeChange(PlaceChangeEvent event) {
+ return currentPlace != null && !(currentPlace instanceof DefaultPlace) && event.getNewPlace() != currentPlace;
+ }
+
+ private boolean isAuth(Place newPlace, Place currentPlace) {
return (newPlace instanceof MailFolderPlace) && !(currentPlace instanceof MailFolderPlace);
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java Thu Sep 12 03:00:47 2013
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.activity.ComposeActivity;
import org.apache.hupa.client.activity.ComposeToolBarActivity;
@@ -125,6 +126,8 @@ import org.apache.hupa.client.AppControl
=======
>>>>>>> Make the evo more clear.
import org.apache.hupa.client.CachingDispatchAsync;
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.client.activity.IMAPMessageActivity;
import org.apache.hupa.client.activity.IMAPMessageListActivity;
import org.apache.hupa.client.activity.LoginActivity;
@@ -150,6 +153,7 @@ import org.apache.hupa.client.mapper.Cac
import org.apache.hupa.client.mapper.MainContentActivityMapper;
>>>>>>> Make the evo more clear.
import org.apache.hupa.client.place.DefaultPlace;
+import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.ui.AppLayout;
import org.apache.hupa.client.ui.AppLayoutImpl;
import org.apache.hupa.client.ui.IMAPMessageListView;
@@ -164,6 +168,7 @@ import org.apache.hupa.client.ui.TopView
import org.apache.hupa.client.ui.WestView;
import com.google.gwt.activity.shared.ActivityManager;
+<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
import org.apache.hupa.client.ui.LoginView;
@@ -172,6 +177,9 @@ import org.apache.hupa.client.ui.WestVie
import com.google.gwt.activity.shared.ActivityManager;
>>>>>>> Change to new mvp framework - first step
+=======
+import com.google.gwt.core.client.GWT;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.SimpleEventBus;
import com.google.gwt.inject.client.AbstractGinModule;
@@ -374,6 +382,7 @@ public class AppGinModule extends Abstra
bind(MessageSendActivity.Displayable.class).to(MessageSendView.class);
bind(IMAPMessageActivity.Displayable.class).to(IMAPMessageView.class);
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
bind(TopActivity.Displayable.class).to(TopView.class);
@@ -385,6 +394,9 @@ public class AppGinModule extends Abstra
>>>>>>> 1. improve the inbox folder place.
+=======
+
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
bind(PagingScrollTableRowDragController.class).in(Singleton.class);
// Places
@@ -395,13 +407,18 @@ public class AppGinModule extends Abstra
// Application Controller
bind(AppController.class).in(Singleton.class);
+<<<<<<< HEAD
bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
}
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
+ // bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
+ }
<<<<<<< HEAD
=======
@@ -417,11 +434,10 @@ public class AppGinModule extends Abstra
@Provides
@Singleton
@Named("TopRegion")
- public ActivityManager getTopRegionActivityMapper(CachingTopActivityMapper activityMapper,
- EventBus eventBus) {
+ public ActivityManager getTopRegionActivityMapper(CachingTopActivityMapper activityMapper, EventBus eventBus) {
return new ActivityManager(activityMapper, eventBus);
}
-
+
@Provides
@Singleton
<<<<<<< HEAD
@@ -432,6 +448,7 @@ public class AppGinModule extends Abstra
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ActivityManager getVerticalMasterRegionActivityMapper(WestActivityMapper activityMapper,
>>>>>>> Change to new mvp framework - first step
=======
@@ -456,6 +473,9 @@ public class AppGinModule extends Abstra
public ActivityManager getWestRegionActivityMapper(CachingWestActivityMapper activityMapper,
>>>>>>> At first make the inbox work, but only when click the refresh button. The page also be working, the other folder will be like the same.
EventBus eventBus) {
+=======
+ public ActivityManager getWestRegionActivityMapper(CachingWestActivityMapper activityMapper, EventBus eventBus) {
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
return new ActivityManager(activityMapper, eventBus);
}
@@ -494,6 +514,7 @@ public class AppGinModule extends Abstra
>>>>>>> Change to new mvp framework - first step
=======
public ActivityManager getMainContentRegionActivityMapper(MainContentActivityMapper activityMapper,
+<<<<<<< HEAD
>>>>>>> introduce the top activity
EventBus eventBus) {
return new ActivityManager(activityMapper, eventBus);
@@ -516,6 +537,18 @@ public class AppGinModule extends Abstra
return new CachingDispatchAsync(exceptionHandler);
>>>>>>> Change to new mvp framework - first step
}
+=======
+ EventBus eventBus) {
+ return new ActivityManager(activityMapper, eventBus);
+ }
+
+ // @Provides
+ // @Singleton
+ // protected DispatchAsync provideDispatchAsync(ExceptionHandler
+ // exceptionHandler) {
+ // return new CachingDispatchAsync(exceptionHandler);
+ // }
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
@Provides
@Singleton
@@ -526,7 +559,7 @@ public class AppGinModule extends Abstra
@Provides
@Singleton
public PlaceHistoryHandler getHistoryHandler(PlaceController placeController, PlaceHistoryMapper historyMapper,
- EventBus eventBus) {
+ EventBus eventBus) {
PlaceHistoryHandler historyHandler = new PlaceHistoryHandler(historyMapper);
<<<<<<< HEAD
<<<<<<< HEAD
@@ -550,7 +583,18 @@ public class AppGinModule extends Abstra
}
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> Change to new mvp framework - first step
+=======
+ @Provides
+ @Singleton
+ HupaRequestFactory getRequestFactory(EventBus eventBus) {
+ HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
+ rf.initialize(eventBus);
+ return rf;
+ }
+
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java Thu Sep 12 03:00:47 2013
@@ -27,7 +27,7 @@ import net.customware.gwt.presenter.clie
import org.apache.hupa.client.HupaCallback;
import org.apache.hupa.client.HupaConstants;
-import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.FlashEventHandler;
import org.apache.hupa.shared.events.LoginEvent;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -34,6 +34,7 @@ import org.apache.hupa.shared.data.Messa
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
=======
@@ -47,6 +48,10 @@ import org.apache.hupa.shared.data.User;
=======
import org.apache.hupa.shared.domain.ImapFolder;
>>>>>>> Allow client can use the domain entity interface.
+=======
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.FolderSelectionEvent;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -33,8 +33,8 @@ import org.apache.hupa.shared.data.ImapF
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -53,6 +53,7 @@ import org.apache.hupa.shared.data.Messa
<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.MessageDetails;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
=======
@@ -68,6 +69,10 @@ import org.apache.hupa.shared.data.User;
=======
import org.apache.hupa.shared.domain.ImapFolder;
>>>>>>> Allow client can use the domain entity interface.
+=======
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.BackEventHandler;
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -37,6 +37,7 @@ import org.apache.hupa.shared.data.Messa
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
=======
@@ -50,6 +51,10 @@ import org.apache.hupa.shared.data.User;
=======
import org.apache.hupa.shared.domain.ImapFolder;
>>>>>>> Allow client can use the domain entity interface.
+=======
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -69,8 +69,8 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.SMTPMessage;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.ContactsUpdatedEvent;
import org.apache.hupa.shared.events.ContactsUpdatedEventHandler;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -27,8 +27,8 @@ import net.customware.gwt.presenter.clie
import org.apache.hupa.client.HupaCallback;
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.Message;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FolderSelectionEvent;
import org.apache.hupa.shared.events.FolderSelectionEventHandler;
import org.apache.hupa.shared.events.LoadMessagesEvent;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java Thu Sep 12 03:00:47 2013
@@ -22,6 +22,7 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
import org.apache.hupa.shared.proxy.ImapFolder;
@@ -29,6 +30,10 @@ import org.apache.hupa.shared.proxy.Imap
=======
import org.apache.hupa.shared.domain.ImapFolder;
>>>>>>> Allow client can use the domain entity interface.
+=======
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
=======
>>>>>>>
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java Thu Sep 12 03:00:47 2013
@@ -1,7 +1,7 @@
package org.apache.hupa.client.place;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java Thu Sep 12 03:00:47 2013
@@ -40,6 +40,7 @@ import org.apache.hupa.client.activity.M
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -62,6 +63,10 @@ import org.apache.hupa.shared.proxy.Imap
=======
import org.apache.hupa.shared.domain.ImapFolder;
>>>>>>> Allow client can use the domain entity interface.
+=======
+import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
>>>>>>> 1. improve the inbox folder place.
import com.google.gwt.place.shared.Place;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CheckSessionRequest.java Thu Sep 12 03:00:47 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
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=1522159&r1=1522158&r2=1522159&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 03:00:47 2013
@@ -23,6 +23,7 @@ import com.google.web.bindery.requestfac
public interface HupaRequestFactory extends RequestFactory {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
SubjectRequest subjectRequest();
ImapFolderRequest folderRequest();
@@ -80,4 +81,10 @@ public interface HupaRequestFactory exte
=======
ImapFolderRequestContext folderRequest();
>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
+=======
+ SubjectRequest subjectRequest();
+ ImapFolderRequest folderRequest();
+ CheckSessionRequest sessionRequest();
+ LoginUserRequest loginRequest();
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
}
\ No newline at end of file
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java Thu Sep 12 03:00:47 2013
@@ -1,29 +1,31 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
package org.apache.hupa.client.rf;
import java.util.List;
+<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequestContext.java
+<<<<<<< HEAD
+<<<<<<< HEAD:client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java
+import org.apache.hupa.server.service.IMAPFolderService;
+<<<<<<< HEAD
+<<<<<<< HEAD
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
+=======
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.server.service.ImapFolderService;
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequestContext.java
+=======
+import org.apache.hupa.server.locator.ImapFolderServiceLocator;
+=======
import org.apache.hupa.server.ioc.IocRfServiceLocator;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.:client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java
import org.apache.hupa.server.service.ImapFolderService;
import org.apache.hupa.shared.domain.ImapFolder;
+>>>>>>> Allow client can use the domain entity interface.
import com.google.web.bindery.requestfactory.shared.Request;
import com.google.web.bindery.requestfactory.shared.RequestContext;
Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java~HEAD (from r1522158, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java)
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java&r1=1522158&r2=1522159&rev=1522159&view=diff
==============================================================================
(empty)
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/LoginUserRequest.java Thu Sep 12 03:00:47 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java Thu Sep 12 03:00:47 2013
@@ -38,8 +38,8 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.ImapFolderImpl;
>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.data.Message;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FolderSelectionEvent;
import org.apache.hupa.shared.events.FolderSelectionEventHandler;
import org.apache.hupa.shared.events.LoadMessagesEvent;
@@ -80,7 +80,7 @@ import com.google.inject.Inject;
public class MessageTableModel extends MutableTableModel<Message> {
private EventBus eventBus;
- private DispatchAsync dispatcher;
+// private DispatchAsync dispatcher;
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -98,10 +98,10 @@ public class MessageTableModel extends M
private String searchValue;
@Inject
- public MessageTableModel(EventBus eventBus, DispatchAsync dispatcher){
+ public MessageTableModel(EventBus eventBus){
this.eventBus = eventBus;
- this.dispatcher = dispatcher;
+// this.dispatcher = dispatcher;
// bind some Events
eventBus.addHandler(LoadMessagesEvent.TYPE, new LoadMessagesEventHandler() {
@@ -165,28 +165,28 @@ public class MessageTableModel extends M
});
}
- dispatcher.execute(new FetchMessages(folder, request.getStartRow(), request.getNumRows(), searchValue),new HupaEvoCallback<FetchMessagesResult>(dispatcher, eventBus) {
- public void callback(final FetchMessagesResult result) {
- // Update folder information before notifying presenter
- folder.setMessageCount(result.getRealCount());
- folder.setUnseenMessageCount(result.getRealUnreadCount());
-
- setRowCount(result.getRealCount());
- callback.onRowsReady(request, new TableModelHelper.Response<Message>() {
- @Override
- public Iterator<Message> getRowValues() {
- if (result != null && result.getMessages() != null) {
- return result.getMessages().iterator();
- } else {
- return new ArrayList<Message>().iterator();
- }
- }
- });
-
- // Notify presenter to update folder tree view
- eventBus.fireEvent(new MessagesReceivedEvent(folder, result.getMessages()));
- }
- });
+// dispatcher.execute(new FetchMessages(folder, request.getStartRow(), request.getNumRows(), searchValue),new HupaEvoCallback<FetchMessagesResult>(dispatcher, eventBus) {
+// public void callback(final FetchMessagesResult result) {
+// // Update folder information before notifying presenter
+// folder.setMessageCount(result.getRealCount());
+// folder.setUnseenMessageCount(result.getRealUnreadCount());
+//
+// setRowCount(result.getRealCount());
+// callback.onRowsReady(request, new TableModelHelper.Response<Message>() {
+// @Override
+// public Iterator<Message> getRowValues() {
+// if (result != null && result.getMessages() != null) {
+// return result.getMessages().iterator();
+// } else {
+// return new ArrayList<Message>().iterator();
+// }
+// }
+// });
+//
+// // Notify presenter to update folder tree view
+// eventBus.fireEvent(new MessagesReceivedEvent(folder, result.getMessages()));
+// }
+// });
}
@Override
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java Thu Sep 12 03:00:47 2013
@@ -95,8 +95,8 @@ import org.apache.hupa.client.widgets.IM
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.domain.ImapFolder;
+import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java Thu Sep 12 03:00:47 2013
@@ -32,8 +32,8 @@ import com.google.inject.AbstractModule;
>>>>>>> first commit
import net.customware.gwt.dispatch.server.guice.ActionHandlerModule;
-import org.apache.hupa.shared.data.Settings;
-import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.data.SettingsImpl;
+import org.apache.hupa.shared.data.UserImpl;
<<<<<<< HEAD
>>>>>>> first commit
@@ -98,7 +98,7 @@ public abstract class AbstractGuiceTestM
>>>>>>> first commit
public abstract class AbstractGuiceTestModule extends ActionHandlerModule {
- protected static class TestUser extends User {
+ protected static class TestUser extends UserImpl {
private static final long serialVersionUID = 1L;
<<<<<<< HEAD
>>>>>>> first commit
@@ -115,6 +115,7 @@ public abstract class AbstractGuiceTestM
setPassword(password);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
setSettings(new SettingsImpl() {
=======
setSettings(new Settings() {
@@ -124,6 +125,9 @@ public abstract class AbstractGuiceTestM
setSettings(new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ setSettings(new SettingsImpl() {
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setInboxFolderName(inbox);
setSentFolderName(sent);
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java Thu Sep 12 03:00:47 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.server.mock;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.Properties;
import org.apache.hupa.shared.data.SettingsImpl;
@@ -33,12 +34,19 @@ import org.apache.hupa.shared.domain.Use
import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
+=======
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import java.util.Properties;
<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> first commit
+import org.apache.hupa.shared.data.SettingsImpl;
+import org.apache.hupa.shared.data.UserImpl;
+import org.apache.hupa.shared.domain.Settings;
+import org.apache.hupa.shared.domain.User;
+
/**
* Constants and properties used for mock mode
*/
@@ -61,6 +69,7 @@ public class MockConstants {
public static String SESSION_ID = "MockID";
>>>>>>> constantly changed by manolo
+<<<<<<< HEAD
public final static Settings mockSettings = new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
@@ -69,6 +78,9 @@ public class MockConstants {
public final static Settings mockSettings = new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ public final static Settings mockSettings = new SettingsImpl() {
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
@@ -113,6 +125,7 @@ public class MockConstants {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public final static Settings mockUserSettings = new SettingsImpl() {
=======
public final static Settings mockUserSettings = new Settings() {
@@ -122,6 +135,9 @@ public class MockConstants {
public final static Settings mockUserSettings = new Settings() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ public final static Settings mockUserSettings = new SettingsImpl() {
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
@@ -132,6 +148,7 @@ public class MockConstants {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public final static User mockUser = new UserImpl() {
=======
public final static User mockUser = new User() {
@@ -141,6 +158,9 @@ public class MockConstants {
public final static User mockUser = new User() {
private static final long serialVersionUID = 1L;
>>>>>>> first commit
+=======
+ public final static User mockUser = new UserImpl() {
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setName(MockIMAPStore.MOCK_LOGIN);
setPassword(MockIMAPStore.MOCK_LOGIN);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java?rev=1522159&r1=1522158&r2=1522159&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/IMAPStoreCache.java Thu Sep 12 03:00:47 2013
@@ -26,6 +26,7 @@ import javax.mail.Transport;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
=======
import org.apache.hupa.shared.data.User;
@@ -33,6 +34,9 @@ import org.apache.hupa.shared.data.User;
=======
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.domain.User;
+>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import com.sun.mail.imap.IMAPStore;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org