You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 04:52:47 UTC
svn commit: r1522152 [2/2] - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/activity/
client/src/main/java/org/apache/hupa/client/mvp/
client/src/main/java/org/apache/hupa/client/place/
client/src/main/java/org/apache/hupa/client/rf/...
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -20,6 +20,9 @@
package org.apache.hupa.server.handler;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import static org.apache.hupa.server.utils.RegexPatterns.regex_badAttrs;
import static org.apache.hupa.server.utils.RegexPatterns.regex_badTags;
import static org.apache.hupa.server.utils.RegexPatterns.regex_email;
@@ -45,25 +48,35 @@ import static org.apache.hupa.server.uti
import static org.apache.hupa.server.utils.RegexPatterns.replaceAll;
import static org.apache.hupa.server.utils.RegexPatterns.replaceAllRecursive;
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import javax.mail.Flags;
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
=======
>>>>>>> first commit
+=======
+import javax.mail.Flags.Flag;
+>>>>>>> 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 javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import javax.mail.Flags.Flag;
>>>>>>> first commit
+=======
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility;
import javax.servlet.http.HttpSession;
@@ -74,6 +87,7 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
@@ -85,6 +99,12 @@ import org.apache.hupa.shared.data.Messa
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.MessageAttachment;
+import org.apache.hupa.shared.data.MessageDetails;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import org.apache.hupa.shared.rpc.GetMessageDetails;
import org.apache.hupa.shared.rpc.GetMessageDetailsResult;
@@ -124,10 +144,14 @@ public class GetMessageDetailsHandler ex
}
<<<<<<< HEAD
+<<<<<<< HEAD
protected MessageDetails exposeMessage(User user, IMAPFolderProxy folder,
=======
protected MessageDetails exposeMessage(User user, IMAPFolder folder,
>>>>>>> first commit
+=======
+ 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.
long uid) throws ActionException {
IMAPStore store = null;
com.sun.mail.imap.IMAPFolder f = null;
Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/SetFlagsHandler.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import javax.mail.Flags;
<<<<<<< HEAD
+<<<<<<< HEAD
import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
@@ -33,6 +34,12 @@ import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Flags.Flag;
>>>>>>> first commit
+=======
+import javax.mail.Flags.Flag;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+>>>>>>> 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 javax.servlet.http.HttpSession;
import net.customware.gwt.dispatch.server.ExecutionContext;
@@ -41,12 +48,17 @@ import net.customware.gwt.dispatch.share
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import org.apache.hupa.shared.rpc.GenericResult;
import org.apache.hupa.shared.rpc.SetFlag;
@@ -67,10 +79,14 @@ public class SetFlagsHandler extends Abs
ExecutionContext context) throws ActionException {
User user = getUser();
<<<<<<< HEAD
+<<<<<<< HEAD
IMAPFolderProxy folder = action.getFolder();
=======
IMAPFolder folder = action.getFolder();
>>>>>>> first commit
+=======
+ IMAPFolderProxy folder = action.getFolder();
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
ArrayList<Long> uids = action.getUids();
com.sun.mail.imap.IMAPFolder f = null;
try {
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=1522152&r1=1522151&r2=1522152&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java Thu Sep 12 02:52:46 2013
@@ -30,18 +30,22 @@ import org.apache.hupa.shared.rf.EntityB
>>>>>>> first commit
=======
import java.util.List;
-import java.util.Properties;
+<<<<<<< HEAD
import javax.servlet.http.HttpSession;
import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
+=======
+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.
/**
* IMAPFolder
*
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public class IMAPFolder extends EntityBase implements Serializable {
private Long id;
@@ -74,6 +78,9 @@ public class IMAPFolder implements Seria
/**
>>>>>>> first commit
=======
+=======
+public class IMAPFolder extends EntityBase implements Serializable {
+>>>>>>> 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 Long id;
private Long version;
@@ -104,10 +111,14 @@ public class IMAPFolder implements Seria
private static final long serialVersionUID = 2084188092060266479L;
<<<<<<< HEAD
+<<<<<<< HEAD
private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
=======
private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
>>>>>>> first commit
+=======
+ private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private String fullName;
private String delimiter;
private int msgCount;
@@ -151,10 +162,14 @@ public class IMAPFolder implements Seria
* @param childs
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public void setChildIMAPFolders(List<IMAPFolder> childs) {
=======
public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
>>>>>>> first commit
+=======
+ public void setChildIMAPFolders(List<IMAPFolder> childs) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.childs = childs;
}
@@ -164,10 +179,14 @@ public class IMAPFolder implements Seria
* @return childs
*/
<<<<<<< HEAD
+<<<<<<< HEAD
public List<IMAPFolder> getChildIMAPFolders() {
=======
public ArrayList<IMAPFolder> getChildIMAPFolders() {
>>>>>>> first commit
+=======
+ public List<IMAPFolder> getChildIMAPFolders() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return childs;
}
@@ -262,8 +281,12 @@ public class IMAPFolder implements Seria
return getFullName().hashCode();
}
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
+=======
+
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
}
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -36,6 +37,10 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -46,6 +51,7 @@ public class DecreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -73,14 +79,21 @@ public class DecreaseUnseenEvent 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.
=======
private IMAPFolder folder;
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private int amount;
- public DecreaseUnseenEvent(User user, IMAPFolder folder) {
+ public DecreaseUnseenEvent(User user, IMAPFolderProxy folder) {
this(user, folder, 1);
}
+<<<<<<< HEAD
public DecreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
>>>>>>> first commit
+=======
+ public DecreaseUnseenEvent(User user, IMAPFolderProxy folder, int amount) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.user =user;
this.folder = folder;
this.amount = amount;
@@ -89,6 +102,7 @@ public class DecreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -99,6 +113,9 @@ public class DecreaseUnseenEvent extends
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -41,6 +42,11 @@ import org.apache.hupa.shared.data.IMAPF
import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -52,6 +58,7 @@ public class ExpandMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private MessageDetails messageDetails;
@@ -71,6 +78,11 @@ public class ExpandMessageEvent extends
public ExpandMessageEvent(User user, IMAPFolder folder, Message message) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+
+ public ExpandMessageEvent(User user, IMAPFolderProxy folder, Message message) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.message = message;
this.folder = folder;
this.user = user;
@@ -102,6 +114,7 @@ public class ExpandMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder () {
return folder;
}
@@ -121,6 +134,9 @@ public class ExpandMessageEvent extends
>>>>>>> first commit
=======
public IMAPFolder getFolder () {
+=======
+ public IMAPFolderProxy getFolder () {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/FolderSelectionEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -36,6 +37,10 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -45,6 +50,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) {
@@ -63,6 +69,11 @@ public class FolderSelectionEvent extend
public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
public FolderSelectionEvent(User user, IMAPFolder folder) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+ public final static Type<FolderSelectionEventHandler> TYPE = new Type<FolderSelectionEventHandler>();
+ public FolderSelectionEvent(User user, IMAPFolderProxy folder) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.user =user;
this.folder = folder;
}
@@ -70,6 +81,7 @@ public class FolderSelectionEvent extend
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -80,6 +92,9 @@ public class FolderSelectionEvent extend
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -44,6 +45,12 @@ import org.apache.hupa.shared.proxy.IMAP
>>>>>>> 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.
=======
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.MessageDetails;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -54,6 +61,7 @@ public class ForwardMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private Message message;
private MessageDetails details;
@@ -78,6 +86,13 @@ public class ForwardMessageEvent 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.
=======
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+ private Message message;
+ private MessageDetails details;
+
+ public ForwardMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.user = user;
this.folder = folder;
this.message = message;
@@ -91,6 +106,7 @@ public class ForwardMessageEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -101,6 +117,9 @@ public class ForwardMessageEvent extends
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/IncreaseUnseenEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -36,6 +37,10 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -46,6 +51,7 @@ public class IncreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private int amount;
@@ -73,14 +79,21 @@ public class IncreaseUnseenEvent 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.
=======
private IMAPFolder folder;
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private int amount;
- public IncreaseUnseenEvent(User user, IMAPFolder folder) {
+ public IncreaseUnseenEvent(User user, IMAPFolderProxy folder) {
this(user, folder, 1);
}
+<<<<<<< HEAD
public IncreaseUnseenEvent(User user, IMAPFolder folder, int amount) {
>>>>>>> first commit
+=======
+ public IncreaseUnseenEvent(User user, IMAPFolderProxy folder, int amount) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.user =user;
this.folder = folder;
this.amount = amount;
@@ -89,6 +102,7 @@ public class IncreaseUnseenEvent extends
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -99,6 +113,9 @@ public class IncreaseUnseenEvent extends
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
=======
@@ -37,6 +38,10 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -46,6 +51,7 @@ public class LoadMessagesEvent extends G
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private ImapFolder folder;
private String searchValue;
@@ -73,14 +79,21 @@ public class LoadMessagesEvent extends G
>>>>>>> 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 IMAPFolderProxy folder;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private String searchValue;
- public LoadMessagesEvent(User user, IMAPFolder folder) {
+ public LoadMessagesEvent(User user, IMAPFolderProxy folder) {
this(user,folder,null);
}
+<<<<<<< HEAD
public LoadMessagesEvent(User user, IMAPFolder folder, String searchValue) {
>>>>>>> first commit
+=======
+ public LoadMessagesEvent(User user, IMAPFolderProxy folder, String searchValue) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
@@ -91,6 +104,7 @@ public class LoadMessagesEvent extends G
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public ImapFolder getFolder() {
=======
public IMAPFolder getFolder() {
@@ -101,6 +115,9 @@ public class LoadMessagesEvent extends G
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -36,9 +36,12 @@ import org.apache.hupa.shared.proxy.IMAP
=======
import java.util.ArrayList;
-import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message;
+<<<<<<< HEAD
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -62,10 +65,14 @@ 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 IMAPFolder folder;
+ private IMAPFolderProxy folder;
+<<<<<<< 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.
this.messages = messages;
this.folder = folder;
}
@@ -86,6 +93,7 @@ public class MessagesReceivedEvent exten
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolder getFolder() {
>>>>>>> first commit
=======
@@ -94,6 +102,9 @@ public class MessagesReceivedEvent exten
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.shared.events;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -43,6 +44,12 @@ import org.apache.hupa.shared.proxy.IMAP
>>>>>>> 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.
=======
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.MessageDetails;
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
import com.google.gwt.event.shared.GwtEvent;
@@ -51,10 +58,14 @@ public class ReplyMessageEvent extends G
public final static Type<ReplyMessageEventHandler> TYPE = new Type<ReplyMessageEventHandler>();
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private Message message;
private MessageDetails details;
private boolean replyAll;
@@ -70,10 +81,14 @@ public class ReplyMessageEvent extends G
}
<<<<<<< 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) {
>>>>>>> first commit
+=======
+ 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.
this.user = user;
this.folder = folder;
this.message = message;
@@ -86,10 +101,14 @@ public class ReplyMessageEvent extends G
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteAllMessages.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -20,20 +20,28 @@
package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class DeleteAllMessages extends DeleteMessage{
private static final long serialVersionUID = -6801849429581798842L;
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteAllMessages(IMAPFolderProxy folder) {
=======
public DeleteAllMessages(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ 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.
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -24,16 +24,21 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class DeleteFolder implements Action<GenericResult> , Serializable{
private static final long serialVersionUID = 7921329310932404439L;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public DeleteFolder(IMAPFolderProxy folder) {
@@ -42,6 +47,11 @@ public class DeleteFolder implements Act
public DeleteFolder(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+
+ 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.
this.folder = folder;
}
@@ -49,10 +59,14 @@ public class DeleteFolder implements Act
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -24,15 +24,20 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class DeleteMessage implements Action<DeleteMessageResult>, Serializable {
private static final long serialVersionUID = 801294103124082592L;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public DeleteMessage(IMAPFolderProxy folder) {
@@ -41,6 +46,11 @@ public class DeleteMessage implements Ac
public DeleteMessage(IMAPFolder folder) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+
+ 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.
this.folder = folder;
}
@@ -49,10 +59,14 @@ public class DeleteMessage implements Ac
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -22,11 +22,16 @@ package org.apache.hupa.shared.rpc;
import java.util.ArrayList;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class DeleteMessageByUid extends DeleteMessage {
@@ -35,10 +40,14 @@ public class DeleteMessageByUid extends
private ArrayList<Long> messageUids;
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageByUid(IMAPFolderProxy folder, ArrayList<Long> messageUids) {
=======
public DeleteMessageByUid(IMAPFolder folder, ArrayList<Long> messageUids) {
>>>>>>> first commit
+=======
+ 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.
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -24,12 +24,17 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Result;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.User;
>>>>>>> first commit
+=======
+import org.apache.hupa.shared.data.User;
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
public class DeleteMessageResult implements Result, Serializable {
@@ -39,10 +44,14 @@ public class DeleteMessageResult impleme
private static final long serialVersionUID = -5149203502019947912L;
private User user;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private int deleteCount;
@@ -53,10 +62,14 @@ public class DeleteMessageResult impleme
}
<<<<<<< HEAD
+<<<<<<< HEAD
public DeleteMessageResult(User user,IMAPFolderProxy folder, int deleteCount) {
=======
public DeleteMessageResult(User user,IMAPFolder folder, int deleteCount) {
>>>>>>> first commit
+=======
+ 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.
this.user = user;
this.folder = folder;
this.deleteCount = deleteCount;
@@ -71,10 +84,14 @@ public class DeleteMessageResult impleme
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.shared.rpc;
import java.io.Serializable;
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.List;
import net.customware.gwt.dispatch.shared.Result;
@@ -28,13 +29,15 @@ import net.customware.gwt.dispatch.share
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import java.util.ArrayList;
+=======
+>>>>>>> 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 java.util.List;
-import org.apache.hupa.shared.data.IMAPFolder;
-
import net.customware.gwt.dispatch.shared.Result;
>>>>>>> first commit
+import org.apache.hupa.shared.proxy.IMAPFolderProxy;
+
public class FetchFoldersResult implements Result, Serializable {
/**
@@ -42,6 +45,7 @@ public class FetchFoldersResult implemen
*/
private static final long serialVersionUID = -6215610133650989605L;
<<<<<<< HEAD
+<<<<<<< HEAD
private List<IMAPFolderProxy> folders;
public FetchFoldersResult(List<IMAPFolderProxy> folders) {
@@ -50,6 +54,11 @@ public class FetchFoldersResult implemen
public FetchFoldersResult(List<IMAPFolder> folders) {
>>>>>>> first commit
+=======
+ private List<IMAPFolderProxy> folders;
+
+ 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.
this.folders=folders;
}
@@ -58,16 +67,21 @@ public class FetchFoldersResult implemen
}
<<<<<<< HEAD
+<<<<<<< HEAD
public List<IMAPFolderProxy> getFolders() {
=======
public List<IMAPFolder> getFolders() {
>>>>>>> first commit
+=======
+ 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.
return folders;
}
public String toString() {
StringBuffer ret = new StringBuffer("");
<<<<<<< HEAD
+<<<<<<< HEAD
for (IMAPFolderProxy folder : folders) {
ret.append(folder.getFullName()).append("\n");
for (IMAPFolderProxy f : folder.getChildIMAPFolders()) {
@@ -76,6 +90,11 @@ public class FetchFoldersResult implemen
ret.append(folder.getFullName()).append("\n");
for (IMAPFolder f : folder.getChildIMAPFolders()) {
>>>>>>> first commit
+=======
+ for (IMAPFolderProxy folder : folders) {
+ ret.append(folder.getFullName()).append("\n");
+ for (IMAPFolderProxy f : folder.getChildIMAPFolders()) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
childFolder(f, ret);
}
}
@@ -83,6 +102,7 @@ public class FetchFoldersResult implemen
}
<<<<<<< HEAD
+<<<<<<< HEAD
private void childFolder(IMAPFolderProxy child, StringBuffer ret) {
ret.append(child.getFullName()).append("\n");
for (IMAPFolderProxy folder : child.getChildIMAPFolders()) {
@@ -91,6 +111,11 @@ public class FetchFoldersResult implemen
ret.append(child.getFullName()).append("\n");
for (IMAPFolder folder : child.getChildIMAPFolders()) {
>>>>>>> first commit
+=======
+ private void childFolder(IMAPFolderProxy child, StringBuffer ret) {
+ ret.append(child.getFullName()).append("\n");
+ for (IMAPFolderProxy folder : child.getChildIMAPFolders()) {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -24,19 +24,27 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class FetchMessages implements Action<FetchMessagesResult>, Serializable {
private static final long serialVersionUID = -3181183289937321202L;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
=======
private IMAPFolder folder;
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
private int start;
private int offset;
private String searchString;
@@ -45,10 +53,14 @@ public class FetchMessages implements Ac
}
<<<<<<< HEAD
+<<<<<<< HEAD
public FetchMessages(IMAPFolderProxy folder,int start, int offset,String searchString) {
=======
public FetchMessages(IMAPFolder folder,int start, int offset,String searchString) {
>>>>>>> first commit
+=======
+ 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.
this.folder = folder;
this.start = start;
this.offset = offset;
@@ -56,10 +68,14 @@ public class FetchMessages implements Ac
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -20,10 +20,14 @@
package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class FetchRecentMessages extends FetchMessages{
@@ -33,10 +37,14 @@ public class FetchRecentMessages extends
}
<<<<<<< HEAD
+<<<<<<< HEAD
public FetchRecentMessages(IMAPFolderProxy folder, int start,
=======
public FetchRecentMessages(IMAPFolder folder, int start,
>>>>>>> first commit
+=======
+ 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.
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -21,18 +21,24 @@
package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.SMTPMessage;
>>>>>>> first commit
+=======
+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.
public class ForwardMessage extends SendMessage {
private static final long serialVersionUID = 1656671247843122192L;
private long uid;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
public ForwardMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) {
@@ -41,6 +47,11 @@ public class ForwardMessage extends Send
public ForwardMessage(SMTPMessage msg, IMAPFolder folder, long uid) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+
+ 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.
super(msg);
this.uid = uid;
this.folder = folder;
@@ -54,10 +65,14 @@ public class ForwardMessage extends Send
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -25,15 +25,20 @@ import java.io.Serializable;
import net.customware.gwt.dispatch.shared.Action;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
>>>>>>> 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.
public class GetMessageDetails implements Action<GetMessageDetailsResult>, Serializable {
private static final long serialVersionUID = 5826298202494313834L;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
private long uid;
@@ -44,6 +49,12 @@ public class GetMessageDetails implement
public GetMessageDetails(IMAPFolder folder, long uid) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+ private long uid;
+
+ 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.
this.folder = folder;
this.uid = uid;
}
@@ -53,10 +64,14 @@ public class GetMessageDetails implement
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java?rev=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -21,12 +21,17 @@
package org.apache.hupa.shared.rpc;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.SMTPMessage;
>>>>>>> first commit
+=======
+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.
public class ReplyMessage extends ForwardMessage {
@@ -34,10 +39,14 @@ public class ReplyMessage extends Forwar
<<<<<<< HEAD
+<<<<<<< HEAD
public ReplyMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) {
=======
public ReplyMessage(SMTPMessage msg, IMAPFolder folder, long uid) {
>>>>>>> first commit
+=======
+ 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.
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=1522152&r1=1522151&r2=1522152&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:52:46 2013
@@ -25,12 +25,17 @@ import java.util.ArrayList;
import net.customware.gwt.dispatch.shared.Action;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.Message.IMAPFlag;
import org.apache.hupa.shared.proxy.IMAPFolderProxy;
=======
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.Message.IMAPFlag;
>>>>>>> first commit
+=======
+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.
public class SetFlag implements Action<GenericResult>, Serializable {
@@ -38,6 +43,7 @@ public class SetFlag implements Action<G
private IMAPFlag flag;
private ArrayList<Long> uids;
<<<<<<< HEAD
+<<<<<<< HEAD
private IMAPFolderProxy folder;
private boolean value;
@@ -48,6 +54,12 @@ public class SetFlag implements Action<G
public SetFlag(IMAPFolder folder, IMAPFlag flag, boolean value, ArrayList<Long> uids) {
>>>>>>> first commit
+=======
+ private IMAPFolderProxy folder;
+ private boolean value;
+
+ 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.
this.flag = flag;
this.value = value;
this.uids = uids;
@@ -58,10 +70,14 @@ public class SetFlag implements Action<G
}
<<<<<<< HEAD
+<<<<<<< HEAD
public IMAPFolderProxy getFolder() {
=======
public IMAPFolder getFolder() {
>>>>>>> first commit
+=======
+ public IMAPFolderProxy getFolder() {
+>>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think.
return folder;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org