fixed issue#82, make display message first and then mark etc.
git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522427 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java b/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
index 157286e..ab49d6f 100644
--- a/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
+++ b/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
@@ -39,6 +39,7 @@
import org.apache.hupa.client.rf.MoveMessageRequest;
import org.apache.hupa.client.ui.MessagesCellTable;
import org.apache.hupa.client.ui.ToolBarView;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
import org.apache.hupa.shared.domain.DeleteMessageResult;
import org.apache.hupa.shared.domain.GenericResult;
@@ -289,6 +290,8 @@
=======
>>>>>>> replace with IsWidget
import org.apache.hupa.shared.data.ImapFolderImpl;
+=======
+>>>>>>> fixed issue#82, make display message first and then mark etc.
import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
import org.apache.hupa.shared.domain.DeleteMessageResult;
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
@@ -298,7 +301,6 @@
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.DeleteClickEvent;
import org.apache.hupa.shared.events.DeleteClickEventHandler;
-import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.RefreshMessagesEvent;
import org.apache.hupa.shared.events.RefreshMessagesEventHandler;
import org.apache.hupa.shared.events.RefreshUnreadEvent;
@@ -341,16 +343,14 @@
req.get(action).fire(new Receiver<GetMessageDetailsResult>() {
@Override
public void onSuccess(GetMessageDetailsResult response) {
- eventBus.fireEvent(new ExpandMessageEvent(user, new ImapFolderImpl(folderName), event
- .getValue(), response.getMessageDetails()));
+ MessagePlace place = new MessagePlace(folderName + AbstractPlace.SPLITTER
+ + event.getValue().getUid());
+ pc.goTo(place);
display.getGrid().getSelectionModel().setSelected(event.getValue(), true);
toolBar.enableAllTools(true);
ToolBarView.Parameters p = new ToolBarView.Parameters(user, folderName, event.getValue(),
response.getMessageDetails());
toolBar.setParameters(p);
- MessagePlace place = new MessagePlace(folderName + AbstractPlace.SPLITTER
- + event.getValue().getUid());
- pc.goTo(place);
display.refresh();
hc.hideTopLoading();
eventBus.fireEvent(new RefreshUnreadEvent());
