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:13:01 UTC
svn commit: r1522127 - 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/ui/
client/src/test/java/org/apache/hupa/client/mvp/ server/...
Author: dongxu
Date: Thu Sep 12 02:13:01 2013
New Revision: 1522127
URL: http://svn.apache.org/r1522127
Log:
undo previous operations, for which is not the feasible method.
we can not make the client and server implement the same entity interface.
Removed:
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/WestActivity.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/MessageTableModel.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/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.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/FetchFoldersHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InSessionUserPreferencesStorageTest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -263,7 +263,6 @@ import org.apache.hupa.client.ui.WidgetC
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.MessageDetails;
@@ -340,8 +339,6 @@ public class WestActivity extends Abstra
private Place currentPlace;
- private List<IMAPFolderProxy> folders;
-
public void setCurrentPlace(Place place){
this.currentPlace = place;
}
@@ -391,9 +388,11 @@ public class WestActivity extends Abstra
@Override
public void onSuccess(List<IMAPFolderProxy> response) {
- folders = response;
+System.out.println("1111111"+response);
display.bindTreeItems(null);
- enableClick(false);
+// // disable
+ display.getDeleteEnable().setEnabled(false);
+ display.getRenameEnable().setEnabled(false);
display.setLoadingFolders(false);
}
@@ -413,12 +412,6 @@ public class WestActivity extends Abstra
}
- private void enableClick(boolean flag){
- display.getDeleteEnable().setEnabled(flag);
- display.getRenameEnable().setEnabled(flag);
- }
-
-
/**
* Create recursive the TreeNodes with all childs
*
@@ -435,7 +428,7 @@ public class WestActivity extends Abstra
public void onEditEvent(EditEvent event) {
if (event.getEventType().equals(EditEvent.EventType.Stop)) {
- IMAPFolder iFolder = new IMAPFolderImpl((String) event.getOldValue());
+ IMAPFolder iFolder = new IMAPFolder((String) event.getOldValue());
final String newName = (String) event.getNewValue();
if (iFolder.getFullName().equalsIgnoreCase(newName) == false) {
dispatcher.execute(new RenameFolder(iFolder, newName), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) {
@@ -608,9 +601,11 @@ public class WestActivity extends Abstra
return;
folder = (IMAPFolder) tItem.getUserObject();
if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) {
- enableClick(false);
+ display.getDeleteEnable().setEnabled(false);
+ display.getRenameEnable().setEnabled(false);
} else {
- enableClick(true);
+ display.getDeleteEnable().setEnabled(true);
+ display.getRenameEnable().setEnabled(true);
}
}
@@ -655,7 +650,7 @@ public class WestActivity extends Abstra
final IMAPTreeItem item = (IMAPTreeItem) event.getSource();
final String newValue = (String) event.getNewValue();
if (event.getEventType().equals(EditEvent.EventType.Stop)) {
- dispatcher.execute(new CreateFolder(new IMAPFolderImpl(newValue.trim())), new AsyncCallback<GenericResult>() {
+ dispatcher.execute(new CreateFolder(new IMAPFolder(newValue.trim())), new AsyncCallback<GenericResult>() {
public void onFailure(Throwable caught) {
GWT.log("Error while create folder", caught);
@@ -686,7 +681,7 @@ public class WestActivity extends Abstra
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolderImpl(user.getSettings().getInboxFolderName());;
+ folder = new IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
// showMessageTable(user, folder, searchValue);
}
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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -34,7 +34,6 @@ import org.apache.hupa.client.mvp.Messag
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.MessageDetails;
@@ -181,7 +180,7 @@ public class MainPresenter extends Widge
public void onEditEvent(EditEvent event) {
if (event.getEventType().equals(EditEvent.EventType.Stop)) {
- IMAPFolder iFolder = new IMAPFolderImpl((String) event.getOldValue());
+ IMAPFolder iFolder = new IMAPFolder((String) event.getOldValue());
final String newName = (String) event.getNewValue();
if (iFolder.getFullName().equalsIgnoreCase(newName) == false) {
dispatcher.execute(new RenameFolder(iFolder, newName), new HupaCallback<GenericResult>(dispatcher, eventBus) {
@@ -447,7 +446,7 @@ public class MainPresenter extends Widge
final IMAPTreeItem item = (IMAPTreeItem) event.getSource();
final String newValue = (String) event.getNewValue();
if (event.getEventType().equals(EditEvent.EventType.Stop)) {
- dispatcher.execute(new CreateFolder(new IMAPFolderImpl(newValue.trim())), new AsyncCallback<GenericResult>() {
+ dispatcher.execute(new CreateFolder(new IMAPFolder(newValue.trim())), new AsyncCallback<GenericResult>() {
public void onFailure(Throwable caught) {
GWT.log("Error while create folder", caught);
@@ -480,7 +479,7 @@ public class MainPresenter extends Widge
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolderImpl(user.getSettings().getInboxFolderName());;
+ folder = 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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -33,7 +33,6 @@ import org.apache.hupa.client.widgets.Co
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.User;
@@ -61,6 +60,7 @@ 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 IMAPFolderImpl(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+ IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -26,7 +26,6 @@ import net.customware.gwt.presenter.clie
import org.apache.hupa.client.HupaCallback;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.FolderSelectionEvent;
@@ -85,7 +84,7 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolderImpl(user.getSettings().getInboxFolderName());
+ folder = new IMAPFolder(user.getSettings().getInboxFolderName());
searchValue = null;
}
});
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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -25,7 +25,6 @@ import net.customware.gwt.dispatch.clien
import org.apache.hupa.client.evo.HupaEvoCallback;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.FolderSelectionEvent;
@@ -85,7 +84,7 @@ public class MessageTableModel extends M
public void onLogin(LoginEvent event) {
user = event.getUser();
- folder = new IMAPFolderImpl(user.getSettings().getInboxFolderName());
+ folder = 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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -90,7 +90,6 @@ import org.apache.hupa.client.widgets.Co
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.User;
@@ -500,7 +499,7 @@ public class WestView extends Composite
// Generate a new folder with a whitespace as name, this is needed as
// workaround
- IMAPFolder folder = new IMAPFolderImpl(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
+ IMAPFolder folder = new IMAPFolder(oldFolder.getFullName() + oldFolder.getDelimiter() + " ");
folder.setDelimiter(oldFolder.getDelimiter());
final IMAPTreeItem newItem = new IMAPTreeItem(folder);
Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java (original)
+++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java Thu Sep 12 02:13:01 2013
@@ -18,8 +18,7 @@
****************************************************************/
package org.apache.hupa.client.mvp;
-import java.util.ArrayList;
-import java.util.Arrays;
+import com.google.inject.Module;
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.dispatch.shared.Action;
@@ -27,12 +26,11 @@ import net.customware.gwt.presenter.clie
import org.apache.hupa.client.HupaCallback;
import org.apache.hupa.client.HupaMvpTestCase;
-import org.apache.hupa.client.guice.GuiceClientTestModule;
import org.apache.hupa.client.guice.GuiceMvpTestModule;
import org.apache.hupa.client.guice.GuiceMvpTestModule.DispatchTestAsync;
import org.apache.hupa.client.mvp.MessageSendPresenter.Type;
+import org.apache.hupa.client.guice.GuiceClientTestModule;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.SMTPMessage;
@@ -45,7 +43,8 @@ import org.apache.hupa.shared.rpc.ReplyM
import org.apache.hupa.shared.rpc.SendMessage;
import org.easymock.EasyMock;
-import com.google.inject.Module;
+import java.util.ArrayList;
+import java.util.Arrays;
public class MessageSendPresenterTest extends HupaMvpTestCase {
@@ -222,7 +221,7 @@ public class MessageSendPresenterTest ex
oldDetails.setText("Message");
oldDetails.setUid(0l);
- IMAPFolder folder = new IMAPFolderImpl();
+ IMAPFolder folder = new IMAPFolder();
folder.setFullName("FOLDER");
presenter.bind();
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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -40,7 +40,6 @@ import org.apache.hupa.server.IMAPStoreC
import org.apache.hupa.server.preferences.UserPreferencesStorage;
import org.apache.hupa.server.utils.MessageUtils;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.data.Tag;
import org.apache.hupa.shared.data.User;
@@ -65,7 +64,7 @@ public abstract class AbstractFetchMessa
User user = getUser();
IMAPFolder folder = action.getFolder();
if (folder == null) {
- folder = new IMAPFolderImpl(user.getSettings().getInboxFolderName());
+ folder = 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/FetchFoldersHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java?rev=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -32,7 +32,6 @@ 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.IMAPFolderImpl;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
@@ -128,7 +127,7 @@ public class FetchFoldersHandler extends
try {
logger.debug("Creating folder: " + fullName + " for user: " + getUser());
delimiter = String.valueOf(folder.getSeparator());
- iFolder = new IMAPFolderImpl(fullName);
+ iFolder = 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/service/IMAPFolderService.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java?rev=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -6,6 +6,7 @@ import java.util.Properties;
import javax.mail.Folder;
import javax.mail.MessagingException;
+import javax.mail.NoSuchProviderException;
import javax.mail.Session;
import javax.servlet.http.HttpSession;
@@ -13,7 +14,6 @@ import net.customware.gwt.dispatch.share
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.User;
import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
@@ -83,7 +83,7 @@ public class IMAPFolderService {
try {
System.out.println("Creating folder: " + fullName + " for user: ");
delimiter = String.valueOf(folder.getSeparator());
- iFolder = new IMAPFolderImpl(fullName);
+ iFolder = new IMAPFolder(fullName);
iFolder.setDelimiter(delimiter);
if("[Gmail]".equals(folder.getFullName()))
return iFolder;
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/CreateFolderHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.hupa.server.handler;
-import javax.mail.Folder;
-import javax.mail.MessagingException;
-
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.hupa.server.HupaGuiceTestCase;
@@ -28,10 +25,12 @@ import org.apache.hupa.server.mock.MockI
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.exception.InvalidSessionException;
import org.apache.hupa.shared.rpc.CreateFolder;
+import javax.mail.Folder;
+import javax.mail.MessagingException;
+
public class CreateFolderHandlerTest extends HupaGuiceTestCase {
public void testCreate() throws MessagingException {
@@ -76,7 +75,7 @@ public class CreateFolderHandlerTest ext
}
private IMAPFolder createFolder() {
- IMAPFolder folder = new IMAPFolderImpl();
+ IMAPFolder folder = new IMAPFolder();
folder.setFullName("NewFolder");
folder.setDelimiter(String.valueOf(MockIMAPFolder.SEPARATOR));
return folder;
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteFolderHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.hupa.server.handler;
-import javax.mail.Folder;
-import javax.mail.MessagingException;
-
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.hupa.server.HupaGuiceTestCase;
@@ -28,10 +25,12 @@ import org.apache.hupa.server.mock.MockI
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.exception.InvalidSessionException;
import org.apache.hupa.shared.rpc.DeleteFolder;
+import javax.mail.Folder;
+import javax.mail.MessagingException;
+
public class DeleteFolderHandlerTest extends HupaGuiceTestCase {
public void testDelete() throws MessagingException {
@@ -72,7 +71,7 @@ public class DeleteFolderHandlerTest ext
}
private IMAPFolder createFolder() {
- IMAPFolder folder = new IMAPFolderImpl();
+ IMAPFolder folder = new IMAPFolder();
folder.setFullName("NewFolder");
folder.setDelimiter(String.valueOf(MockIMAPFolder.SEPARATOR));
return folder;
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageByUidHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -19,26 +19,25 @@
package org.apache.hupa.server.handler;
-import java.util.ArrayList;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.mock.MockIMAPFolder;
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
+import java.util.ArrayList;
+
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
public class DeleteMessageByUidHandlerTest extends HupaGuiceTestCase {
public void testDeleteFolderNotExists() throws MessagingException {
- IMAPFolder folder = new IMAPFolderImpl();
+ IMAPFolder folder = new IMAPFolder();
folder.setFullName("NOT_EXISTS");
DeleteMessageByUid action = new DeleteMessageByUid(folder,new ArrayList<Long>());
try {
@@ -49,7 +48,7 @@ public class DeleteMessageByUidHandlerTe
}
public void testDeleteFolderExistsAndNotTrash() throws MessagingException {
- IMAPFolder folder = new IMAPFolderImpl();
+ IMAPFolder folder = new IMAPFolder();
folder.setFullName("EXISTS");
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
store.clear();
@@ -78,7 +77,7 @@ public class DeleteMessageByUidHandlerTe
}
public void testDeleteFolderExistsAndIsTrash() throws MessagingException {
- IMAPFolder folder = new IMAPFolderImpl();
+ IMAPFolder folder = new IMAPFolder();
folder.setFullName(testUser.getSettings().getTrashFolderName());
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -19,22 +19,21 @@
package org.apache.hupa.server.handler;
+import org.apache.hupa.server.HupaGuiceTestCase;
+import org.apache.hupa.server.mock.MockIMAPFolder;
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.rpc.FetchMessages;
+import org.apache.hupa.shared.rpc.FetchMessagesResult;
+
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import javax.mail.Flags;
-import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
+import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
-import org.apache.hupa.server.HupaGuiceTestCase;
-import org.apache.hupa.server.mock.MockIMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
-import org.apache.hupa.shared.rpc.FetchMessages;
-import org.apache.hupa.shared.rpc.FetchMessagesResult;
-
public class FetchMessagesHandlerTest extends HupaGuiceTestCase {
public void testConvert() throws Exception {
@@ -71,7 +70,7 @@ public class FetchMessagesHandlerTest ex
MockIMAPFolder serverfolder = (MockIMAPFolder)store.getFolder("WHATEVER");
serverfolder.create(Folder.HOLDS_MESSAGES);
- IMAPFolder clientfolder = new IMAPFolderImpl("WHATEVER");
+ IMAPFolder clientfolder = new IMAPFolder("WHATEVER");
FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
assertEquals(0, result.getRealCount());
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FowardMessageHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -27,7 +27,6 @@ import org.apache.hupa.server.mock.MockI
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.rpc.ForwardMessage;
@@ -52,7 +51,7 @@ public class FowardMessageHandlerTest ex
message = inbox.getMessageByUID(msgUid);
assertNotNull(message);
- IMAPFolder ifolder = new IMAPFolderImpl(inbox.getFullName());
+ IMAPFolder ifolder = new IMAPFolder(inbox.getFullName());
SMTPMessage smtpmsg = TestUtils.createMockSMTPMessage(registry, 2);
ForwardMessage action = new ForwardMessage(smtpmsg, ifolder, msgUid);
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -19,17 +19,17 @@
package org.apache.hupa.server.handler;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.internet.MimeMessage;
+import com.sun.mail.imap.IMAPFolder;
+import com.sun.mail.imap.IMAPStore;
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.data.MessageDetails;
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.internet.MimeMessage;
public class GetMessageDetailsHandlerTest extends HupaGuiceTestCase {
@@ -182,7 +182,7 @@ public class GetMessageDetailsHandlerTes
MimeMessage msg = TestUtils.loadMessageFromFile(session,"7.msg");
serverfolder.addMessages(new Message[]{msg});
- org.apache.hupa.shared.data.IMAPFolder clientfolder = new org.apache.hupa.shared.data.IMAPFolderImpl("WHATEVER");
+ org.apache.hupa.shared.data.IMAPFolder clientfolder = new org.apache.hupa.shared.data.IMAPFolder("WHATEVER");
MessageDetails details = getDetailsHandler.exposeMessage(testUser, clientfolder, 0);
// inline images have to be downloaded from the server
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/HandlersTest.java Thu Sep 12 02:13:01 2013
@@ -29,8 +29,8 @@ import net.customware.gwt.dispatch.share
import org.apache.hupa.server.HupaGuiceTestCase;
import org.apache.hupa.server.guice.GuiceServerTestModule;
+import org.apache.hupa.server.guice.providers.LogProvider;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.FetchFolders;
@@ -74,7 +74,7 @@ public class HandlersTest extends HupaGu
IMAPStore store = storeCache.get(testUser);
String folderName = testUser.getSettings().getInboxFolderName();
- IMAPFolder sFolder = new IMAPFolderImpl();
+ IMAPFolder sFolder = new IMAPFolder();
sFolder.setFullName(folderName);
com.sun.mail.imap.IMAPFolder f1 = (com.sun.mail.imap.IMAPFolder)store.getFolder(sFolder.getFullName());
@@ -98,7 +98,7 @@ public class HandlersTest extends HupaGu
IMAPStore store = storeCache.get(testUser);
String folderName = testUser.getSettings().getInboxFolderName() + store.getDefaultFolder().getSeparator() + "newFolder";
- IMAPFolder sFolder = new IMAPFolderImpl();
+ IMAPFolder sFolder = new IMAPFolder();
sFolder.setFullName(folderName);
Folder f1 = store.getFolder(sFolder.getFullName());
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ReplyMessageHandlerTest.java Thu Sep 12 02:13:01 2013
@@ -26,7 +26,7 @@ import org.apache.hupa.server.mock.MockI
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.server.utils.TestUtils;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
+import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.rpc.ReplyMessage;
@@ -65,7 +65,7 @@ public class ReplyMessageHandlerTest ext
// Create a reply user action with an uploaded message
SMTPMessage smtpmsg = TestUtils.createMockSMTPMessage(registry, 1);
- ReplyMessage action = new ReplyMessage(smtpmsg, new IMAPFolderImpl(inbox.getFullName()), msgUid);
+ ReplyMessage action = new ReplyMessage(smtpmsg, new IMAPFolder(inbox.getFullName()), msgUid);
message = reMsgHndl.createMessage(session, action);
message = reMsgHndl.fillBody(message, action);
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InImapUserPreferencesStorageTest.java Thu Sep 12 02:13:01 2013
@@ -31,7 +31,6 @@ import org.apache.hupa.server.guice.prov
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -135,7 +134,7 @@ public class InImapUserPreferencesStorag
assertTrue(folder.getMessageCount() == 0);
// Fetch inbox messages
- IMAPFolder cFolder = new IMAPFolderImpl(testUser.getSettings().getInboxFolderName());
+ IMAPFolder cFolder = new IMAPFolder(testUser.getSettings().getInboxFolderName());
FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(cFolder, 0, 10, null), null);
// Could be possible that there insn't any message in inbox
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InSessionUserPreferencesStorageTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InSessionUserPreferencesStorageTest.java?rev=1522127&r1=1522126&r2=1522127&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InSessionUserPreferencesStorageTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/preferences/InSessionUserPreferencesStorageTest.java Thu Sep 12 02:13:01 2013
@@ -25,7 +25,6 @@ import org.apache.hupa.server.handler.Fe
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.server.utils.TestUtils;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPFolderImpl;
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchMessages;
@@ -45,7 +44,7 @@ public class InSessionUserPreferencesSto
FetchFoldersHandler fetchFoldersHandler = injector.getInstance(FetchFoldersHandler.class);
fetchFoldersHandler.execute(new FetchFolders(), null);
- IMAPFolder folder = new IMAPFolderImpl(testUser.getSettings().getInboxFolderName());
+ IMAPFolder folder = new IMAPFolder(testUser.getSettings().getInboxFolderName());
FetchMessagesHandler fetchMessagesHandler = injector.getInstance(FetchMessagesHandler.class);
FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(folder, 0, 10, null), null);
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=1522127&r1=1522126&r2=1522127&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:13:01 2013
@@ -19,19 +19,69 @@
package org.apache.hupa.shared.data;
+import java.io.Serializable;
import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
-import org.apache.hupa.shared.rf.Entity;
+import javax.servlet.http.HttpSession;
+
+import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
/**
* IMAPFolder
*
*/
-public interface IMAPFolder extends Entity{
-
- public void setSubscribed(boolean subscribed);
+public class IMAPFolder implements Serializable {
+
+ private Long id;
+ private Long version;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getVersion() {
+ return version;
+ }
+
+ public void setVersion(Long version) {
+ this.version = version;
+ }
+
+
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2084188092060266479L;
+
+ private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
+ private String fullName;
+ private String delimiter;
+ private int msgCount;
+ private int unseenMsgCount;
+ private boolean subscribed = false;
+
+ public IMAPFolder() {
+ }
+
+ public IMAPFolder(String fullName) {
+ setFullName(fullName);
+ }
+
+ public void setSubscribed(boolean subscribed) {
+ this.subscribed = subscribed;
+ }
- public boolean getSubscribed();
+ public boolean getSubscribed() {
+ return subscribed;
+ }
/**
@@ -39,76 +89,123 @@ public interface IMAPFolder extends Enti
*
* @return name
*/
- public String getName();
+ public String getName() {
+ if (delimiter != null) {
+ String fParts[] = getFullName().split("\\" + delimiter);
+ if (fParts != null && fParts.length > 0) {
+ return fParts[fParts.length - 1];
+ }
+ }
+ return fullName;
+ }
/**
* Set the child folders
*
* @param childs
*/
- public void setChildIMAPFolders(ArrayList<IMAPFolder> childs);
+ public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
+ this.childs = childs;
+ }
/**
* Return the childs of this folder
*
* @return childs
*/
- public ArrayList<IMAPFolder> getChildIMAPFolders();
+ public ArrayList<IMAPFolder> getChildIMAPFolders() {
+ return childs;
+ }
/**
* Return the full name of the folder. This include the full path
* @return Full name of the folder
*/
- public String getFullName();
+ public String getFullName() {
+ return fullName;
+ }
/**
* Set the full name of the folder
*
* @param fullName
*/
- public void setFullName(String fullName);
+ public void setFullName(String fullName) {
+ this.fullName = fullName;
+ }
/**
* Set the delimiter which is used to seperate folders
*
* @param delimiter
*/
- public void setDelimiter(String delimiter) ;
+ public void setDelimiter(String delimiter) {
+ this.delimiter = delimiter;
+ }
/**
* Return the delimiter
*
* @return delimiter
*/
- public String getDelimiter();
+ public String getDelimiter() {
+ return delimiter;
+ }
/**
* Return the total message count of the messages that exists within this folder
*
* @return msgCount
*/
- public int getMessageCount();
+ public int getMessageCount() {
+ return msgCount;
+ }
/**
* Set total message count
*
* @param msgCount
*/
- public void setMessageCount(int msgCount);
+ public void setMessageCount(int msgCount) {
+ this.msgCount = msgCount;
+ }
/**
* Set the count of all unseen messages within this folder
*
* @param unseenMsgCount
*/
- public void setUnseenMessageCount(int unseenMsgCount) ;
+ public void setUnseenMessageCount(int unseenMsgCount) {
+ this.unseenMsgCount = unseenMsgCount;
+ }
/**
* Return the unseen message count
*
* @return unseenMsgCount
*/
- public int getUnseeMessageCount() ;
-
+ public int getUnseeMessageCount() {
+ return unseenMsgCount;
+ }
+
+ @Override
+ public String toString() {
+ return getFullName();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof IMAPFolder) {
+ if (((IMAPFolder) o).getFullName().equals(getFullName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return getFullName().hashCode();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org