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:52:47 UTC
svn commit: r1522152 [1/2] - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/activity/
client/src/main/java/org/apache/hupa/client/mvp/
client/src/main/java/org/apache/hupa/client/place/
client/src/main/java/org/apache/hupa/client/rf/...
Author: dongxu
Date: Thu Sep 12 02:52:46 2013
New Revision: 1522152
URL: http://svn.apache.org/r1522152
Log:
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.
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/MessageSendActivity.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/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/IMAPFolderRequestContext.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/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.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/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/SetFlagsHandler.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/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/MessagesReceivedEvent.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/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
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -10,6 +10,7 @@ import org.apache.hupa.client.evo.HupaEv
import org.apache.hupa.client.place.IMAPMessagePlace;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.shared.SConsts;
+<<<<<<< HEAD
=======
import org.apache.hupa.client.HupaEvoCallback;
import org.apache.hupa.client.mvp.WidgetDisplayable;
@@ -21,6 +22,8 @@ import org.apache.hupa.client.ui.WidgetD
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 1. improve the inbox folder place.
+=======
+>>>>>>> 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.shared.data.Message;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
@@ -30,9 +33,13 @@ import org.apache.hupa.shared.events.For
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.ReplyMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> 1. improve the inbox folder place.
+=======
+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.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -139,10 +146,14 @@ public class IMAPMessageActivity extend
private Message message;
private CachingDispatchAsync dispatcher;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> 1. improve the inbox folder place.
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private User user;
private final Displayable display;
private final EventBus eventBus;
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -442,7 +442,6 @@ import org.apache.hupa.client.place.Mail
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.IMAPFolder;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.User;
@@ -458,6 +457,7 @@ import org.apache.hupa.shared.events.Mes
import org.apache.hupa.shared.events.MessagesReceivedEventHandler;
import org.apache.hupa.shared.events.MoveMessageEvent;
import org.apache.hupa.shared.events.MoveMessageEventHandler;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteAllMessages;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -508,10 +508,14 @@ public class IMAPMessageListActivity ext
private String searchValue;
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> Change to new mvp framework - first step
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private ShowMessageTableListener tableListener = new ShowMessageTableListener();
@@ -1037,10 +1041,14 @@ public class IMAPMessageListActivity ext
}
}
<<<<<<< HEAD
+<<<<<<< HEAD
public void revealDisplay(User user, IMAPFolderProxy folder, String searchValue) {
=======
public void revealDisplay(User user, IMAPFolder folder, String searchValue) {
>>>>>>> Change to new mvp framework - first step
+=======
+ public void revealDisplay(User user, IMAPFolderProxy folder, String searchValue) {
+>>>>>>> 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.
this.user = user;
if (this.user == null
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -66,7 +66,6 @@ import net.customware.gwt.dispatch.clien
import net.customware.gwt.dispatch.shared.Action;
import org.apache.hupa.client.evo.HupaEvoCallback;
-import org.apache.hupa.client.mvp.MessageSendPresenter.Type;
import org.apache.hupa.client.place.MessageSendPlace;
<<<<<<< HEAD
>>>>>>> 1. improve the inbox folder place.
@@ -95,6 +94,7 @@ import org.apache.hupa.shared.events.Loa
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
<<<<<<< HEAD
@@ -102,6 +102,9 @@ import org.apache.hupa.widgets.ui.HasEna
=======
=======
+=======
+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.shared.rpc.ContactsResult.Contact;
>>>>>>> 1. improve the inbox folder place.
import org.apache.hupa.shared.rpc.ForwardMessage;
@@ -147,10 +150,14 @@ public class MessageSendActivity extends
private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
private Type type = Type.NEW;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> 1. improve the inbox folder place.
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private Message oldmessage;
protected SMTPMessage message = null;
@@ -594,10 +601,14 @@ public class MessageSendActivity extends
}
<<<<<<< HEAD
+<<<<<<< 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) {
>>>>>>> 1. improve the inbox folder place.
+=======
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
+>>>>>>> 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.
this.reset();
this.oldmessage = oldmessage;
this.oldDetails = oldDetails;
@@ -648,10 +659,14 @@ public class MessageSendActivity extends
}
<<<<<<< HEAD
+<<<<<<< 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) {
>>>>>>> 1. improve the inbox folder place.
+=======
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, Type type) {
+>>>>>>> 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.
this.revealDisplay(user, folder, oldmessage, oldDetails, null, type);
}
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -311,7 +311,6 @@ 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.IMAPFolderProxy;
import org.apache.hupa.client.rf.IMAPFolderRequestContext;
import org.apache.hupa.client.ui.WidgetContainerDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
@@ -345,6 +344,7 @@ 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;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -441,7 +441,7 @@ public class WestActivity extends Abstra
private DispatchAsync dispatcher;
private User user;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private IMAPTreeItem tItem;
private HasEditable editableTreeItem;
private String searchValue;
@@ -541,11 +541,15 @@ public class WestActivity extends Abstra
@Override
public void onSuccess(List<IMAPFolderProxy> response) {
<<<<<<< HEAD
+<<<<<<< HEAD
display.bindTreeItems(createTreeNodes(response));
=======
System.out.println("1111111"+response);
display.bindTreeItems(null);
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
+=======
+ display.bindTreeItems(createTreeNodes(response));
+>>>>>>> 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.
// // disable
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -590,6 +594,7 @@ System.out.println("1111111"+response);
* @return
*/
<<<<<<< HEAD
+<<<<<<< HEAD
private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
@@ -600,6 +605,12 @@ System.out.println("1111111"+response);
for (IMAPFolder iFolder : list) {
>>>>>>> Change to new mvp framework - first step
+=======
+ private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
+ List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
+
+ for (IMAPFolderProxy iFolder : list) {
+>>>>>>> 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.
final IMAPTreeItem record = new IMAPTreeItem(iFolder);
record.addEditHandler(new EditHandler() {
@@ -625,10 +636,14 @@ System.out.println("1111111"+response);
record.setUserObject(iFolder);
<<<<<<< HEAD
+<<<<<<< HEAD
List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
=======
List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
>>>>>>> Change to new mvp framework - first step
+=======
+ List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
+>>>>>>> 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.
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
@@ -785,10 +800,14 @@ System.out.println("1111111"+response);
if (tItem.isEdit())
return;
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (IMAPFolderProxy) tItem.getUserObject();
=======
folder = (IMAPFolder) tItem.getUserObject();
>>>>>>>
+=======
+ folder = (IMAPFolderProxy) tItem.getUserObject();
+>>>>>>> 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.
eventBus.fireEvent(new LoadMessagesEvent(user, folder));
}
@@ -800,10 +819,14 @@ System.out.println("1111111"+response);
if (tItem.isEdit())
return;
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (IMAPFolderProxy) tItem.getUserObject();
=======
folder = (IMAPFolder) tItem.getUserObject();
>>>>>>>
+=======
+ folder = (IMAPFolderProxy) tItem.getUserObject();
+>>>>>>> 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.
if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) {
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -877,10 +900,14 @@ System.out.println("1111111"+response);
public void onMessagesReceived(MessagesReceivedEvent event) {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy f = event.getFolder();
=======
IMAPFolder f = event.getFolder();
>>>>>>>
+=======
+ IMAPFolderProxy f = event.getFolder();
+>>>>>>> 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.
display.updateTreeItem(f);
}
@@ -890,11 +917,15 @@ System.out.println("1111111"+response);
public void onLogin(LoginEvent event) {
user = event.getUser();
<<<<<<< HEAD
+<<<<<<< HEAD
// folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
// showMessageTable(user, folder, searchValue);
=======
folder = new IMAPFolder(user.getSettings().getInboxFolderName());;
+=======
+// folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
+>>>>>>> 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.
searchValue = null;
<<<<<<< HEAD
showMessageTable(user, folder, searchValue);
@@ -987,7 +1018,7 @@ System.out.println("1111111"+response);
return false;
};
}-*/;
- private void showMessageTable(User user, IMAPFolder folder, String searchValue) {
+ private void showMessageTable(User user, IMAPFolderProxy folder, String searchValue) {
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
@@ -1036,16 +1067,21 @@ System.out.println("1111111"+response);
public HasEnable getNewEnable();
<<<<<<< HEAD
+<<<<<<< HEAD
public void updateTreeItem(IMAPFolderProxy folder);
=======
public void updateTreeItem(IMAPFolder folder);
>>>>>>> Change to new mvp framework - first step
+=======
+ public void updateTreeItem(IMAPFolderProxy folder);
+>>>>>>> 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.
public void deleteSelectedFolder();
public HasEditable createFolder(EditHandler handler);
<<<<<<< HEAD
+<<<<<<< HEAD
public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
@@ -1054,6 +1090,11 @@ System.out.println("1111111"+response);
public void decreaseUnseenMessageCount(IMAPFolder folder, int amount);
>>>>>>> Change to new mvp framework - first step
+=======
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
+
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
+>>>>>>> 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.
public void setLoadingFolders(boolean loading);
public void setLoadingMessage(boolean loading);
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -32,12 +32,17 @@ import org.apache.hupa.client.widgets.Ha
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
<<<<<<< HEAD
+<<<<<<< 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.data.Message.IMAPFlag;
+import org.apache.hupa.shared.data.User;
+>>>>>>> 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.shared.events.DecreaseUnseenEvent;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.FolderSelectionEvent;
@@ -52,9 +57,13 @@ import org.apache.hupa.shared.events.Mov
import org.apache.hupa.shared.events.MoveMessageEventHandler;
import org.apache.hupa.shared.events.NewMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.shared.rpc.DeleteAllMessages;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -129,10 +138,14 @@ public class IMAPMessageListPresenter ex
private String searchValue;
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private DispatchAsync dispatcher;
private ShowMessageTableListener tableListener = new ShowMessageTableListener();
@@ -425,6 +438,7 @@ public class IMAPMessageListPresenter ex
}
public void revealDisplay(User user, IMAPFolderProxy folder, String searchValue) {
+<<<<<<< HEAD
this.user = user;
if (this.user == null
@@ -443,6 +457,8 @@ public class IMAPMessageListPresenter ex
}
public void revealDisplay(User user, IMAPFolder folder, String searchValue) {
+=======
+>>>>>>> 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.
this.user = user;
<<<<<<< HEAD
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -39,9 +39,13 @@ import org.apache.hupa.shared.events.For
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.ReplyMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -72,10 +76,14 @@ public class IMAPMessagePresenter extend
private Message message;
private CachingDispatchAsync dispatcher;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private User user;
@Inject
@@ -86,10 +94,14 @@ public class IMAPMessagePresenter extend
<<<<<<< HEAD
+<<<<<<< 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
+=======
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails) {
+>>>>>>> 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.
this.message = message;
this.messageDetails = messageDetails;
this.folder = folder;
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -89,9 +89,13 @@ import org.apache.hupa.shared.events.Rep
import org.apache.hupa.shared.events.SentMessageEvent;
import org.apache.hupa.shared.events.SentMessageEventHandler;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.FetchFolders;
@@ -145,16 +149,21 @@ public class MainPresenter extends Widge
public HasEnable getNewEnable();
<<<<<<< HEAD
+<<<<<<< HEAD
public void updateTreeItem(IMAPFolderProxy folder);
=======
public void updateTreeItem(IMAPFolder folder);
>>>>>>> first commit
+=======
+ public void updateTreeItem(IMAPFolderProxy folder);
+>>>>>>> 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.
public void deleteSelectedFolder();
public HasEditable createFolder(EditHandler handler);
<<<<<<< HEAD
+<<<<<<< HEAD
public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
@@ -163,6 +172,11 @@ public class MainPresenter extends Widge
public void decreaseUnseenMessageCount(IMAPFolder folder, int amount);
>>>>>>> first commit
+=======
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
+
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
+>>>>>>> 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.
public void setLoadingFolders(boolean loading);
public void setLoadingMessage(boolean loading);
@@ -180,8 +194,12 @@ public class MainPresenter extends Widge
private DispatchAsync dispatcher;
>>>>>>> constantly changed by manolo
private User user;
+<<<<<<< HEAD
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private String searchValue;
private IMAPMessageListPresenter messageListPresenter;
private IMAPMessagePresenter messagePresenter;
@@ -243,6 +261,7 @@ public class MainPresenter extends Widge
* @return
*/
<<<<<<< HEAD
+<<<<<<< HEAD
private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
@@ -253,6 +272,12 @@ public class MainPresenter extends Widge
for (IMAPFolder iFolder : list) {
>>>>>>> first commit
+=======
+ private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
+ List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
+
+ for (IMAPFolderProxy iFolder : list) {
+>>>>>>> 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.
final IMAPTreeItem record = new IMAPTreeItem(iFolder);
record.addEditHandler(new EditHandler() {
@@ -286,10 +311,14 @@ public class MainPresenter extends Widge
record.setUserObject(iFolder);
<<<<<<< HEAD
+<<<<<<< HEAD
List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
=======
List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
>>>>>>> first commit
+=======
+ List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
+>>>>>>> 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.
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
@@ -316,10 +345,14 @@ public class MainPresenter extends Widge
}
<<<<<<< HEAD
+<<<<<<< HEAD
private void showMessageTable(User user, IMAPFolderProxy folder, String searchValue) {
=======
private void showMessageTable(User user, IMAPFolder folder, String searchValue) {
>>>>>>> first commit
+=======
+ private void showMessageTable(User user, IMAPFolderProxy folder, String searchValue) {
+>>>>>>> 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.
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
@@ -329,10 +362,14 @@ public class MainPresenter extends Widge
}
<<<<<<< HEAD
+<<<<<<< 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
+=======
+ private void showMessage(User user, IMAPFolderProxy folder, Message message, MessageDetails details) {
+>>>>>>> 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.
messagePresenter.revealDisplay(user, folder, message, details);
}
@@ -501,10 +538,14 @@ public class MainPresenter extends Widge
if (tItem.isEdit())
return;
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (IMAPFolderProxy) tItem.getUserObject();
=======
folder = (IMAPFolder) tItem.getUserObject();
>>>>>>> first commit
+=======
+ folder = (IMAPFolderProxy) tItem.getUserObject();
+>>>>>>> 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.
eventBus.fireEvent(new LoadMessagesEvent(user, folder));
}
@@ -517,10 +558,14 @@ public class MainPresenter extends Widge
if (tItem.isEdit())
return;
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (IMAPFolderProxy) tItem.getUserObject();
=======
folder = (IMAPFolder) tItem.getUserObject();
>>>>>>> first commit
+=======
+ folder = (IMAPFolderProxy) tItem.getUserObject();
+>>>>>>> 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.
if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) {
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -615,10 +660,14 @@ public class MainPresenter extends Widge
public void onMessagesReceived(MessagesReceivedEvent event) {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy f = event.getFolder();
=======
IMAPFolder f = event.getFolder();
>>>>>>> first commit
+=======
+ IMAPFolderProxy f = event.getFolder();
+>>>>>>> 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.
display.updateTreeItem(f);
}
@@ -630,6 +679,7 @@ public class MainPresenter extends Widge
user = event.getUser();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
showMessageTable(user, folder, searchValue);
@@ -639,6 +689,9 @@ public class MainPresenter extends Widge
>>>>>>> first commit
=======
folder = new IMAPFolder(user.getSettings().getInboxFolderName());;
+=======
+ folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
+>>>>>>> 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.
searchValue = null;
showMessageTable(user, folder, searchValue);
>>>>>>> constantly changed by manolo
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -52,9 +52,13 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MoveMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.widgets.event.EditEvent;
import org.apache.hupa.widgets.event.EditHandler;
import org.apache.hupa.widgets.ui.EnableHyperlink;
@@ -76,12 +80,15 @@ import com.google.gwt.user.client.ui.Hor
<<<<<<< HEAD
<<<<<<< HEAD
import com.google.gwt.user.client.ui.Panel;
+<<<<<<< HEAD
=======
=======
import com.google.gwt.user.client.ui.Panel;
>>>>>>> constantly changed by manolo
import com.google.gwt.user.client.ui.SimplePanel;
>>>>>>> first commit
+=======
+>>>>>>> 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 com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -531,10 +538,14 @@ public class MainView extends Composite
// Generate a new folder with a whitespace as name, this is needed as
// workaround
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy)new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
=======
IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = (IMAPFolderProxy)new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+>>>>>>> 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.
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
@@ -579,10 +590,14 @@ public class MainView extends Composite
* decreaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
=======
public void decreaseUnseenMessageCount(IMAPFolder folder, int amount) {
>>>>>>> first commit
+=======
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
+>>>>>>> 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.
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -601,10 +616,14 @@ public class MainView extends Composite
* increaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
=======
public void increaseUnseenMessageCount(IMAPFolder folder, int amount) {
>>>>>>> first commit
+=======
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
+>>>>>>> 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.
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -618,12 +637,17 @@ public class MainView extends Composite
<<<<<<< HEAD
+<<<<<<< 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
+=======
+ private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolderProxy folder) {
+ if (folder.getFullName().equalsIgnoreCase(((IMAPFolderProxy) item.getUserObject()).getFullName())) {
+>>>>>>> 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.
return item;
}
for (int i = 0; i < item.getChildCount(); i++) {
@@ -640,10 +664,14 @@ public class MainView extends Composite
* @see org.apache.hupa.client.mvp.MainPresenter.Display#updateTreeItem(org.apache.hupa.shared.data.IMAPFolder)
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void updateTreeItem(IMAPFolderProxy folder) {
=======
public void updateTreeItem(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ public void updateTreeItem(IMAPFolderProxy folder) {
+>>>>>>> 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.
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.mvp;
<<<<<<< HEAD
+<<<<<<< HEAD
import gwtupload.client.IUploadStatus.Status;
import gwtupload.client.IUploader;
=======
@@ -34,16 +35,26 @@ import com.google.inject.Inject;
import gwtupload.client.IUploader;
import gwtupload.client.IUploadStatus.Status;
>>>>>>> first commit
+=======
+import gwtupload.client.IUploadStatus.Status;
+import gwtupload.client.IUploader;
+>>>>>>> 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 gwtupload.client.IUploader.OnCancelUploaderHandler;
import gwtupload.client.IUploader.OnFinishUploaderHandler;
import gwtupload.client.IUploader.OnStatusChangedHandler;
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
=======
>>>>>>> first commit
+=======
+import java.util.ArrayList;
+import java.util.List;
+
+>>>>>>> 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 net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.dispatch.shared.Action;
import net.customware.gwt.presenter.client.EventBus;
@@ -69,15 +80,21 @@ import org.apache.hupa.shared.events.Loa
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
=======
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+import org.apache.hupa.shared.rpc.ContactsResult.Contact;
+>>>>>>> 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.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
+<<<<<<< HEAD
import org.apache.hupa.widgets.ui.HasEnable;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -94,6 +111,17 @@ import org.apache.hupa.widgets.ui.HasEna
import java.util.ArrayList;
import java.util.List;
>>>>>>> first commit
+=======
+import org.apache.hupa.widgets.ui.HasEnable;
+
+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;
+>>>>>>> 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.
/**
* Presenter which handles the sending, reply, replay-all, forward of mails
@@ -105,10 +133,14 @@ public class MessageSendPresenter extend
private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
private Type type = Type.NEW;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private Message oldmessage;
protected SMTPMessage message = null;
@@ -314,10 +346,14 @@ public class MessageSendPresenter extend
* the type
*/
<<<<<<< HEAD
+<<<<<<< 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
+=======
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
+>>>>>>> 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.
this.reset();
this.oldmessage = oldmessage;
this.oldDetails = oldDetails;
@@ -392,10 +428,14 @@ public class MessageSendPresenter extend
}
<<<<<<< HEAD
+<<<<<<< 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
+=======
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, Type type) {
+>>>>>>> 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.
this.revealDisplay(user, folder, oldmessage, oldDetails, null, type);
}
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -38,9 +38,13 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -59,10 +63,14 @@ public class MessageTableModel extends M
private DispatchAsync dispatcher;
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private String searchValue;
@Inject
@@ -93,10 +101,14 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
=======
folder = new IMAPFolder(user.getSettings().getInboxFolderName());
>>>>>>> first commit
+=======
+ folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
+>>>>>>> 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.
searchValue = null;
}
});
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -2,14 +2,20 @@ package org.apache.hupa.client.place;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import org.apache.hupa.client.activity.IMAPMessageActivity;
>>>>>>> 1. improve the inbox folder place.
+=======
+>>>>>>> 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.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 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.shared.proxy.IMAPFolderProxy;
=======
@@ -32,8 +38,12 @@ public class IMAPMessagePlace extends Pl
private Message message;
private MessageDetails messageDetails;
+<<<<<<< HEAD
private IMAPFolder folder;
>>>>>>> 1. improve the inbox folder place.
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private User user;
public Message getMessage() {
@@ -60,7 +70,7 @@ public class IMAPMessagePlace extends Pl
>>>>>>>
=======
- public IMAPFolder getFolder() {
+ public IMAPFolderProxy getFolder() {
return folder;
}
@@ -97,10 +107,14 @@ public class IMAPMessagePlace extends Pl
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPMessagePlace with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails){
=======
public IMAPMessagePlace with(User user, IMAPFolder folder, Message message, MessageDetails messageDetails){
>>>>>>> 1. improve the inbox folder place.
+=======
+ public IMAPMessagePlace with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails){
+>>>>>>> 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.
this.message = message;
this.messageDetails = messageDetails;
this.folder = folder;
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -1,7 +1,7 @@
package org.apache.hupa.client.place;
-import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
@@ -66,16 +66,16 @@ public class MailFolderPlace extends Pla
return place.getFolderName();
}
}
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private String searchValue;
- public IMAPFolder getFolder() {
+ public IMAPFolderProxy getFolder() {
return folder;
}
public String getSearchValue() {
return searchValue;
}
- public MailFolderPlace with(User user, IMAPFolder folder, String searchValue) {
+ public MailFolderPlace with(User user, IMAPFolderProxy folder, String searchValue) {
this.folder = folder;
this.searchValue = searchValue;
this.user = user;
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -42,6 +42,7 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 1. improve the inbox folder place.
@@ -50,6 +51,9 @@ package org.apache.hupa.client.place;
>>>>>>>
=======
+=======
+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.
>>>>>>> 1. improve the inbox folder place.
import com.google.gwt.place.shared.Place;
@@ -186,7 +190,7 @@ public class MessageSendPlace extends Pl
private User user ;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private Message message;
private MessageDetails messageDetails;
private Type forward;
@@ -210,7 +214,7 @@ public class MessageSendPlace extends Pl
return this.getClass().getName() + "->[MessageSend]";
}
- public Place with(User user, IMAPFolder folder, Message message, MessageDetails messageDetails, Type forward) {
+ public Place with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails, Type forward) {
this.forward = forward;
this.user = user;
this.folder = folder;
@@ -223,7 +227,7 @@ public class MessageSendPlace extends Pl
return user;
}
- public IMAPFolder getFolder() {
+ public IMAPFolderProxy getFolder() {
return folder;
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java Thu Sep 12 02:52:46 2013
@@ -4,9 +4,13 @@ import java.util.List;
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 com.google.web.bindery.requestfactory.shared.Request;
import com.google.web.bindery.requestfactory.shared.RequestContext;
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -45,9 +45,13 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> Change to new mvp framework - first step
+=======
+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.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -67,10 +71,14 @@ public class MessageTableModel extends M
private DispatchAsync dispatcher;
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> Change to new mvp framework - first step
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> 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.
private String searchValue;
@Inject
@@ -101,10 +109,14 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
<<<<<<< HEAD
+<<<<<<< HEAD
// folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
=======
folder = new IMAPFolder(user.getSettings().getInboxFolderName());
>>>>>>> Change to new mvp framework - first step
+=======
+// folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
+>>>>>>> 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.
searchValue = null;
}
});
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=1522152&r1=1522151&r2=1522152&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 02:52:46 2013
@@ -102,9 +102,13 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MoveMessageEvent;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> Change to new mvp framework - first step
+=======
+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.widgets.event.EditEvent;
import org.apache.hupa.widgets.event.EditHandler;
import org.apache.hupa.widgets.ui.EnableHyperlink;
@@ -538,6 +542,7 @@ public class WestView extends Composite
return null;
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy oldFolder = (IMAPFolderProxy) selected.getUserObject();
// Generate a new folder with a whitespace as name, this is needed as
@@ -550,6 +555,13 @@ public class WestView extends Composite
// workaround
IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
>>>>>>> Change to new mvp framework - first step
+=======
+ IMAPFolderProxy oldFolder = (IMAPFolderProxy) selected.getUserObject();
+
+ // Generate a new folder with a whitespace as name, this is needed as
+ // workaround
+ IMAPFolderProxy folder = (IMAPFolderProxy)new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+>>>>>>> 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.
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
@@ -594,10 +606,14 @@ public class WestView extends Composite
* decreaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
=======
public void decreaseUnseenMessageCount(IMAPFolder folder, int amount) {
>>>>>>> Change to new mvp framework - first step
+=======
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
+>>>>>>> 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.
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -616,10 +632,14 @@ public class WestView extends Composite
* increaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
=======
public void increaseUnseenMessageCount(IMAPFolder folder, int amount) {
>>>>>>> Change to new mvp framework - first step
+=======
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
+>>>>>>> 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.
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -633,10 +653,14 @@ public class WestView extends Composite
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolderProxy folder) {
=======
private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolder folder) {
>>>>>>> Change to new mvp framework - first step
+=======
+ private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolderProxy folder) {
+>>>>>>> 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.
if (folder.getFullName().equalsIgnoreCase(((IMAPFolder) item.getUserObject()).getFullName())) {
return item;
}
@@ -654,10 +678,14 @@ public class WestView extends Composite
* @see org.apache.hupa.client.mvp.MainPresenter.Display#updateTreeItem(org.apache.hupa.shared.data.IMAPFolder)
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void updateTreeItem(IMAPFolderProxy folder) {
=======
public void updateTreeItem(IMAPFolder folder) {
>>>>>>> Change to new mvp framework - first step
+=======
+ public void updateTreeItem(IMAPFolderProxy folder) {
+>>>>>>> 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.
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/widgets/IMAPTreeItem.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -177,7 +177,11 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
+<<<<<<< HEAD
>>>>>>> first commit
+=======
+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.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -186,10 +190,14 @@ public class IMAPTreeItem extends Editab
protected String oldName;
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPTreeItem(IMAPFolderProxy folder) {
=======
public IMAPTreeItem(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ public IMAPTreeItem(IMAPFolderProxy folder) {
+>>>>>>> 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.
setUserObject(folder);
setFolderText(folder);
}
@@ -213,10 +221,14 @@ public class IMAPTreeItem extends Editab
public void setUnseenMessageCount(int cound) {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
=======
IMAPFolder folder = (IMAPFolder) getUserObject();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+>>>>>>> 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.
int count = folder.getUnseeMessageCount();
folder.setUnseenMessageCount(count);
setFolderText(folder);
@@ -229,10 +241,14 @@ public class IMAPTreeItem extends Editab
*/
public void descreaseUnseenMessageCount(int decreaseCount) {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
=======
IMAPFolder folder = (IMAPFolder) getUserObject();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+>>>>>>> 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.
int count = folder.getUnseeMessageCount();
if (count > 0) {
count = count - decreaseCount;
@@ -255,10 +271,14 @@ public class IMAPTreeItem extends Editab
*/
public void increaseUnseenMessageCount( int increaseCount) {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
=======
IMAPFolder folder = (IMAPFolder) getUserObject();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+>>>>>>> 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.
int count = folder.getUnseeMessageCount();
count = count+ increaseCount;
folder.setUnseenMessageCount(count);
@@ -266,15 +286,20 @@ public class IMAPTreeItem extends Editab
}
<<<<<<< HEAD
+<<<<<<< HEAD
private void setFolderText(IMAPFolderProxy folder) {
=======
private void setFolderText(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ private void setFolderText(IMAPFolderProxy folder) {
+>>>>>>> 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.
setText(getFolderName(folder));
setUnseenMessageCountStyle(folder);
}
<<<<<<< HEAD
+<<<<<<< HEAD
private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
for (IMAPFolderProxy fold : folder.getChildIMAPFolders()) {
@@ -283,6 +308,11 @@ public class IMAPTreeItem extends Editab
boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
for (IMAPFolder fold : folder.getChildIMAPFolders()) {
>>>>>>> first commit
+=======
+ private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
+ boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
+ for (IMAPFolderProxy fold : folder.getChildIMAPFolders()) {
+>>>>>>> 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.
if (fold.getUnseeMessageCount() > 0) {
containsUnseen = true;
break;
@@ -302,10 +332,14 @@ public class IMAPTreeItem extends Editab
* @return name
*/
<<<<<<< HEAD
+<<<<<<< HEAD
private String getFolderName(IMAPFolderProxy folder) {
=======
private String getFolderName(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ private String getFolderName(IMAPFolderProxy folder) {
+>>>>>>> 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.
if (folder.getUnseeMessageCount() > 0) {
return folder.getName() + " ("+folder.getUnseeMessageCount()+")";
}
@@ -315,6 +349,7 @@ public class IMAPTreeItem extends Editab
@Override
public void setUserObject(Object obj) {
<<<<<<< HEAD
+<<<<<<< HEAD
if ((obj instanceof IMAPFolderProxy) == false) {
throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
}
@@ -325,6 +360,12 @@ public class IMAPTreeItem extends Editab
}
setFolderText((IMAPFolder)obj);
>>>>>>> first commit
+=======
+ if ((obj instanceof IMAPFolderProxy) == false) {
+ throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
+ }
+ setFolderText((IMAPFolderProxy)obj);
+>>>>>>> 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.
super.setUserObject(obj);
}
@@ -332,10 +373,14 @@ public class IMAPTreeItem extends Editab
@Override
public void startEdit() {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
=======
IMAPFolder folder = (IMAPFolder) getUserObject();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+>>>>>>> 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.
oldFullName = folder.getFullName();
oldName = folder.getName();
showEditBox(oldName);
@@ -345,10 +390,14 @@ public class IMAPTreeItem extends Editab
@Override
public void cancelEdit() {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
=======
IMAPFolder folder = ((IMAPFolder) getUserObject());
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+>>>>>>> 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.
folder.setFullName(oldFullName);
showItem(getFolderName(folder));
@@ -365,10 +414,14 @@ public class IMAPTreeItem extends Editab
String newFolderName = editBox.getText();
String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length()) + newFolderName;
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
=======
IMAPFolder folder = ((IMAPFolder) getUserObject());
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+>>>>>>> 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.
folder.setFullName(newFullFolderName);
showItem(getFolderName(folder));
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractDeleteMessageHandler.java Thu Sep 12 02:52:46 2013
@@ -31,9 +31,13 @@ import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -62,10 +66,14 @@ public abstract class AbstractDeleteMess
public DeleteMessageResult executeInternal(Action action,
ExecutionContext context) throws ActionException {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
org.apache.hupa.shared.data.IMAPFolder folder = action.getFolder();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = action.getFolder();
+>>>>>>> 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.
User user = getUser();
try {
IMAPStore store = cache.get(user);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java Thu Sep 12 02:52:46 2013
@@ -118,6 +118,7 @@ public abstract class AbstractFetchMessa
ExecutionContext context) throws ActionException {
User user = getUser();
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
if (folder == null) {
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
@@ -126,6 +127,11 @@ public abstract class AbstractFetchMessa
if (folder == null) {
folder = new IMAPFolder(user.getSettings().getInboxFolderName());
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = action.getFolder();
+ if (folder == null) {
+ folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
+>>>>>>> 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.
}
com.sun.mail.imap.IMAPFolder f = null;
int start = action.getStart();
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteFolderHandler.java Thu Sep 12 02:52:46 2013
@@ -28,12 +28,17 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+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.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -59,10 +64,14 @@ public class DeleteFolderHandler extends
ExecutionContext context) throws ActionException {
User user = getUser();
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
IMAPFolder folder = action.getFolder();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = action.getFolder();
+>>>>>>> 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.
try {
IMAPStore store = cache.get(user);
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageByUidHandler.java Thu Sep 12 02:52:46 2013
@@ -31,12 +31,17 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+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.shared.rpc.DeleteMessageByUid;
import com.google.inject.Inject;
@@ -69,10 +74,14 @@ public class DeleteMessageByUidHandler e
protected Message[] getMessagesToDelete(DeleteMessageByUid action)
throws ActionException {
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
IMAPFolder folder = action.getFolder();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = action.getFolder();
+>>>>>>> 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.
ArrayList<Long> uids = action.getMessageUids();
User user = getUser();
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java Thu Sep 12 02:52:46 2013
@@ -34,9 +34,13 @@ import org.apache.hupa.server.IMAPStoreC
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
+=======
+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.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
@@ -70,6 +74,7 @@ public class FetchFoldersHandler extends
// List of mail 'root' imap folders
<<<<<<< HEAD
+<<<<<<< HEAD
List<IMAPFolderProxy> imapFolders = new ArrayList<IMAPFolderProxy>();
// Create IMAPFolder tree list
@@ -82,6 +87,13 @@ public class FetchFoldersHandler extends
for (Folder f : folder.list()) {
IMAPFolder imapFolder = createIMAPFolder(f);
>>>>>>> first commit
+=======
+ List<IMAPFolderProxy> imapFolders = new ArrayList<IMAPFolderProxy>();
+
+ // Create IMAPFolder tree list
+ for (Folder f : folder.list()) {
+ IMAPFolderProxy imapFolder = createIMAPFolder(f);
+>>>>>>> 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.
imapFolders.add(imapFolder);
walkFolders(f, imapFolder);
}
@@ -108,6 +120,7 @@ public class FetchFoldersHandler extends
* @throws MessagingException If an error occurs
*/
<<<<<<< HEAD
+<<<<<<< HEAD
private void walkFolders(Folder folder, IMAPFolderProxy imapFolder) throws ActionException, MessagingException{
for (Folder f : folder.list()) {
IMAPFolderProxy iFolder = createIMAPFolder(f);
@@ -116,6 +129,11 @@ public class FetchFoldersHandler extends
for (Folder f : folder.list()) {
IMAPFolder iFolder = createIMAPFolder(f);
>>>>>>> first commit
+=======
+ private void walkFolders(Folder folder, IMAPFolderProxy imapFolder) throws ActionException, MessagingException{
+ for (Folder f : folder.list()) {
+ IMAPFolderProxy iFolder = createIMAPFolder(f);
+>>>>>>> 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.
imapFolder.getChildIMAPFolders().add(iFolder);
walkFolders(f, iFolder);
}
@@ -137,6 +155,7 @@ public class FetchFoldersHandler extends
* @throws MessagingException If an error occurs
*/
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy createIMAPFolder(Folder folder) throws ActionException {
String fullName = folder.getFullName();
@@ -149,15 +168,26 @@ public class FetchFoldersHandler extends
String delimiter;
IMAPFolder iFolder = null;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy createIMAPFolder(Folder folder) throws ActionException {
+
+ String fullName = folder.getFullName();
+ String delimiter;
+ IMAPFolderProxy iFolder = null;
+>>>>>>> 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.
try {
logger.debug("Creating folder: " + fullName + " for user: " + getUser());
delimiter = String.valueOf(folder.getSeparator());
<<<<<<< HEAD
+<<<<<<< HEAD
iFolder = (IMAPFolderProxy)new IMAPFolder(fullName);
=======
iFolder = new IMAPFolder(fullName);
>>>>>>> first commit
+=======
+ iFolder = (IMAPFolderProxy)new IMAPFolder(fullName);
+>>>>>>> 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.
iFolder.setDelimiter(delimiter);
if("[Gmail]".equals(folder.getFullName()))
return iFolder;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org