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 [3/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/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java Thu Sep 12 02:55:36 2013
@@ -48,8 +48,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;
@@ -59,6 +63,7 @@ public class ReplyMessageEvent extends G
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
@@ -66,6 +71,9 @@ public class ReplyMessageEvent 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 Message message;
private MessageDetails details;
private boolean replyAll;
@@ -82,6 +90,7 @@ public class ReplyMessageEvent extends G
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ReplyMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details, boolean replyAll) {
=======
public ReplyMessageEvent(User user, IMAPFolder folder, Message message, MessageDetails details, boolean replyAll) {
@@ -89,6 +98,9 @@ public class ReplyMessageEvent extends G
=======
public ReplyMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details, boolean replyAll) {
>>>>>>> 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 ReplyMessageEvent(User user, ImapFolder folder, Message message, MessageDetails details, boolean replyAll) {
+>>>>>>> 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;
@@ -102,6 +114,7 @@ public class ReplyMessageEvent extends G
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -109,6 +122,9 @@ public class ReplyMessageEvent 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/locator/EntityLocator.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/locator/EntityLocator.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/locator/EntityLocator.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/locator/EntityLocator.java Thu Sep 12 02:55:36 2013
@@ -1,13 +1,12 @@
package org.apache.hupa.shared.locator;
-import org.apache.hupa.shared.rf.EntityBase;
-
import com.google.web.bindery.requestfactory.shared.Locator;
+import com.google.web.bindery.requestfactory.shared.ValueProxy;
-public abstract class EntityLocator extends Locator<EntityBase, Long> {
+public abstract class EntityLocator extends Locator<ValueProxy, Long> {
@Override
- public EntityBase create(Class<? extends EntityBase> clazz) {
+ public ValueProxy create(Class<? extends ValueProxy> clazz) {
try {
return clazz.newInstance();
} catch (InstantiationException e) {
@@ -18,26 +17,16 @@ public abstract class EntityLocator exte
}
@Override
- public abstract EntityBase find(Class<? extends EntityBase> clazz, Long id);
+ public abstract ValueProxy find(Class<? extends ValueProxy> clazz, Long id);
@Override
- public Class<EntityBase> getDomainType() {
+ public Class<ValueProxy> getDomainType() {
throw new UnsupportedOperationException();
}
@Override
- public Long getId(EntityBase domainObject) {
- return domainObject.getId();
- }
-
- @Override
public Class<Long> getIdType() {
return Long.class;
}
- @Override
- public Object getVersion(EntityBase domainObject) {
- return domainObject.getVersion();
- }
-
}
Copied: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/ImapFolder.java (from r1522153, james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/IMAPFolderProxy.java)
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/ImapFolder.java?p2=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/ImapFolder.java&p1=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/IMAPFolderProxy.java&r1=1522153&r2=1522154&rev=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/IMAPFolderProxy.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/ImapFolder.java Thu Sep 12 02:55:36 2013
@@ -2,13 +2,10 @@ package org.apache.hupa.shared.proxy;
import java.util.List;
-import org.apache.hupa.shared.data.IMAPFolder;
-
-import com.google.web.bindery.requestfactory.shared.EntityProxyId;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
-@ProxyFor(value=IMAPFolder.class)
-public interface IMAPFolderProxy extends AbstractEntityProxy {
+@ProxyFor(value=ImapFolder.class, locator=ImapFolderLocator.class)
+public interface ImapFolder extends AbstractEntityProxy {
int getUnseenMessageCount();
@@ -18,8 +15,8 @@ public interface IMAPFolderProxy extends
void setFullName(String oldFullName);
- List<IMAPFolderProxy> getChildren();
- void setChildren(List<IMAPFolderProxy> children);
+ List<ImapFolder> getChildren();
+ void setChildren(List<ImapFolder> children);
void setUnseenMessageCount(int count);
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/CreateFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/CreateFolder.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/CreateFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/CreateFolder.java Thu Sep 12 02:55:36 2013
@@ -23,21 +23,21 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
public class CreateFolder implements Action<GenericResult>, Serializable{
private static final long serialVersionUID = -4966856616698265177L;
- private IMAPFolder folder;
+ private ImapFolderImpl folder;
- public CreateFolder(IMAPFolder folder) {
+ public CreateFolder(ImapFolderImpl folder) {
this.folder = folder;
}
protected CreateFolder() {
}
- public IMAPFolder getFolder() {
+ public ImapFolderImpl getFolder() {
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java Thu Sep 12 02:55:36 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -28,6 +29,9 @@ 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.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
public class DeleteAllMessages extends DeleteMessage{
@@ -35,6 +39,7 @@ public class DeleteAllMessages extends D
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteAllMessages(IMAPFolderProxy folder) {
=======
public DeleteAllMessages(IMAPFolder folder) {
@@ -42,6 +47,9 @@ public class DeleteAllMessages extends D
=======
public DeleteAllMessages(IMAPFolderProxy folder) {
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
+=======
+ public DeleteAllMessages(ImapFolder folder) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
super(folder);
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteFolder.java Thu Sep 12 02:55:36 2013
@@ -25,6 +25,7 @@ import net.customware.gwt.dispatch.share
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -32,6 +33,9 @@ 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.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
public class DeleteFolder implements Action<GenericResult> , Serializable{
@@ -39,6 +43,7 @@ public class DeleteFolder implements Act
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public DeleteFolder(IMAPFolderProxy folder) {
@@ -52,6 +57,11 @@ public class DeleteFolder implements Act
public DeleteFolder(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 DeleteFolder(ImapFolder folder) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.folder = folder;
}
@@ -60,6 +70,7 @@ public class DeleteFolder implements Act
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -67,6 +78,9 @@ public class DeleteFolder implements Act
=======
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/rpc/DeleteMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java Thu Sep 12 02:55:36 2013
@@ -25,6 +25,7 @@ import net.customware.gwt.dispatch.share
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -32,12 +33,16 @@ 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.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
public class DeleteMessage implements Action<DeleteMessageResult>, Serializable {
private static final long serialVersionUID = 801294103124082592L;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public DeleteMessage(IMAPFolderProxy folder) {
@@ -51,6 +56,11 @@ public class DeleteMessage implements Ac
public DeleteMessage(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 DeleteMessage(ImapFolder folder) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.folder = folder;
}
@@ -60,6 +70,7 @@ public class DeleteMessage implements Ac
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -67,6 +78,9 @@ public class DeleteMessage implements Ac
=======
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/rpc/DeleteMessageByUid.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java Thu Sep 12 02:55:36 2013
@@ -23,7 +23,11 @@ import java.util.ArrayList;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+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.data.IMAPFolder;
@@ -41,6 +45,7 @@ public class DeleteMessageByUid extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageByUid(IMAPFolderProxy folder, ArrayList<Long> messageUids) {
=======
public DeleteMessageByUid(IMAPFolder folder, ArrayList<Long> messageUids) {
@@ -48,6 +53,9 @@ public class DeleteMessageByUid extends
=======
public DeleteMessageByUid(IMAPFolderProxy folder, ArrayList<Long> messageUids) {
>>>>>>> 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 DeleteMessageByUid(ImapFolder folder, ArrayList<Long> messageUids) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
super(folder);
this.messageUids = messageUids;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java Thu Sep 12 02:55:36 2013
@@ -26,6 +26,7 @@ import net.customware.gwt.dispatch.share
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -35,6 +36,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.
public class DeleteMessageResult implements Result, Serializable {
@@ -45,6 +49,7 @@ public class DeleteMessageResult impleme
private User user;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
@@ -52,6 +57,9 @@ public class DeleteMessageResult impleme
=======
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 deleteCount;
@@ -63,6 +71,7 @@ public class DeleteMessageResult impleme
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageResult(User user,IMAPFolderProxy folder, int deleteCount) {
=======
public DeleteMessageResult(User user,IMAPFolder folder, int deleteCount) {
@@ -70,6 +79,9 @@ public class DeleteMessageResult impleme
=======
public DeleteMessageResult(User user,IMAPFolderProxy folder, int deleteCount) {
>>>>>>> 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 DeleteMessageResult(User user,ImapFolder folder, int deleteCount) {
+>>>>>>> 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.deleteCount = deleteCount;
@@ -85,6 +97,7 @@ public class DeleteMessageResult impleme
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -92,6 +105,9 @@ public class DeleteMessageResult impleme
=======
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/rpc/FetchFoldersResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java Thu Sep 12 02:55:36 2013
@@ -26,6 +26,7 @@ import java.util.List;
import net.customware.gwt.dispatch.shared.Result;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import java.util.ArrayList;
@@ -37,6 +38,9 @@ import net.customware.gwt.dispatch.share
>>>>>>> first commit
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+=======
+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.
public class FetchFoldersResult implements Result, Serializable {
@@ -46,6 +50,7 @@ public class FetchFoldersResult implemen
private static final long serialVersionUID = -6215610133650989605L;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private List<IMAPFolderProxy> folders;
public FetchFoldersResult(List<IMAPFolderProxy> folders) {
@@ -59,6 +64,11 @@ public class FetchFoldersResult implemen
public FetchFoldersResult(List<IMAPFolderProxy> folders) {
>>>>>>> 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 List<ImapFolder> folders;
+
+ public FetchFoldersResult(List<ImapFolder> folders) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.folders=folders;
}
@@ -68,6 +78,7 @@ public class FetchFoldersResult implemen
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public List<IMAPFolderProxy> getFolders() {
=======
public List<IMAPFolder> getFolders() {
@@ -75,6 +86,9 @@ public class FetchFoldersResult implemen
=======
public List<IMAPFolderProxy> getFolders() {
>>>>>>> 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 List<ImapFolder> getFolders() {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
return folders;
}
@@ -82,6 +96,7 @@ public class FetchFoldersResult implemen
StringBuffer ret = new StringBuffer("");
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
for (IMAPFolderProxy folder : folders) {
ret.append(folder.getFullName()).append("\n");
for (IMAPFolderProxy f : folder.getChildIMAPFolders()) {
@@ -99,6 +114,11 @@ public class FetchFoldersResult implemen
=======
for (IMAPFolderProxy f : folder.getChildren()) {
>>>>>>>
+=======
+ for (ImapFolder folder : folders) {
+ ret.append(folder.getFullName()).append("\n");
+ for (ImapFolder f : folder.getChildren()) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
childFolder(f, ret);
}
}
@@ -107,6 +127,7 @@ public class FetchFoldersResult implemen
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private void childFolder(IMAPFolderProxy child, StringBuffer ret) {
ret.append(child.getFullName()).append("\n");
for (IMAPFolderProxy folder : child.getChildIMAPFolders()) {
@@ -124,6 +145,11 @@ public class FetchFoldersResult implemen
=======
for (IMAPFolderProxy folder : child.getChildren()) {
>>>>>>>
+=======
+ private void childFolder(ImapFolder child, StringBuffer ret) {
+ ret.append(child.getFullName()).append("\n");
+ for (ImapFolder folder : child.getChildren()) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
childFolder(folder, ret);
}
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java Thu Sep 12 02:55:36 2013
@@ -25,6 +25,7 @@ import net.customware.gwt.dispatch.share
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -32,12 +33,16 @@ 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.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
public class FetchMessages implements Action<FetchMessagesResult>, Serializable {
private static final long serialVersionUID = -3181183289937321202L;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
@@ -45,6 +50,9 @@ public class FetchMessages implements Ac
=======
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 start;
private int offset;
private String searchString;
@@ -54,6 +62,7 @@ public class FetchMessages implements Ac
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public FetchMessages(IMAPFolderProxy folder,int start, int offset,String searchString) {
=======
public FetchMessages(IMAPFolder folder,int start, int offset,String searchString) {
@@ -61,6 +70,9 @@ public class FetchMessages implements Ac
=======
public FetchMessages(IMAPFolderProxy folder,int start, int offset,String searchString) {
>>>>>>> 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 FetchMessages(ImapFolder folder,int start, int offset,String searchString) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.folder = folder;
this.start = start;
this.offset = offset;
@@ -69,6 +81,7 @@ public class FetchMessages implements Ac
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -76,6 +89,9 @@ public class FetchMessages implements Ac
=======
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/rpc/FetchRecentMessages.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java Thu Sep 12 02:55:36 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -28,6 +29,9 @@ 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.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
public class FetchRecentMessages extends FetchMessages{
@@ -38,6 +42,7 @@ public class FetchRecentMessages extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public FetchRecentMessages(IMAPFolderProxy folder, int start,
=======
public FetchRecentMessages(IMAPFolder folder, int start,
@@ -45,6 +50,9 @@ public class FetchRecentMessages extends
=======
public FetchRecentMessages(IMAPFolderProxy folder, int start,
>>>>>>> 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 FetchRecentMessages(ImapFolder folder, int start,
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
int offset, String searchString) {
super(folder, start, offset, searchString);
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java Thu Sep 12 02:55:36 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.SMTPMessage;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -32,6 +33,9 @@ import org.apache.hupa.shared.data.SMTPM
import org.apache.hupa.shared.data.SMTPMessage;
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.
public class ForwardMessage extends SendMessage {
@@ -39,6 +43,7 @@ public class ForwardMessage extends Send
private long uid;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public ForwardMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) {
@@ -52,6 +57,11 @@ public class ForwardMessage extends Send
public ForwardMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) {
>>>>>>> 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 ForwardMessage(SMTPMessage msg, ImapFolder folder, long uid) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
super(msg);
this.uid = uid;
this.folder = folder;
@@ -66,6 +76,7 @@ public class ForwardMessage extends Send
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -73,6 +84,9 @@ public class ForwardMessage extends Send
=======
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/rpc/GetMessageDetails.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java Thu Sep 12 02:55:36 2013
@@ -26,6 +26,7 @@ import net.customware.gwt.dispatch.share
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -33,12 +34,16 @@ 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.proxy.ImapFolder;
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
public class GetMessageDetails implements Action<GetMessageDetailsResult>, Serializable {
private static final long serialVersionUID = 5826298202494313834L;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
private long uid;
@@ -55,6 +60,12 @@ public class GetMessageDetails implement
public GetMessageDetails(IMAPFolderProxy folder, long uid) {
>>>>>>> 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 long uid;
+
+ public GetMessageDetails(ImapFolder folder, long uid) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.folder = folder;
this.uid = uid;
}
@@ -65,6 +76,7 @@ public class GetMessageDetails implement
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -72,6 +84,9 @@ public class GetMessageDetails implement
=======
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/rpc/MoveMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/MoveMessage.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/MoveMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/MoveMessage.java Thu Sep 12 02:55:36 2013
@@ -23,16 +23,16 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.proxy.ImapFolder;
public class MoveMessage implements Action<MoveMessageResult>, Serializable {
private static final long serialVersionUID = 7771146077050895244L;
- private IMAPFolder oldFolder;
- private IMAPFolder newFolder;
+ private ImapFolder oldFolder;
+ private ImapFolder newFolder;
private long messageUid;
- public MoveMessage(IMAPFolder oldFolder, IMAPFolder newFolder, long messageUid) {
+ public MoveMessage(ImapFolder oldFolder, ImapFolder newFolder, long messageUid) {
this.oldFolder = oldFolder;
this.newFolder = newFolder;
this.messageUid = messageUid;
@@ -45,11 +45,11 @@ public class MoveMessage implements Acti
return messageUid;
}
- public IMAPFolder getOldFolder() {
+ public ImapFolder getOldFolder() {
return oldFolder;
}
- public IMAPFolder getNewFolder() {
+ public ImapFolder getNewFolder() {
return newFolder;
}
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RawMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RawMessage.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RawMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RawMessage.java Thu Sep 12 02:55:36 2013
@@ -24,15 +24,15 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
public class RawMessage implements Action<RawMessageResult>, Serializable {
private static final long serialVersionUID = 5826298202494313834L;
- private IMAPFolder folder;
+ private ImapFolderImpl folder;
private long uid;
- public RawMessage(IMAPFolder folder, long uid) {
+ public RawMessage(ImapFolderImpl folder, long uid) {
this.folder = folder;
this.uid = uid;
}
@@ -41,7 +41,7 @@ public class RawMessage implements Actio
private RawMessage() {
}
- public IMAPFolder getFolder() {
+ public ImapFolderImpl getFolder() {
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RenameFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RenameFolder.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RenameFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/RenameFolder.java Thu Sep 12 02:55:36 2013
@@ -23,15 +23,15 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
public class RenameFolder implements Action<GenericResult>, Serializable {
private static final long serialVersionUID = 1924419911921600320L;
- private IMAPFolder folder;
+ private ImapFolderImpl folder;
private String newName;
- public RenameFolder(IMAPFolder folder, String newName) {
+ public RenameFolder(ImapFolderImpl folder, String newName) {
this.folder = folder;
this.newName = newName;
}
@@ -40,7 +40,7 @@ public class RenameFolder implements Act
}
- public IMAPFolder getFolder() {
+ public ImapFolderImpl getFolder() {
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java Thu Sep 12 02:55:36 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.SMTPMessage;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -32,6 +33,9 @@ import org.apache.hupa.shared.data.SMTPM
import org.apache.hupa.shared.data.SMTPMessage;
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.
public class ReplyMessage extends ForwardMessage {
@@ -40,6 +44,7 @@ public class ReplyMessage extends Forwar
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ReplyMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) {
=======
public ReplyMessage(SMTPMessage msg, IMAPFolder folder, long uid) {
@@ -47,6 +52,9 @@ public class ReplyMessage extends Forwar
=======
public ReplyMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) {
>>>>>>> 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 ReplyMessage(SMTPMessage msg, ImapFolder folder, long uid) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
super(msg, folder, uid);
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java Thu Sep 12 02:55:36 2013
@@ -27,6 +27,7 @@ import net.customware.gwt.dispatch.share
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
@@ -36,6 +37,9 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.Message.IMAPFlag;
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.
public class SetFlag implements Action<GenericResult>, Serializable {
@@ -44,6 +48,7 @@ public class SetFlag implements Action<G
private ArrayList<Long> uids;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
private boolean value;
@@ -60,6 +65,12 @@ public class SetFlag implements Action<G
public SetFlag(IMAPFolderProxy folder, IMAPFlag flag, boolean value, ArrayList<Long> uids) {
>>>>>>> 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 boolean value;
+
+ public SetFlag(ImapFolder folder, IMAPFlag flag, boolean value, ArrayList<Long> uids) {
+>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now.
this.flag = flag;
this.value = value;
this.uids = uids;
@@ -71,6 +82,7 @@ public class SetFlag implements Action<G
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
@@ -78,6 +90,9 @@ public class SetFlag implements Action<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/rpc/TagMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java?rev=1522154&r1=1522153&r2=1522154&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java Thu Sep 12 02:55:36 2013
@@ -25,20 +25,20 @@ import java.util.ArrayList;
import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.Tag;
public class TagMessage implements Action<GenericResult>, Serializable {
private static final long serialVersionUID = 4323236257115412763L;
- private IMAPFolder folder;
+ private ImapFolderImpl folder;
private ArrayList<Long> messageUids;
private Tag tag;
protected TagMessage() {
}
- public TagMessage(Tag tag, IMAPFolder folder, ArrayList<Long> messageUids) {
+ public TagMessage(Tag tag, ImapFolderImpl folder, ArrayList<Long> messageUids) {
this.tag = tag;
this.folder = folder;
this.messageUids = messageUids;
@@ -48,7 +48,7 @@ public class TagMessage implements Actio
return tag;
}
- public IMAPFolder getFolder() {
+ public ImapFolderImpl getFolder() {
return folder;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org