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:14:19 UTC
svn commit: r1522129 [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:14:17 2013
New Revision: 1522129
URL: http://svn.apache.org/r1522129
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.
Added:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/locator/
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/locator/EntityLocator.java
- copied, changed from r1522127, james/hupa/trunk/server/src/main/java/org/apache/hupa/server/locator/EntityLocator.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/IMAPFolderLocator.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/IMAPFolderProxy.java
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/locator/EntityLocator.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.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/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/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -8,7 +8,6 @@ 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;
-import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
@@ -17,6 +16,7 @@ import org.apache.hupa.shared.events.Bac
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.ReplyMessageEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -122,7 +122,7 @@ public class IMAPMessageActivity extend
private MessageDetails messageDetails;
private Message message;
private CachingDispatchAsync dispatcher;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -387,7 +387,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;
@@ -403,6 +402,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;
@@ -439,7 +439,7 @@ public class IMAPMessageListActivity ext
private String searchValue;
private User user;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private ShowMessageTableListener tableListener = new ShowMessageTableListener();
@@ -701,7 +701,7 @@ public class IMAPMessageListActivity ext
display.reloadData();
}
}
- public void revealDisplay(User user, IMAPFolder folder, String searchValue) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, String searchValue) {
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -55,7 +55,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;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.validation.EmailListValidator;
@@ -76,6 +75,7 @@ import org.apache.hupa.shared.events.Fol
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
<<<<<<< HEAD
import org.apache.hupa.widgets.ui.HasEnable;
@@ -113,7 +113,7 @@ public class MessageSendActivity extends
private DispatchAsync dispatcher;
private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
private Type type = Type.NEW;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private Message oldmessage;
protected SMTPMessage message = null;
@@ -544,7 +544,7 @@ public class MessageSendActivity extends
});
}
- public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
this.reset();
this.oldmessage = oldmessage;
this.oldDetails = oldDetails;
@@ -594,7 +594,7 @@ public class MessageSendActivity extends
display.getEditorFocus().setFocus(true);
}
- public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, Type type) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, Type type) {
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -257,7 +257,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;
@@ -291,6 +290,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;
@@ -332,7 +332,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;
@@ -388,8 +388,7 @@ public class WestActivity extends Abstra
@Override
public void onSuccess(List<IMAPFolderProxy> response) {
-System.out.println("1111111"+response);
- display.bindTreeItems(null);
+ display.bindTreeItems(createTreeNodes(response));
// // disable
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -418,10 +417,10 @@ System.out.println("1111111"+response);
* @param list
* @return
*/
- private List<IMAPTreeItem> createTreeNodes(List<IMAPFolder> list) {
+ private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
- for (IMAPFolder iFolder : list) {
+ for (IMAPFolderProxy iFolder : list) {
final IMAPTreeItem record = new IMAPTreeItem(iFolder);
record.addEditHandler(new EditHandler() {
@@ -446,7 +445,7 @@ System.out.println("1111111"+response);
});
record.setUserObject(iFolder);
- List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
+ List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
@@ -588,7 +587,7 @@ System.out.println("1111111"+response);
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
- folder = (IMAPFolder) tItem.getUserObject();
+ folder = (IMAPFolderProxy) tItem.getUserObject();
eventBus.fireEvent(new LoadMessagesEvent(user, folder));
}
@@ -599,7 +598,7 @@ System.out.println("1111111"+response);
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
- folder = (IMAPFolder) tItem.getUserObject();
+ folder = (IMAPFolderProxy) tItem.getUserObject();
if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) {
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -672,7 +671,7 @@ System.out.println("1111111"+response);
eventBus.addHandler(MessagesReceivedEvent.TYPE, new MessagesReceivedEventHandler() {
public void onMessagesReceived(MessagesReceivedEvent event) {
- IMAPFolder f = event.getFolder();
+ IMAPFolderProxy f = event.getFolder();
display.updateTreeItem(f);
}
@@ -681,7 +680,7 @@ System.out.println("1111111"+response);
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolder(user.getSettings().getInboxFolderName());;
+// folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
// showMessageTable(user, folder, searchValue);
}
@@ -713,7 +712,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;
@@ -760,15 +759,15 @@ System.out.println("1111111"+response);
public HasEnable getNewEnable();
- public void updateTreeItem(IMAPFolder folder);
+ public void updateTreeItem(IMAPFolderProxy folder);
public void deleteSelectedFolder();
public HasEditable createFolder(EditHandler handler);
- public void increaseUnseenMessageCount(IMAPFolder folder, int amount);
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
- public void decreaseUnseenMessageCount(IMAPFolder folder, int amount);
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -31,8 +31,8 @@ import org.apache.hupa.client.HupaCallba
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
-import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.Message.IMAPFlag;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.DecreaseUnseenEvent;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.FolderSelectionEvent;
@@ -46,6 +46,7 @@ import org.apache.hupa.shared.events.Mes
import org.apache.hupa.shared.events.MoveMessageEvent;
import org.apache.hupa.shared.events.MoveMessageEventHandler;
import org.apache.hupa.shared.events.NewMessageEvent;
+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;
@@ -119,7 +120,7 @@ public class IMAPMessageListPresenter ex
private String searchValue;
private User user;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private DispatchAsync dispatcher;
private ShowMessageTableListener tableListener = new ShowMessageTableListener();
@@ -409,7 +410,7 @@ public class IMAPMessageListPresenter ex
}
}
- public void revealDisplay(User user, IMAPFolder folder, String searchValue) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, String searchValue) {
this.user = user;
if (this.user == null
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -38,6 +38,7 @@ import org.apache.hupa.shared.events.Bac
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.ReplyMessageEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -67,7 +68,7 @@ public class IMAPMessagePresenter extend
private MessageDetails messageDetails;
private Message message;
private CachingDispatchAsync dispatcher;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private User user;
@Inject
@@ -77,7 +78,7 @@ public class IMAPMessagePresenter extend
}
- public void revealDisplay(User user, IMAPFolder folder, Message message, MessageDetails messageDetails) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails) {
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -62,6 +62,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.FetchFolders;
@@ -114,15 +115,15 @@ public class MainPresenter extends Widge
public HasEnable getNewEnable();
- public void updateTreeItem(IMAPFolder folder);
+ public void updateTreeItem(IMAPFolderProxy folder);
public void deleteSelectedFolder();
public HasEditable createFolder(EditHandler handler);
- public void increaseUnseenMessageCount(IMAPFolder folder, int amount);
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
- public void decreaseUnseenMessageCount(IMAPFolder folder, int amount);
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount);
public void setLoadingFolders(boolean loading);
public void setLoadingMessage(boolean loading);
@@ -131,7 +132,7 @@ public class MainPresenter extends Widge
private DispatchAsync dispatcher;
private User user;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private String searchValue;
private IMAPMessageListPresenter messageListPresenter;
private IMAPMessagePresenter messagePresenter;
@@ -170,10 +171,10 @@ public class MainPresenter extends Widge
* @param list
* @return
*/
- private List<IMAPTreeItem> createTreeNodes(List<IMAPFolder> list) {
+ private List<IMAPTreeItem> createTreeNodes(List<IMAPFolderProxy> list) {
List<IMAPTreeItem> tList = new ArrayList<IMAPTreeItem>();
- for (IMAPFolder iFolder : list) {
+ for (IMAPFolderProxy iFolder : list) {
final IMAPTreeItem record = new IMAPTreeItem(iFolder);
record.addEditHandler(new EditHandler() {
@@ -198,7 +199,7 @@ public class MainPresenter extends Widge
});
record.setUserObject(iFolder);
- List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
+ List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
@@ -224,7 +225,7 @@ public class MainPresenter extends Widge
return tList;
}
- 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;
@@ -233,7 +234,7 @@ public class MainPresenter extends Widge
messageListPresenter.revealDisplay(user, folder, searchValue);
}
- private void showMessage(User user, IMAPFolder folder, Message message, MessageDetails details) {
+ private void showMessage(User user, IMAPFolderProxy folder, Message message, MessageDetails details) {
messagePresenter.revealDisplay(user, folder, message, details);
}
@@ -379,7 +380,7 @@ public class MainPresenter extends Widge
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
- folder = (IMAPFolder) tItem.getUserObject();
+ folder = (IMAPFolderProxy) tItem.getUserObject();
eventBus.fireEvent(new LoadMessagesEvent(user, folder));
}
@@ -391,7 +392,7 @@ public class MainPresenter extends Widge
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
- folder = (IMAPFolder) tItem.getUserObject();
+ folder = (IMAPFolderProxy) tItem.getUserObject();
if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) {
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
@@ -469,7 +470,7 @@ public class MainPresenter extends Widge
registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new MessagesReceivedEventHandler() {
public void onMessagesReceived(MessagesReceivedEvent event) {
- IMAPFolder f = event.getFolder();
+ IMAPFolderProxy f = event.getFolder();
display.updateTreeItem(f);
}
@@ -479,7 +480,7 @@ public class MainPresenter extends Widge
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolder(user.getSettings().getInboxFolderName());;
+ folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
showMessageTable(user, folder, searchValue);
}
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -41,6 +41,7 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MoveMessageEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.event.EditHandler;
import org.apache.hupa.widgets.ui.EnableHyperlink;
@@ -60,7 +61,6 @@ import com.google.gwt.user.client.ui.Com
import com.google.gwt.user.client.ui.DockPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -441,7 +441,7 @@ public class MainView extends Composite
// Generate a new folder with a whitespace as name, this is needed as
// workaround
- IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+ IMAPFolderProxy folder = (IMAPFolderProxy)new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
@@ -485,7 +485,7 @@ public class MainView extends Composite
* @seeorg.apache.hupa.client.mvp.IMAPFolderPresenter.Display#
* decreaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
- public void decreaseUnseenMessageCount(IMAPFolder folder, int amount) {
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -503,7 +503,7 @@ public class MainView extends Composite
* @seeorg.apache.hupa.client.mvp.IMAPFolderPresenter.Display#
* increaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
- public void increaseUnseenMessageCount(IMAPFolder folder, int amount) {
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -516,8 +516,8 @@ public class MainView extends Composite
}
- private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolder folder) {
- if (folder.getFullName().equalsIgnoreCase(((IMAPFolder) item.getUserObject()).getFullName())) {
+ private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolderProxy folder) {
+ if (folder.getFullName().equalsIgnoreCase(((IMAPFolderProxy) item.getUserObject()).getFullName())) {
return item;
}
for (int i = 0; i < item.getChildCount(); i++) {
@@ -533,7 +533,7 @@ public class MainView extends Composite
* (non-Javadoc)
* @see org.apache.hupa.client.mvp.MainPresenter.Display#updateTreeItem(org.apache.hupa.shared.data.IMAPFolder)
*/
- public void updateTreeItem(IMAPFolder folder) {
+ public void updateTreeItem(IMAPFolderProxy folder) {
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -19,20 +19,15 @@
package org.apache.hupa.client.mvp;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.user.client.ui.Focusable;
-import com.google.gwt.user.client.ui.HasHTML;
-import com.google.gwt.user.client.ui.HasText;
-import com.google.inject.Inject;
-
-import gwtupload.client.IUploader;
import gwtupload.client.IUploadStatus.Status;
+import gwtupload.client.IUploader;
import gwtupload.client.IUploader.OnCancelUploaderHandler;
import gwtupload.client.IUploader.OnFinishUploaderHandler;
import gwtupload.client.IUploader.OnStatusChangedHandler;
+import java.util.ArrayList;
+import java.util.List;
+
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.dispatch.shared.Action;
import net.customware.gwt.presenter.client.EventBus;
@@ -57,15 +52,21 @@ import org.apache.hupa.shared.events.Fol
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+import org.apache.hupa.shared.rpc.ContactsResult.Contact;
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;
-import org.apache.hupa.shared.rpc.ContactsResult.Contact;
import org.apache.hupa.widgets.ui.HasEnable;
-import java.util.ArrayList;
-import java.util.List;
+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;
/**
* Presenter which handles the sending, reply, replay-all, forward of mails
@@ -76,7 +77,7 @@ public class MessageSendPresenter extend
private DispatchAsync dispatcher;
private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
private Type type = Type.NEW;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private Message oldmessage;
protected SMTPMessage message = null;
@@ -281,7 +282,7 @@ public class MessageSendPresenter extend
* @param type
* the type
*/
- public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) {
this.reset();
this.oldmessage = oldmessage;
this.oldDetails = oldDetails;
@@ -333,7 +334,7 @@ public class MessageSendPresenter extend
display.getEditorFocus().setFocus(true);
}
- public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, Type type) {
+ public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, Type type) {
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -37,6 +37,7 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -54,7 +55,7 @@ public class MessageTableModel extends M
private EventBus eventBus;
private DispatchAsync dispatcher;
private User user;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private String searchValue;
@Inject
@@ -84,7 +85,7 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolder(user.getSettings().getInboxFolderName());
+ folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -1,10 +1,10 @@
package org.apache.hupa.client.place;
-import org.apache.hupa.client.activity.IMAPMessageActivity;
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;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
@@ -14,7 +14,7 @@ public class IMAPMessagePlace extends Pl
private Message message;
private MessageDetails messageDetails;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private User user;
public Message getMessage() {
@@ -25,7 +25,7 @@ public class IMAPMessagePlace extends Pl
return messageDetails;
}
- public IMAPFolder getFolder() {
+ public IMAPFolderProxy getFolder() {
return folder;
}
@@ -51,7 +51,7 @@ public class IMAPMessagePlace extends Pl
return this.getClass().getName()+"->[IMAPMessage]";
}
- public IMAPMessagePlace with(User user, IMAPFolder folder, Message message, MessageDetails messageDetails){
+ public IMAPMessagePlace with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails){
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=1522129&r1=1522128&r2=1522129&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:14:17 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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -37,6 +37,7 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> 1. improve the inbox folder place.
import com.google.gwt.place.shared.Place;
@@ -106,7 +107,7 @@ public class MessageSendPlace extends Pl
private User user ;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private Message message;
private MessageDetails messageDetails;
private Type forward;
@@ -130,7 +131,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;
@@ -143,7 +144,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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -3,6 +3,7 @@ package org.apache.hupa.client.rf;
import java.util.List;
import org.apache.hupa.server.service.IMAPFolderService;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -36,6 +36,7 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -54,7 +55,7 @@ public class MessageTableModel extends M
private EventBus eventBus;
private DispatchAsync dispatcher;
private User user;
- private IMAPFolder folder;
+ private IMAPFolderProxy folder;
private String searchValue;
@Inject
@@ -84,7 +85,7 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolder(user.getSettings().getInboxFolderName());
+// folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -98,6 +98,7 @@ import org.apache.hupa.shared.events.Log
import org.apache.hupa.shared.events.LogoutEvent;
import org.apache.hupa.shared.events.LogoutEventHandler;
import org.apache.hupa.shared.events.MoveMessageEvent;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.event.EditHandler;
import org.apache.hupa.widgets.ui.EnableHyperlink;
@@ -495,11 +496,11 @@ public class WestView extends Composite
if (selected.isEdit())
return null;
- IMAPFolder oldFolder = (IMAPFolder) selected.getUserObject();
+ IMAPFolderProxy oldFolder = (IMAPFolderProxy) selected.getUserObject();
// Generate a new folder with a whitespace as name, this is needed as
// workaround
- IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+ IMAPFolderProxy folder = (IMAPFolderProxy)new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
@@ -543,7 +544,7 @@ public class WestView extends Composite
* @seeorg.apache.hupa.client.mvp.IMAPFolderPresenter.Display#
* decreaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
- public void decreaseUnseenMessageCount(IMAPFolder folder, int amount) {
+ public void decreaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -561,7 +562,7 @@ public class WestView extends Composite
* @seeorg.apache.hupa.client.mvp.IMAPFolderPresenter.Display#
* increaseUnseenMessageCount(org.apache.hupa.shared.data.IMAPFolder, int)
*/
- public void increaseUnseenMessageCount(IMAPFolder folder, int amount) {
+ public void increaseUnseenMessageCount(IMAPFolderProxy folder, int amount) {
int count = folderTree.getItemCount();
for (int i = 0; i < count; i++) {
IMAPTreeItem item = findTreeItemForFolder((IMAPTreeItem) folderTree.getItem(i), folder);
@@ -574,7 +575,7 @@ public class WestView extends Composite
}
- private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolder folder) {
+ private IMAPTreeItem findTreeItemForFolder(IMAPTreeItem item, IMAPFolderProxy folder) {
if (folder.getFullName().equalsIgnoreCase(((IMAPFolder) item.getUserObject()).getFullName())) {
return item;
}
@@ -591,7 +592,7 @@ public class WestView extends Composite
* (non-Javadoc)
* @see org.apache.hupa.client.mvp.MainPresenter.Display#updateTreeItem(org.apache.hupa.shared.data.IMAPFolder)
*/
- public void updateTreeItem(IMAPFolder folder) {
+ public void updateTreeItem(IMAPFolderProxy folder) {
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -173,6 +173,7 @@ public class IMAPTreeItem extends Editab
}
=======
import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -180,7 +181,7 @@ public class IMAPTreeItem extends Editab
protected String oldFullName;
protected String oldName;
- public IMAPTreeItem(IMAPFolder folder) {
+ public IMAPTreeItem(IMAPFolderProxy folder) {
setUserObject(folder);
setFolderText(folder);
}
@@ -203,7 +204,7 @@ public class IMAPTreeItem extends Editab
}
public void setUnseenMessageCount(int cound) {
- IMAPFolder folder = (IMAPFolder) getUserObject();
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
int count = folder.getUnseeMessageCount();
folder.setUnseenMessageCount(count);
setFolderText(folder);
@@ -215,7 +216,7 @@ public class IMAPTreeItem extends Editab
* Decrease the unseen messagecount of this folder
*/
public void descreaseUnseenMessageCount(int decreaseCount) {
- IMAPFolder folder = (IMAPFolder) getUserObject();
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
int count = folder.getUnseeMessageCount();
if (count > 0) {
count = count - decreaseCount;
@@ -237,21 +238,21 @@ public class IMAPTreeItem extends Editab
* Increase the unseen messagecount of this folder
*/
public void increaseUnseenMessageCount( int increaseCount) {
- IMAPFolder folder = (IMAPFolder) getUserObject();
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
int count = folder.getUnseeMessageCount();
count = count+ increaseCount;
folder.setUnseenMessageCount(count);
setFolderText(folder);
}
- private void setFolderText(IMAPFolder folder) {
+ private void setFolderText(IMAPFolderProxy folder) {
setText(getFolderName(folder));
setUnseenMessageCountStyle(folder);
}
- private void setUnseenMessageCountStyle(IMAPFolder folder) {
+ private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
boolean containsUnseen = (folder.getUnseeMessageCount() > 0);
- for (IMAPFolder fold : folder.getChildIMAPFolders()) {
+ for (IMAPFolderProxy fold : folder.getChildIMAPFolders()) {
if (fold.getUnseeMessageCount() > 0) {
containsUnseen = true;
break;
@@ -270,7 +271,7 @@ public class IMAPTreeItem extends Editab
* @param folder
* @return name
*/
- private String getFolderName(IMAPFolder folder) {
+ private String getFolderName(IMAPFolderProxy folder) {
if (folder.getUnseeMessageCount() > 0) {
return folder.getName() + " ("+folder.getUnseeMessageCount()+")";
}
@@ -279,17 +280,17 @@ public class IMAPTreeItem extends Editab
@Override
public void setUserObject(Object obj) {
- if ((obj instanceof IMAPFolder) == false) {
+ if ((obj instanceof IMAPFolderProxy) == false) {
throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
}
- setFolderText((IMAPFolder)obj);
+ setFolderText((IMAPFolderProxy)obj);
super.setUserObject(obj);
}
@Override
public void startEdit() {
- IMAPFolder folder = (IMAPFolder) getUserObject();
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
oldFullName = folder.getFullName();
oldName = folder.getName();
showEditBox(oldName);
@@ -298,7 +299,7 @@ public class IMAPTreeItem extends Editab
@Override
public void cancelEdit() {
- IMAPFolder folder = ((IMAPFolder) getUserObject());
+ IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
folder.setFullName(oldFullName);
showItem(getFolderName(folder));
@@ -314,7 +315,7 @@ public class IMAPTreeItem extends Editab
} else {
String newFolderName = editBox.getText();
String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length()) + newFolderName;
- IMAPFolder folder = ((IMAPFolder) getUserObject());
+ IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -30,6 +30,7 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -57,7 +58,7 @@ public abstract class AbstractDeleteMess
*/
public DeleteMessageResult executeInternal(Action action,
ExecutionContext context) throws ActionException {
- org.apache.hupa.shared.data.IMAPFolder folder = action.getFolder();
+ IMAPFolderProxy folder = action.getFolder();
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -43,6 +43,7 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.Tag;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -62,9 +63,9 @@ public abstract class AbstractFetchMessa
protected FetchMessagesResult executeInternal(A action,
ExecutionContext context) throws ActionException {
User user = getUser();
- IMAPFolder folder = action.getFolder();
+ IMAPFolderProxy folder = action.getFolder();
if (folder == null) {
- folder = new IMAPFolder(user.getSettings().getInboxFolderName());
+ folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
}
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -27,8 +27,8 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -53,7 +53,7 @@ public class DeleteFolderHandler extends
protected GenericResult executeInternal(DeleteFolder action,
ExecutionContext context) throws ActionException {
User user = getUser();
- IMAPFolder folder = action.getFolder();
+ IMAPFolderProxy folder = action.getFolder();
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -30,8 +30,8 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import com.google.inject.Inject;
@@ -63,7 +63,7 @@ public class DeleteMessageByUidHandler e
@Override
protected Message[] getMessagesToDelete(DeleteMessageByUid action)
throws ActionException {
- IMAPFolder folder = action.getFolder();
+ IMAPFolderProxy folder = action.getFolder();
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=1522129&r1=1522128&r2=1522129&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:14:17 2013
@@ -33,6 +33,7 @@ import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
@@ -65,11 +66,11 @@ public class FetchFoldersHandler extends
com.sun.mail.imap.IMAPFolder folder = (com.sun.mail.imap.IMAPFolder) store.getDefaultFolder();
// List of mail 'root' imap folders
- List<IMAPFolder> imapFolders = new ArrayList<IMAPFolder>();
+ List<IMAPFolderProxy> imapFolders = new ArrayList<IMAPFolderProxy>();
// Create IMAPFolder tree list
for (Folder f : folder.list()) {
- IMAPFolder imapFolder = createIMAPFolder(f);
+ IMAPFolderProxy imapFolder = createIMAPFolder(f);
imapFolders.add(imapFolder);
walkFolders(f, imapFolder);
}
@@ -95,9 +96,9 @@ public class FetchFoldersHandler extends
* @throws ActionException If an error occurs
* @throws MessagingException If an error occurs
*/
- private void walkFolders(Folder folder, IMAPFolder imapFolder) throws ActionException, MessagingException{
+ private void walkFolders(Folder folder, IMAPFolderProxy imapFolder) throws ActionException, MessagingException{
for (Folder f : folder.list()) {
- IMAPFolder iFolder = createIMAPFolder(f);
+ IMAPFolderProxy iFolder = createIMAPFolder(f);
imapFolder.getChildIMAPFolders().add(iFolder);
walkFolders(f, iFolder);
}
@@ -118,16 +119,16 @@ public class FetchFoldersHandler extends
* @throws ActionException If an error occurs
* @throws MessagingException If an error occurs
*/
- private IMAPFolder createIMAPFolder(Folder folder) throws ActionException {
+ private IMAPFolderProxy createIMAPFolder(Folder folder) throws ActionException {
String fullName = folder.getFullName();
String delimiter;
- IMAPFolder iFolder = null;
+ IMAPFolderProxy iFolder = null;
try {
logger.debug("Creating folder: " + fullName + " for user: " + getUser());
delimiter = String.valueOf(folder.getSeparator());
- iFolder = new IMAPFolder(fullName);
+ iFolder = (IMAPFolderProxy)new IMAPFolder(fullName);
iFolder.setDelimiter(delimiter);
if("[Gmail]".equals(folder.getFullName()))
return iFolder;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java Thu Sep 12 02:14:17 2013
@@ -19,16 +19,41 @@
package org.apache.hupa.server.handler;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_badAttrs;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_badTags;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_email;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_existingEmailLinks;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_existingHttpLinks;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_gt;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_htmllink;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_inlineImg;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_lt;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_nl;
+import static org.apache.hupa.server.utils.RegexPatterns.regex_unneededTags;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_badAttrs;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_badTags;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_email;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_existingHttpLinks;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_existngEmailLinks;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_gt;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_htmllink;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_inlineImg;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_lt;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_nl;
+import static org.apache.hupa.server.utils.RegexPatterns.repl_unneededTags;
+import static org.apache.hupa.server.utils.RegexPatterns.replaceAll;
+import static org.apache.hupa.server.utils.RegexPatterns.replaceAllRecursive;
+
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import javax.mail.Flags;
+import javax.mail.Flags.Flag;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
-import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;
import javax.servlet.http.HttpSession;
@@ -38,11 +63,10 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import static org.apache.hupa.server.utils.RegexPatterns.*;
-import org.apache.hupa.shared.data.IMAPFolder;
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.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.GetMessageDetails;
import org.apache.hupa.shared.rpc.GetMessageDetailsResult;
@@ -81,7 +105,7 @@ public class GetMessageDetailsHandler ex
return GetMessageDetails.class;
}
- protected MessageDetails exposeMessage(User user, IMAPFolder folder,
+ protected MessageDetails exposeMessage(User user, IMAPFolderProxy folder,
long uid) throws ActionException {
IMAPStore store = null;
com.sun.mail.imap.IMAPFolder f = null;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java Thu Sep 12 02:14:17 2013
@@ -22,10 +22,10 @@ package org.apache.hupa.server.handler;
import java.util.ArrayList;
import javax.mail.Flags;
+import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.Flags.Flag;
import javax.servlet.http.HttpSession;
import net.customware.gwt.dispatch.server.ExecutionContext;
@@ -33,8 +33,8 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
import org.apache.hupa.shared.rpc.GenericResult;
import org.apache.hupa.shared.rpc.SetFlag;
@@ -54,7 +54,7 @@ public class SetFlagsHandler extends Abs
protected GenericResult executeInternal(SetFlag action,
ExecutionContext context) throws ActionException {
User user = getUser();
- IMAPFolder folder = action.getFolder();
+ IMAPFolderProxy folder = action.getFolder();
ArrayList<Long> uids = action.getUids();
com.sun.mail.imap.IMAPFolder f = null;
try {
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java Thu Sep 12 02:14:17 2013
@@ -21,7 +21,7 @@ import com.sun.mail.imap.IMAPStore;
public class IMAPFolderService {
- private static boolean useSSL = false;
+ private static boolean useSSL = true;
public static String echo(String s){
return s;
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java Thu Sep 12 02:14:17 2013
@@ -22,17 +22,14 @@ package org.apache.hupa.shared.data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
-import javax.servlet.http.HttpSession;
-
-import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
+import org.apache.hupa.shared.rf.EntityBase;
/**
* IMAPFolder
*
*/
-public class IMAPFolder implements Serializable {
+public class IMAPFolder extends EntityBase implements Serializable {
private Long id;
private Long version;
@@ -61,7 +58,7 @@ public class IMAPFolder implements Seria
*/
private static final long serialVersionUID = 2084188092060266479L;
- private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
+ private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
private String fullName;
private String delimiter;
private int msgCount;
@@ -104,7 +101,7 @@ public class IMAPFolder implements Seria
*
* @param childs
*/
- public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
+ public void setChildIMAPFolders(List<IMAPFolder> childs) {
this.childs = childs;
}
@@ -113,7 +110,7 @@ public class IMAPFolder implements Seria
*
* @return childs
*/
- public ArrayList<IMAPFolder> getChildIMAPFolders() {
+ public List<IMAPFolder> getChildIMAPFolders() {
return childs;
}
@@ -207,5 +204,6 @@ public class IMAPFolder implements Seria
public int hashCode() {
return getFullName().hashCode();
}
+
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DecreaseUnseenEvent.java Thu Sep 12 02:14:17 2013
@@ -20,12 +20,17 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
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 com.google.gwt.event.shared.GwtEvent;
@@ -34,6 +39,7 @@ public class DecreaseUnseenEvent extends
public final static Type<DecreaseUnseenEventHandler> TYPE = new Type<DecreaseUnseenEventHandler>();
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -44,24 +50,35 @@ public class DecreaseUnseenEvent extends
public DecreaseUnseenEvent(User user, ImapFolder folder, int amount) {
=======
private IMAPFolder folder;
+=======
+ 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 int amount;
- public DecreaseUnseenEvent(User user, IMAPFolder folder) {
+ public DecreaseUnseenEvent(User user, IMAPFolderProxy folder) {
this(user, folder, 1);
}
+<<<<<<< HEAD
public DecreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
>>>>>>> first commit
+=======
+ public DecreaseUnseenEvent(User user, 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.
this.user =user;
this.folder = folder;
this.amount = amount;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy 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.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java Thu Sep 12 02:14:17 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -29,6 +30,11 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Message;
+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 com.google.gwt.event.shared.GwtEvent;
@@ -38,6 +44,7 @@ public class ExpandMessageEvent extends
private Message message;
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private MessageDetails messageDetails;
@@ -47,6 +54,11 @@ public class ExpandMessageEvent extends
public ExpandMessageEvent(User user, IMAPFolder folder, Message message) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+
+ public ExpandMessageEvent(User user, IMAPFolderProxy folder, Message message) {
+>>>>>>> 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.folder = folder;
this.user = user;
@@ -72,6 +84,7 @@ public class ExpandMessageEvent extends
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder () {
return folder;
}
@@ -82,6 +95,9 @@ public class ExpandMessageEvent extends
=======
public IMAPFolder getFolder () {
+=======
+ public IMAPFolderProxy 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.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java Thu Sep 12 02:14:17 2013
@@ -20,12 +20,17 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
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 com.google.gwt.event.shared.GwtEvent;
@@ -33,6 +38,7 @@ public class FolderSelectionEvent extend
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
public FolderSelectionEvent(User user, ImapFolder folder) {
@@ -41,15 +47,24 @@ public class FolderSelectionEvent extend
public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
public FolderSelectionEvent(User user, IMAPFolder folder) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+ public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
+ public FolderSelectionEvent(User user, 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.
this.user =user;
this.folder = folder;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy 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.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java Thu Sep 12 02:14:17 2013
@@ -21,6 +21,7 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -31,6 +32,12 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.MessageDetails;
+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 com.google.gwt.event.shared.GwtEvent;
@@ -39,6 +46,7 @@ public class ForwardMessageEvent extends
public final static Type<ForwardMessageEventHandler> TYPE = new Type<ForwardMessageEventHandler>();
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private Message message;
private MessageDetails details;
@@ -51,6 +59,13 @@ public class ForwardMessageEvent extends
public ForwardMessageEvent(User user, IMAPFolder folder, Message message, MessageDetails details) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+ private Message message;
+ private MessageDetails details;
+
+ public ForwardMessageEvent(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.
this.user = user;
this.folder = folder;
this.message = message;
@@ -62,10 +77,14 @@ public class ForwardMessageEvent extends
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy 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.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java Thu Sep 12 02:14:17 2013
@@ -20,12 +20,17 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
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 com.google.gwt.event.shared.GwtEvent;
@@ -34,6 +39,7 @@ public class IncreaseUnseenEvent extends
public final static Type<IncreaseUnseenEventHandler> TYPE = new Type<IncreaseUnseenEventHandler>();
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -44,24 +50,35 @@ public class IncreaseUnseenEvent extends
public IncreaseUnseenEvent(User user, ImapFolder folder, int amount) {
=======
private IMAPFolder folder;
+=======
+ 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 int amount;
- public IncreaseUnseenEvent(User user, IMAPFolder folder) {
+ public IncreaseUnseenEvent(User user, IMAPFolderProxy folder) {
this(user, folder, 1);
}
+<<<<<<< HEAD
public IncreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
>>>>>>> first commit
+=======
+ public IncreaseUnseenEvent(User user, 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.
this.user =user;
this.folder = folder;
this.amount = amount;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy 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.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java?rev=1522129&r1=1522128&r2=1522129&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java Thu Sep 12 02:14:17 2013
@@ -21,12 +21,17 @@
package org.apache.hupa.shared.events;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
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 com.google.gwt.event.shared.GwtEvent;
@@ -34,6 +39,7 @@ public class LoadMessagesEvent extends G
public final static Type<LoadMessagesEventHandler> TYPE = new Type<LoadMessagesEventHandler>();
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private String searchValue;
@@ -44,14 +50,21 @@ public class LoadMessagesEvent extends G
public LoadMessagesEvent(User user, ImapFolder folder, String searchValue) {
=======
private IMAPFolder folder;
+=======
+ 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;
- public LoadMessagesEvent(User user, IMAPFolder folder) {
+ public LoadMessagesEvent(User user, IMAPFolderProxy folder) {
this(user,folder,null);
}
+<<<<<<< HEAD
public LoadMessagesEvent(User user, IMAPFolder folder, String searchValue) {
>>>>>>> first commit
+=======
+ public LoadMessagesEvent(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;
@@ -60,10 +73,14 @@ public class LoadMessagesEvent extends G
return user;
}
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy 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.
return folder;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org