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:55:38 UTC
svn commit: r1522154 [2/3] - 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/...
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.widgets;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -182,6 +183,10 @@ import org.apache.hupa.shared.data.IMAPF
=======
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.data.ImapFolderImpl;
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
@@ -439,7 +444,7 @@ public class IMAPTreeItem extends Editab
protected String oldFullName;
protected String oldName;
- public IMAPTreeItem(IMAPFolderProxy folder) {
+ public IMAPTreeItem(ImapFolder folder) {
setUserObject(folder);
setFolderText(folder);
}
@@ -462,7 +467,7 @@ public class IMAPTreeItem extends Editab
}
public void setUnseenMessageCount(int cound) {
- IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ ImapFolder folder = (ImapFolder) getUserObject();
int count = folder.getUnseenMessageCount();
folder.setUnseenMessageCount(count);
setFolderText(folder);
@@ -473,7 +478,7 @@ public class IMAPTreeItem extends Editab
* Decrease the unseen messagecount of this folder
*/
public void descreaseUnseenMessageCount(int decreaseCount) {
- IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ ImapFolder folder = (ImapFolder) getUserObject();
int count = folder.getUnseenMessageCount();
if (count > 0) {
count = count - decreaseCount;
@@ -495,21 +500,21 @@ public class IMAPTreeItem extends Editab
* Increase the unseen messagecount of this folder
*/
public void increaseUnseenMessageCount(int increaseCount) {
- IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ ImapFolder folder = (ImapFolder) getUserObject();
int count = folder.getUnseenMessageCount();
count = count + increaseCount;
folder.setUnseenMessageCount(count);
setFolderText(folder);
}
- private void setFolderText(IMAPFolderProxy folder) {
+ private void setFolderText(ImapFolder folder) {
setText(getFolderName(folder));
setUnseenMessageCountStyle(folder);
}
- private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
+ private void setUnseenMessageCountStyle(ImapFolder folder) {
boolean containsUnseen = (folder.getUnseenMessageCount() > 0);
- for (IMAPFolderProxy fold : folder.getChildren()) {
+ for (ImapFolder fold : folder.getChildren()) {
if (fold.getUnseenMessageCount() > 0) {
containsUnseen = true;
break;
@@ -529,7 +534,7 @@ public class IMAPTreeItem extends Editab
* @param folder
* @return name
*/
- private String getFolderName(IMAPFolderProxy folder) {
+ private String getFolderName(ImapFolder folder) {
if (folder.getUnseenMessageCount() > 0) {
return folder.getName() + " (" + folder.getUnseenMessageCount() + ")";
}
@@ -538,17 +543,17 @@ public class IMAPTreeItem extends Editab
@Override
public void setUserObject(Object obj) {
- if ((obj instanceof IMAPFolderProxy) == false) {
+ if ((obj instanceof ImapFolder) == false) {
throw new IllegalArgumentException("UserObject needs to be an instance of IMAPFolder");
}
- setFolderText((IMAPFolderProxy) obj);
+ setFolderText((ImapFolder) obj);
super.setUserObject(obj);
}
@Override
public void startEdit() {
- IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ ImapFolder folder = (ImapFolder) getUserObject();
oldFullName = folder.getFullName();
oldName = folder.getName();
showEditBox(oldName);
@@ -557,7 +562,7 @@ public class IMAPTreeItem extends Editab
@Override
public void cancelEdit() {
- IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+ ImapFolder folder = ((ImapFolder) getUserObject());
folder.setFullName(oldFullName);
showItem(getFolderName(folder));
@@ -574,7 +579,7 @@ public class IMAPTreeItem extends Editab
String newFolderName = editBox.getText();
String newFullFolderName = oldFullName.substring(0, oldFullName.length() - oldName.length())
+ newFolderName;
- IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+ ImapFolder folder = ((ImapFolder) getUserObject());
folder.setFullName(newFullFolderName);
showItem(getFolderName(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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -30,7 +30,7 @@ import org.apache.hupa.client.guice.Guic
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;
@@ -221,7 +221,7 @@ public class MessageSendPresenterTest ex
oldDetails.setText("Message");
oldDetails.setUid(0l);
- IMAPFolder folder = new IMAPFolder();
+ ImapFolderImpl folder = new ImapFolderImpl();
folder.setFullName("FOLDER");
presenter.bind();
Modified: james/hupa/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Thu Sep 12 02:55:36 2013
@@ -126,14 +126,20 @@
<dependency>
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
</dependency>
<dependency>
+<<<<<<< HEAD
=======
>>>>>>> constantly changed by manolo
=======
>>>>>>> constantly changed by manolo
+=======
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -32,12 +32,16 @@ import org.apache.hupa.server.IMAPStoreC
import org.apache.hupa.shared.data.User;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
=======
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -67,6 +71,7 @@ public abstract class AbstractDeleteMess
ExecutionContext context) throws ActionException {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
org.apache.hupa.shared.data.IMAPFolder folder = action.getFolder();
@@ -74,6 +79,9 @@ public abstract class AbstractDeleteMess
=======
IMAPFolderProxy folder = action.getFolder();
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ ImapFolder folder = action.getFolder();
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -62,11 +62,11 @@ import org.apache.hupa.server.preference
<<<<<<< HEAD
<<<<<<< HEAD
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;
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+import org.apache.hupa.shared.proxy.ImapFolder;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -119,6 +119,7 @@ public abstract class AbstractFetchMessa
User user = getUser();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
if (folder == null) {
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
@@ -132,6 +133,11 @@ public abstract class AbstractFetchMessa
if (folder == null) {
folder = (IMAPFolderProxy)new IMAPFolder(user.getSettings().getInboxFolderName());
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ ImapFolder folder = action.getFolder();
+ if (folder == null) {
+ folder = (ImapFolder)new ImapFolderImpl(user.getSettings().getInboxFolderName());
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
}
com.sun.mail.imap.IMAPFolder f = null;
int start = action.getStart();
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/CreateFolderHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/CreateFolderHandler.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/CreateFolderHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/CreateFolderHandler.java Thu Sep 12 02:55:36 2013
@@ -27,7 +27,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.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -53,7 +53,7 @@ public class CreateFolderHandler extends
protected GenericResult executeInternal(CreateFolder action,
ExecutionContext context) throws ActionException {
User user = getUser();
- IMAPFolder folder = action.getFolder();
+ ImapFolderImpl folder = action.getFolder();
try {
IMAPStore store = cache.get(user);
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -30,6 +30,7 @@ import org.apache.hupa.server.IMAPStoreC
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -39,6 +40,9 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -65,6 +69,7 @@ public class DeleteFolderHandler extends
User user = getUser();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
IMAPFolder folder = action.getFolder();
@@ -72,6 +77,9 @@ public class DeleteFolderHandler extends
=======
IMAPFolderProxy folder = action.getFolder();
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ ImapFolder folder = action.getFolder();
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -33,6 +33,7 @@ import org.apache.hupa.server.IMAPStoreC
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -42,6 +43,9 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.DeleteMessageByUid;
import com.google.inject.Inject;
@@ -75,6 +79,7 @@ public class DeleteMessageByUidHandler e
throws ActionException {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
IMAPFolder folder = action.getFolder();
@@ -82,6 +87,9 @@ public class DeleteMessageByUidHandler e
=======
IMAPFolderProxy folder = action.getFolder();
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ ImapFolder folder = action.getFolder();
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -31,16 +31,20 @@ 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;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
>>>>>>> first commit
=======
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
@@ -75,6 +79,7 @@ public class FetchFoldersHandler extends
// List of mail 'root' imap folders
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
List<IMAPFolderProxy> imapFolders = new ArrayList<IMAPFolderProxy>();
// Create IMAPFolder tree list
@@ -94,6 +99,13 @@ public class FetchFoldersHandler extends
for (Folder f : folder.list()) {
IMAPFolderProxy imapFolder = createIMAPFolder(f);
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ List<ImapFolder> imapFolders = new ArrayList<ImapFolder>();
+
+ // Create IMAPFolder tree list
+ for (Folder f : folder.list()) {
+ ImapFolder imapFolder = createIMAPFolder(f);
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
imapFolders.add(imapFolder);
walkFolders(f, imapFolder);
}
@@ -121,6 +133,7 @@ public class FetchFoldersHandler extends
*/
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private void walkFolders(Folder folder, IMAPFolderProxy imapFolder) throws ActionException, MessagingException{
for (Folder f : folder.list()) {
IMAPFolderProxy iFolder = createIMAPFolder(f);
@@ -137,6 +150,11 @@ public class FetchFoldersHandler extends
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
imapFolder.getChildIMAPFolders().add(iFolder);
=======
+=======
+ private void walkFolders(Folder folder, ImapFolder imapFolder) throws ActionException, MessagingException{
+ for (Folder f : folder.list()) {
+ ImapFolder iFolder = createIMAPFolder(f);
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
imapFolder.getChildren().add(iFolder);
>>>>>>>
walkFolders(f, iFolder);
@@ -160,6 +178,7 @@ public class FetchFoldersHandler extends
*/
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy createIMAPFolder(Folder folder) throws ActionException {
String fullName = folder.getFullName();
@@ -179,12 +198,20 @@ public class FetchFoldersHandler extends
String delimiter;
IMAPFolderProxy iFolder = null;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ private ImapFolder createIMAPFolder(Folder folder) throws ActionException {
+
+ String fullName = folder.getFullName();
+ String delimiter;
+ ImapFolder iFolder = null;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
try {
logger.debug("Creating folder: " + fullName + " for user: " + getUser());
delimiter = String.valueOf(folder.getSeparator());
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
iFolder = (IMAPFolderProxy)new IMAPFolder(fullName);
=======
iFolder = new IMAPFolder(fullName);
@@ -192,6 +219,9 @@ public class FetchFoldersHandler extends
=======
iFolder = (IMAPFolderProxy)new IMAPFolder(fullName);
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ iFolder = (ImapFolder)new ImapFolderImpl(fullName);
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -91,6 +91,7 @@ import org.apache.hupa.server.IMAPStoreC
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import static org.apache.hupa.server.utils.RegexPatterns.*;
@@ -105,6 +106,9 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.GetMessageDetails;
import org.apache.hupa.shared.rpc.GetMessageDetailsResult;
@@ -145,6 +149,7 @@ public class GetMessageDetailsHandler ex
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
protected MessageDetails exposeMessage(User user, IMAPFolderProxy folder,
=======
protected MessageDetails exposeMessage(User user, IMAPFolder folder,
@@ -152,6 +157,9 @@ public class GetMessageDetailsHandler ex
=======
protected MessageDetails exposeMessage(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.
+=======
+ protected MessageDetails exposeMessage(User user, ImapFolder folder,
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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/GetRawMessageHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetRawMessageHandler.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetRawMessageHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetRawMessageHandler.java Thu Sep 12 02:55:36 2013
@@ -52,7 +52,7 @@ public class GetRawMessageHandler extend
ExecutionContext context) throws ActionException {
User user = getUser();
long uid = action.getUid();
- org.apache.hupa.shared.data.IMAPFolder folder = action.getFolder();
+ org.apache.hupa.shared.data.ImapFolderImpl folder = action.getFolder();
try {
IMAPStore store = cache.get(user);
IMAPFolder f = (IMAPFolder) store.getFolder(folder.getFullName());
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/RenameFolderHandler.java Thu Sep 12 02:55:36 2013
@@ -27,7 +27,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.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.GenericResult;
import org.apache.hupa.shared.rpc.RenameFolder;
@@ -55,7 +55,7 @@ public class RenameFolderHandler extends
protected GenericResult executeInternal(RenameFolder action,
ExecutionContext context) throws ActionException {
User user = getUser();
- IMAPFolder folder = action.getFolder();
+ ImapFolderImpl folder = action.getFolder();
String newName = action.getNewName();
try {
IMAPStore store = cache.get(user);
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -57,8 +57,12 @@ import org.apache.hupa.shared.data.User;
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.GenericResult;
import org.apache.hupa.shared.rpc.SetFlag;
@@ -80,6 +84,7 @@ public class SetFlagsHandler extends Abs
User user = getUser();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
IMAPFolder folder = action.getFolder();
@@ -87,6 +92,9 @@ public class SetFlagsHandler extends Abs
=======
IMAPFolderProxy folder = action.getFolder();
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ ImapFolder folder = action.getFolder();
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
ArrayList<Long> uids = action.getUids();
com.sun.mail.imap.IMAPFolder f = null;
try {
Copied: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java (from r1522153, 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?p2=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java&p1=james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java&r1=1522153&r2=1522154&rev=1522154&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:55:36 2013
@@ -6,20 +6,20 @@ 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;
import net.customware.gwt.dispatch.shared.ActionException;
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 org.apache.hupa.shared.proxy.ImapFolder;
import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
import com.sun.mail.imap.IMAPStore;
-public class IMAPFolderService {
+public class ImapFolderService {
private static boolean useSSL = true;
@@ -27,7 +27,7 @@ public class IMAPFolderService {
return s;
}
- public static List<IMAPFolder> requestFolders() throws MessagingException, ActionException{
+ public static List<ImapFolder> requestFolders() throws MessagingException, ActionException{
HttpSession session = RequestFactoryServlet.getThreadLocalRequest().getSession();
Session mailSession = Session.getDefaultInstance(new Properties(), null);
IMAPStore store = (IMAPStore)mailSession.getStore(useSSL ? "imaps" : "imap");
@@ -39,11 +39,11 @@ public class IMAPFolderService {
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<ImapFolder> imapFolders = new ArrayList<ImapFolder>();
// Create IMAPFolder tree list
for (Folder f : folder.list()) {
- IMAPFolder imapFolder = createIMAPFolder(f);
+ ImapFolder imapFolder = createIMAPFolder(f);
imapFolders.add(imapFolder);
walkFolders(f, imapFolder);
}
@@ -58,9 +58,9 @@ public class IMAPFolderService {
* @throws ActionException If an error occurs
* @throws MessagingException If an error occurs
*/
- private static void walkFolders(Folder folder, IMAPFolder imapFolder) throws MessagingException{
+ private static void walkFolders(Folder folder, ImapFolder imapFolder) throws MessagingException{
for (Folder f : folder.list()) {
- IMAPFolder iFolder = createIMAPFolder(f);
+ ImapFolder iFolder = createIMAPFolder(f);
imapFolder.getChildren().add(iFolder);
walkFolders(f, iFolder);
}
@@ -74,16 +74,16 @@ public class IMAPFolderService {
* @throws ActionException If an error occurs
* @throws MessagingException If an error occurs
*/
- private static IMAPFolder createIMAPFolder(Folder folder){
+ private static ImapFolder createIMAPFolder(Folder folder){
String fullName = folder.getFullName();
String delimiter;
- IMAPFolder iFolder = null;
+ ImapFolder iFolder = null;
try {
System.out.println("Creating folder: " + fullName + " for user: ");
delimiter = String.valueOf(folder.getSeparator());
- iFolder = new IMAPFolder(fullName);
+ iFolder = (ImapFolder)new ImapFolderImpl(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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -24,7 +24,7 @@ import org.apache.hupa.server.HupaGuiceT
import org.apache.hupa.server.mock.MockIMAPFolder;
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;
@@ -34,7 +34,7 @@ import javax.mail.MessagingException;
public class CreateFolderHandlerTest extends HupaGuiceTestCase {
public void testCreate() throws MessagingException {
- IMAPFolder folder = createFolder();
+ ImapFolderImpl folder = createFolder();
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Folder f1 = store.getFolder(folder.getFullName());
assertFalse("not exists",f1.exists());
@@ -50,7 +50,7 @@ public class CreateFolderHandlerTest ext
}
public void testDuplicateFolder() throws MessagingException {
- IMAPFolder folder = createFolder();
+ ImapFolderImpl folder = createFolder();
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Folder f1 = store.getFolder(folder.getFullName());
f1.create(Folder.HOLDS_FOLDERS);
@@ -63,7 +63,7 @@ public class CreateFolderHandlerTest ext
public void testInvalidSessionId() {
httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
- IMAPFolder folder = createFolder();
+ ImapFolderImpl folder = createFolder();
try {
createFolderHandler.execute(new CreateFolder(folder), null);
fail("Invalid session");
@@ -74,8 +74,8 @@ public class CreateFolderHandlerTest ext
}
}
- private IMAPFolder createFolder() {
- IMAPFolder folder = new IMAPFolder();
+ private ImapFolderImpl createFolder() {
+ ImapFolderImpl folder = new ImapFolderImpl();
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -24,7 +24,7 @@ import org.apache.hupa.server.HupaGuiceT
import org.apache.hupa.server.mock.MockIMAPFolder;
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;
@@ -34,7 +34,7 @@ import javax.mail.MessagingException;
public class DeleteFolderHandlerTest extends HupaGuiceTestCase {
public void testDelete() throws MessagingException {
- IMAPFolder folder = createFolder();
+ ImapFolderImpl folder = createFolder();
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Folder f1 = store.getFolder(folder.getFullName());
f1.create(Folder.HOLDS_FOLDERS);
@@ -49,7 +49,7 @@ public class DeleteFolderHandlerTest ext
}
public void testDeleteNonExistFolder() throws MessagingException {
- IMAPFolder folder = createFolder();
+ ImapFolderImpl folder = createFolder();
try {
deleteFolderHandler.execute(new DeleteFolder(folder), null);
fail("Folder should not exist");
@@ -59,7 +59,7 @@ public class DeleteFolderHandlerTest ext
public void testInvalidSessionId() {
httpSession.removeAttribute(SConsts.USER_SESS_ATTR);
- IMAPFolder folder = createFolder();
+ ImapFolderImpl folder = createFolder();
try {
deleteFolderHandler.execute(new DeleteFolder(folder), null);
fail("Invalid session");
@@ -70,8 +70,8 @@ public class DeleteFolderHandlerTest ext
}
}
- private IMAPFolder createFolder() {
- IMAPFolder folder = new IMAPFolder();
+ private ImapFolderImpl createFolder() {
+ ImapFolderImpl folder = new ImapFolderImpl();
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -24,7 +24,7 @@ import net.customware.gwt.dispatch.share
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;
@@ -37,7 +37,7 @@ import javax.mail.internet.MimeMessage;
public class DeleteMessageByUidHandlerTest extends HupaGuiceTestCase {
public void testDeleteFolderNotExists() throws MessagingException {
- IMAPFolder folder = new IMAPFolder();
+ ImapFolderImpl folder = new ImapFolderImpl();
folder.setFullName("NOT_EXISTS");
DeleteMessageByUid action = new DeleteMessageByUid(folder,new ArrayList<Long>());
try {
@@ -48,7 +48,7 @@ public class DeleteMessageByUidHandlerTe
}
public void testDeleteFolderExistsAndNotTrash() throws MessagingException {
- IMAPFolder folder = new IMAPFolder();
+ ImapFolderImpl folder = new ImapFolderImpl();
folder.setFullName("EXISTS");
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
store.clear();
@@ -77,7 +77,7 @@ public class DeleteMessageByUidHandlerTe
}
public void testDeleteFolderExistsAndIsTrash() throws MessagingException {
- IMAPFolder folder = new IMAPFolder();
+ ImapFolderImpl folder = new ImapFolderImpl();
folder.setFullName(testUser.getSettings().getTrashFolderName());
MockIMAPStore store = (MockIMAPStore) storeCache.get(testUser);
Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchFoldersHandlerTest.java Thu Sep 12 02:55:36 2013
@@ -25,7 +25,7 @@ import org.apache.hupa.server.HupaGuiceT
import org.apache.hupa.server.mock.MockIMAPFolder;
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.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -21,7 +21,7 @@ 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.data.ImapFolderImpl;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -110,7 +110,7 @@ public class FetchMessagesHandlerTest ex
MockIMAPFolder serverfolder = (MockIMAPFolder)store.getFolder("WHATEVER");
serverfolder.create(Folder.HOLDS_MESSAGES);
- IMAPFolder clientfolder = new IMAPFolder("WHATEVER");
+ ImapFolderImpl clientfolder = new ImapFolderImpl("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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -26,7 +26,7 @@ import org.apache.hupa.server.HupaGuiceT
import org.apache.hupa.server.mock.MockIMAPFolder;
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;
@@ -51,7 +51,7 @@ public class FowardMessageHandlerTest ex
message = inbox.getMessageByUID(msgUid);
assertNotNull(message);
- IMAPFolder ifolder = new IMAPFolder(inbox.getFullName());
+ ImapFolderImpl ifolder = new ImapFolderImpl(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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -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.IMAPFolder("WHATEVER");
+ org.apache.hupa.shared.data.ImapFolderImpl clientfolder = new org.apache.hupa.shared.data.ImapFolderImpl("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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -51,8 +51,12 @@ import org.apache.hupa.server.guice.prov
>>>>>>> first commit
=======
import org.apache.hupa.server.guice.providers.LogProvider;
+<<<<<<< HEAD
>>>>>>> constantly changed by manolo
import org.apache.hupa.shared.data.IMAPFolder;
+=======
+import org.apache.hupa.shared.data.ImapFolderImpl;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.FetchFolders;
@@ -123,7 +127,7 @@ public class HandlersTest extends HupaGu
IMAPStore store = storeCache.get(testUser);
String folderName = testUser.getSettings().getInboxFolderName();
- IMAPFolder sFolder = new IMAPFolder();
+ ImapFolderImpl sFolder = new ImapFolderImpl();
sFolder.setFullName(folderName);
com.sun.mail.imap.IMAPFolder f1 = (com.sun.mail.imap.IMAPFolder)store.getFolder(sFolder.getFullName());
@@ -167,7 +171,7 @@ public class HandlersTest extends HupaGu
IMAPStore store = storeCache.get(testUser);
String folderName = testUser.getSettings().getInboxFolderName() + store.getDefaultFolder().getSeparator() + "newFolder";
- IMAPFolder sFolder = new IMAPFolder();
+ ImapFolderImpl sFolder = new ImapFolderImpl();
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=1522154&r1=1522153&r2=1522154&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:55:36 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.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
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 IMAPFolder(inbox.getFullName()), msgUid);
+ ReplyMessage action = new ReplyMessage(smtpmsg, new ImapFolderImpl(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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -69,7 +69,7 @@ import org.apache.hupa.server.guice.prov
>>>>>>> constantly changed by manolo
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;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -235,7 +235,7 @@ public class InImapUserPreferencesStorag
assertTrue(folder.getMessageCount() == 0);
// Fetch inbox messages
- IMAPFolder cFolder = new IMAPFolder(testUser.getSettings().getInboxFolderName());
+ ImapFolderImpl cFolder = new ImapFolderImpl(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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -24,7 +24,7 @@ import org.apache.hupa.server.handler.Fe
import org.apache.hupa.server.handler.FetchMessagesHandler;
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;
@@ -44,7 +44,7 @@ public class InSessionUserPreferencesSto
FetchFoldersHandler fetchFoldersHandler = injector.getInstance(FetchFoldersHandler.class);
fetchFoldersHandler.execute(new FetchFolders(), null);
- IMAPFolder folder = new IMAPFolder(testUser.getSettings().getInboxFolderName());
+ ImapFolderImpl folder = new ImapFolderImpl(testUser.getSettings().getInboxFolderName());
FetchMessagesHandler fetchMessagesHandler = injector.getInstance(FetchMessagesHandler.class);
FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(folder, 0, 10, null), null);
Copied: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java (from r1522153, 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/ImapFolderImpl.java?p2=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java&p1=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java&r1=1522153&r2=1522154&rev=1522154&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/ImapFolderImpl.java Thu Sep 12 02:55:36 2013
@@ -25,6 +25,7 @@ import java.util.ArrayList;
<<<<<<< HEAD
import java.util.List;
+<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
import org.apache.hupa.shared.rf.EntityBase;
=======
>>>>>>> first commit
@@ -39,11 +40,15 @@ import com.google.web.bindery.requestfac
=======
import org.apache.hupa.shared.rf.EntityBase;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
/**
* IMAPFolder
*
*/
+<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -107,6 +112,9 @@ public class IMAPFolder extends EntityBa
}
+=======
+public class ImapFolderImpl implements ImapFolder {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
/**
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
@@ -114,6 +122,7 @@ public class IMAPFolder extends EntityBa
*/
private static final long serialVersionUID = 2084188092060266479L;
+<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -127,16 +136,19 @@ public class IMAPFolder extends EntityBa
=======
private List<IMAPFolder> children = new ArrayList<IMAPFolder>();
>>>>>>>
+=======
+ private List<ImapFolder> children = new ArrayList<ImapFolder>();
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
private String fullName;
private String delimiter;
private int messageCount;
private int unseenMessageCount;
private boolean subscribed = false;
- public IMAPFolder() {
+ public ImapFolderImpl() {
}
- public IMAPFolder(String fullName) {
+ public ImapFolderImpl(String fullName) {
setFullName(fullName);
}
@@ -169,6 +181,7 @@ public class IMAPFolder extends EntityBa
*
* @param children
*/
+<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -182,6 +195,9 @@ public class IMAPFolder extends EntityBa
this.childs = childs;
=======
public void setChildren(List<IMAPFolder> children) {
+=======
+ public void setChildren(List<ImapFolder> children) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
this.children = children;
>>>>>>>
}
@@ -191,6 +207,7 @@ public class IMAPFolder extends EntityBa
*
* @return childs
*/
+<<<<<<< HEAD:shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -204,6 +221,9 @@ public class IMAPFolder extends EntityBa
return childs;
=======
public List<IMAPFolder> getChildren() {
+=======
+ public List<ImapFolder> getChildren() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java
return children;
>>>>>>>
}
@@ -286,8 +306,8 @@ public class IMAPFolder extends EntityBa
@Override
public boolean equals(Object o) {
- if (o instanceof IMAPFolder) {
- if (((IMAPFolder) o).getFullName().equals(getFullName())) {
+ if (o instanceof ImapFolder) {
+ if (((ImapFolder) o).getFullName().equals(getFullName())) {
return true;
}
}
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -31,6 +31,7 @@ import org.apache.hupa.shared.data.User;
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
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.
=======
@@ -41,6 +42,9 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -52,6 +56,7 @@ public class DecreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -65,13 +70,17 @@ public class DecreaseUnseenEvent extends
=======
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 ImapFolder folder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
private int amount;
- public DecreaseUnseenEvent(User user, IMAPFolderProxy folder) {
+ public DecreaseUnseenEvent(User user, ImapFolder folder) {
this(user, folder, 1);
}
<<<<<<< HEAD
+<<<<<<< HEAD
public DecreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
>>>>>>> first commit
=======
@@ -94,6 +103,9 @@ public class DecreaseUnseenEvent extends
=======
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.
+=======
+ public DecreaseUnseenEvent(User user, ImapFolder folder, int amount) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.user =user;
this.folder = folder;
this.amount = amount;
@@ -103,6 +115,7 @@ public class DecreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -116,6 +129,9 @@ public class DecreaseUnseenEvent extends
=======
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.
+=======
+ public ImapFolder getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/DeleteMessageEvent.java Thu Sep 12 02:55:36 2013
@@ -23,11 +23,15 @@ import java.util.ArrayList;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.User;
=======
import org.apache.hupa.shared.data.IMAPFolder;
+=======
+import org.apache.hupa.shared.data.ImapFolderImpl;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
@@ -45,6 +49,7 @@ public class DeleteMessageEvent extends
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolderImpl folder;
=======
private IMAPFolder folder;
@@ -52,6 +57,9 @@ public class DeleteMessageEvent extends
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private ImapFolderImpl folder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
private ArrayList<Message> messageList;
@Override
protected void dispatch(DeleteMessageEventHandler handler) {
@@ -65,6 +73,7 @@ public class DeleteMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageEvent(User user, ImapFolderImpl folder, ArrayList<Message> messageList) {
=======
public DeleteMessageEvent(User user, IMAPFolder folder, ArrayList<Message> messageList) {
@@ -72,12 +81,16 @@ public class DeleteMessageEvent extends
=======
public DeleteMessageEvent(User user, IMAPFolder folder, ArrayList<Message> messageList) {
>>>>>>> first commit
+=======
+ public DeleteMessageEvent(User user, ImapFolderImpl folder, ArrayList<Message> messageList) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.user = user;
this.folder = folder;
this.messageList = messageList;
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageEvent(User user, ImapFolderImpl folder, Message message) {
=======
public DeleteMessageEvent(User user, IMAPFolder folder, Message message) {
@@ -85,6 +98,9 @@ public class DeleteMessageEvent extends
=======
public DeleteMessageEvent(User user, IMAPFolder folder, Message message) {
>>>>>>> first commit
+=======
+ public DeleteMessageEvent(User user, ImapFolderImpl folder, Message message) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
ArrayList<Message> mList = new ArrayList<Message>();
mList.add(message);
@@ -98,6 +114,7 @@ public class DeleteMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolderImpl getFolder() {
=======
public IMAPFolder getFolder() {
@@ -105,6 +122,9 @@ public class DeleteMessageEvent extends
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public ImapFolderImpl getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -45,8 +45,12 @@ import org.apache.hupa.shared.data.User;
=======
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -59,6 +63,7 @@ public class ExpandMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private MessageDetails messageDetails;
@@ -83,6 +88,11 @@ public class ExpandMessageEvent extends
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.
+=======
+ private ImapFolder folder;
+
+ public ExpandMessageEvent(User user, ImapFolder folder, Message message) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.message = message;
this.folder = folder;
this.user = user;
@@ -115,6 +125,7 @@ public class ExpandMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder () {
return folder;
}
@@ -137,6 +148,9 @@ public class ExpandMessageEvent extends
=======
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.
+=======
+ public ImapFolder getFolder () {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -39,8 +39,12 @@ import org.apache.hupa.shared.data.User;
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -51,6 +55,7 @@ public class FolderSelectionEvent extend
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
public FolderSelectionEvent(User user, ImapFolder folder) {
@@ -74,6 +79,11 @@ public class FolderSelectionEvent extend
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.
+=======
+ private ImapFolder folder;
+ public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
+ public FolderSelectionEvent(User user, ImapFolder folder) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.user =user;
this.folder = folder;
}
@@ -82,6 +92,7 @@ public class FolderSelectionEvent extend
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -95,6 +106,9 @@ public class FolderSelectionEvent extend
=======
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.
+=======
+ public ImapFolder getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -49,8 +49,12 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -62,6 +66,7 @@ public class ForwardMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private Message message;
private MessageDetails details;
@@ -93,6 +98,13 @@ public class ForwardMessageEvent extends
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.
+=======
+ private ImapFolder folder;
+ private Message message;
+ private MessageDetails details;
+
+ public ForwardMessageEvent(User user, ImapFolder folder, Message message, MessageDetails details) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.user = user;
this.folder = folder;
this.message = message;
@@ -107,6 +119,7 @@ public class ForwardMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -120,6 +133,9 @@ public class ForwardMessageEvent extends
=======
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.
+=======
+ public ImapFolder getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -31,6 +31,7 @@ import org.apache.hupa.shared.data.User;
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
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.
=======
@@ -41,6 +42,9 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -52,6 +56,7 @@ public class IncreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -65,13 +70,17 @@ public class IncreaseUnseenEvent extends
=======
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 ImapFolder folder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
private int amount;
- public IncreaseUnseenEvent(User user, IMAPFolderProxy folder) {
+ public IncreaseUnseenEvent(User user, ImapFolder folder) {
this(user, folder, 1);
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IncreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
>>>>>>> first commit
=======
@@ -94,6 +103,9 @@ public class IncreaseUnseenEvent extends
=======
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.
+=======
+ public IncreaseUnseenEvent(User user, ImapFolder folder, int amount) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.user =user;
this.folder = folder;
this.amount = amount;
@@ -103,6 +115,7 @@ public class IncreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -116,6 +129,9 @@ public class IncreaseUnseenEvent extends
=======
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.
+=======
+ public ImapFolder getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
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=1522154&r1=1522153&r2=1522154&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:55:36 2013
@@ -32,6 +32,7 @@ import org.apache.hupa.shared.data.User;
>>>>>>> first commit
=======
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
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.
=======
@@ -42,6 +43,9 @@ import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -52,6 +56,7 @@ public class LoadMessagesEvent extends G
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private String searchValue;
@@ -65,13 +70,17 @@ public class LoadMessagesEvent extends G
=======
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 ImapFolder folder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
private String searchValue;
- public LoadMessagesEvent(User user, IMAPFolderProxy folder) {
+ public LoadMessagesEvent(User user, ImapFolder folder) {
this(user,folder,null);
}
<<<<<<< HEAD
+<<<<<<< HEAD
public LoadMessagesEvent(User user, IMAPFolder folder, String searchValue) {
>>>>>>> first commit
=======
@@ -94,6 +103,9 @@ public class LoadMessagesEvent extends G
=======
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.
+=======
+ public LoadMessagesEvent(User user, ImapFolder folder, String searchValue) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
@@ -105,6 +117,7 @@ public class LoadMessagesEvent extends G
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -118,6 +131,9 @@ public class LoadMessagesEvent extends G
=======
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.
+=======
+ public ImapFolder getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java Thu Sep 12 02:55:36 2013
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import org.apache.hupa.shared.data.Message;
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> first commit
=======
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
@@ -42,6 +43,9 @@ import org.apache.hupa.shared.data.Messa
=======
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+import org.apache.hupa.shared.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
import com.google.gwt.event.shared.GwtEvent;
@@ -65,14 +69,18 @@ public class MessagesReceivedEvent exten
>>>>>>> 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 ArrayList<Message> messages;
- private IMAPFolderProxy folder;
+ private ImapFolder folder;
<<<<<<< HEAD
+<<<<<<< HEAD
public MessagesReceivedEvent(IMAPFolder folder, ArrayList<Message> messages) {
>>>>>>> first commit
=======
public MessagesReceivedEvent(IMAPFolderProxy folder, ArrayList<Message> messages) {
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ public MessagesReceivedEvent(ImapFolder folder, ArrayList<Message> messages) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.messages = messages;
this.folder = folder;
}
@@ -94,6 +102,7 @@ public class MessagesReceivedEvent exten
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolder getFolder() {
>>>>>>> first commit
=======
@@ -105,6 +114,9 @@ public class MessagesReceivedEvent exten
=======
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.
+=======
+ public ImapFolder getFolder() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java Thu Sep 12 02:55:36 2013
@@ -97,9 +97,9 @@ public class MoveMessageEvent extends Gw
package org.apache.hupa.shared.events;
-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.proxy.ImapFolder;
import com.google.gwt.event.shared.GwtEvent;
@@ -107,12 +107,12 @@ public class MoveMessageEvent extends Gw
public final static Type<MoveMessageEventHandler> TYPE = new Type<MoveMessageEventHandler>();
private User user;
- private IMAPFolder oldFolder;
- private IMAPFolder newFolder;
+ private ImapFolder oldFolder;
+ private ImapFolder newFolder;
private Message message;
- public MoveMessageEvent(User user, IMAPFolder oldFolder,
- IMAPFolder newFolder, Message message) {
+ public MoveMessageEvent(User user, ImapFolder oldFolder,
+ ImapFolder newFolder, Message message) {
this.user = user;
this.oldFolder = oldFolder;
this.newFolder = newFolder;
@@ -123,11 +123,11 @@ public class MoveMessageEvent extends Gw
return user;
}
- public IMAPFolder getOldFolder() {
+ public ImapFolder getOldFolder() {
return oldFolder;
}
- public IMAPFolder getNewFolder() {
+ public ImapFolder getNewFolder() {
return newFolder;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org