Author: dongxu
Date: Thu Sep 12 02:53:43 2013
New Revision: 1522153
URL: http://svn.apache.org/r1522153
Log: (empty)
Added:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/AbstractEntityProxy.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/IMAPFolderProxy.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 02:53:43 2013
@@ -224,6 +224,7 @@
<modules>
<module>org.apache.hupa.Hupa${gwt.moduleSuffix}</module>
</modules>
+ <extraJvmArgs>-XX:MaxPermSize=512M -Xmx1024M</extraJvmArgs>
</configuration>
<executions>
<execution>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
Thu Sep 12 02:53:43 2013
@@ -637,6 +637,7 @@ System.out.println("1111111"+response);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
=======
List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
@@ -644,6 +645,9 @@ System.out.println("1111111"+response);
=======
List<IMAPFolderProxy> childFolders = iFolder.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.
+=======
+ List<IMAPFolderProxy> childFolders = iFolder.getChildren();
+>>>>>>>
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
Thu Sep 12 02:53:43 2013
@@ -312,6 +312,7 @@ public class MainPresenter extends Widge
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
List<IMAPFolderProxy> childFolders = iFolder.getChildIMAPFolders();
=======
List<IMAPFolder> childFolders = iFolder.getChildIMAPFolders();
@@ -319,6 +320,9 @@ public class MainPresenter extends Widge
=======
List<IMAPFolderProxy> childFolders = iFolder.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.
+=======
+ List<IMAPFolderProxy> childFolders = iFolder.getChildren();
+>>>>>>>
List<IMAPTreeItem> items = createTreeNodes(childFolders);
for (IMAPTreeItem item : items) {
record.addItem(item);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
Thu Sep 12 02:53:43 2013
@@ -297,7 +297,7 @@ public class WestView extends Composite
bindDropController(iTreeItem);
folderTree.addItem(iTreeItem);
- if (((IMAPFolder)
iTreeItem.getUserObject()).getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName()))
{
+ if (((IMAPFolderProxy)
iTreeItem.getUserObject()).getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName()))
{
folderTree.setSelectedItem(iTreeItem, false);
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/IMAPTreeItem.java
Thu Sep 12 02:53:43 2013
@@ -185,6 +185,7 @@ import org.apache.hupa.shared.proxy.IMAP
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.ui.EditableTreeItem;
+<<<<<<< HEAD
public class IMAPTreeItem extends EditableTreeItem {
protected String oldFullName;
protected String oldName;
@@ -433,4 +434,153 @@ public class IMAPTreeItem extends Editab
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+public class IMAPTreeItem extends EditableTreeItem {
+ protected String oldFullName;
+ protected String oldName;
+
+ public IMAPTreeItem(IMAPFolderProxy folder) {
+ setUserObject(folder);
+ setFolderText(folder);
+ }
+
+ @Override
+ public void setSelected(boolean selected) {
+ super.setSelected(selected);
+ if (isSelected()) {
+ getWidget().addStyleName("hupa-IMAPFolder-selected");
+ } else {
+ getWidget().removeStyleName("hupa-IMAPFolder-selected");
+ }
+ }
+
+ /**
+ * Decrease the unseen messagecount of this folder
+ */
+ public void decreaseUnseenMessageCount() {
+ descreaseUnseenMessageCount(1);
+ }
+
+ public void setUnseenMessageCount(int cound) {
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ int count = folder.getUnseenMessageCount();
+ folder.setUnseenMessageCount(count);
+ setFolderText(folder);
+
+ }
+
+ /**
+ * Decrease the unseen messagecount of this folder
+ */
+ public void descreaseUnseenMessageCount(int decreaseCount) {
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ int count = folder.getUnseenMessageCount();
+ if (count > 0) {
+ count = count - decreaseCount;
+ if (count < 0) {
+ count = 0;
+ }
+ folder.setUnseenMessageCount(count);
+ setFolderText(folder);
+ }
+ }
+ /**
+ * Increase the unseen messagecount of this folder
+ */
+ public void increaseUnseenMessageCount() {
+ increaseUnseenMessageCount(1);
+ }
+
+ /**
+ * Increase the unseen messagecount of this folder
+ */
+ public void increaseUnseenMessageCount(int increaseCount) {
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ int count = folder.getUnseenMessageCount();
+ count = count + increaseCount;
+ folder.setUnseenMessageCount(count);
+ setFolderText(folder);
+ }
+
+ private void setFolderText(IMAPFolderProxy folder) {
+ setText(getFolderName(folder));
+ setUnseenMessageCountStyle(folder);
+ }
+
+ private void setUnseenMessageCountStyle(IMAPFolderProxy folder) {
+ boolean containsUnseen = (folder.getUnseenMessageCount() > 0);
+ for (IMAPFolderProxy fold : folder.getChildren()) {
+ if (fold.getUnseenMessageCount() > 0) {
+ containsUnseen = true;
+ break;
+ }
+ }
+ if (containsUnseen) {
+ getWidget().addStyleName("hupa-IMAPFolder-unseen");
+ } else {
+ getWidget().removeStyleName("hupa-IMAPFolder-unseen");
+ }
+ }
+
+ /**
+ * Return the folder name to display in the TreeItem for the given
+ * IMAPFolder
+ *
+ * @param folder
+ * @return name
+ */
+ private String getFolderName(IMAPFolderProxy folder) {
+ if (folder.getUnseenMessageCount() > 0) {
+ return folder.getName() + " (" +
folder.getUnseenMessageCount() + ")";
+ }
+ return folder.getName();
+ }
+
+ @Override
+ public void setUserObject(Object obj) {
+ if ((obj instanceof IMAPFolderProxy) == false) {
+ throw new IllegalArgumentException("UserObject needs to
be an instance of IMAPFolder");
+ }
+ setFolderText((IMAPFolderProxy) obj);
+
+ super.setUserObject(obj);
+ }
+
+ @Override
+ public void startEdit() {
+ IMAPFolderProxy folder = (IMAPFolderProxy) getUserObject();
+ oldFullName = folder.getFullName();
+ oldName = folder.getName();
+ showEditBox(oldName);
+ manager.fireEvent(new EditEvent(EditEvent.EventType.Start,
oldFullName, null));
+ }
+
+ @Override
+ public void cancelEdit() {
+ IMAPFolderProxy folder = ((IMAPFolderProxy) getUserObject());
+ folder.setFullName(oldFullName);
+ showItem(getFolderName(folder));
+
+ manager.fireEvent(new EditEvent(EditEvent.EventType.Cancel,
oldFullName, null));
+
+ }
+
+ @Override
+ public void stopEdit() {
+ if (editBox.getText().length() < 1) {
+ // Empty folder name is not allowed!
+ cancelEdit();
+ } else {
+ String newFolderName = editBox.getText();
+ String newFullFolderName = oldFullName.substring(0,
oldFullName.length() - oldName.length())
+ + newFolderName;
+ IMAPFolderProxy folder = ((IMAPFolderProxy)
getUserObject());
+ folder.setFullName(newFullFolderName);
+ showItem(getFolderName(folder));
+
+ manager.fireEvent(new
EditEvent(EditEvent.EventType.Stop, oldFullName, newFullFolderName));
+ }
+
+ }
+>>>>>>>
}
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java
Thu Sep 12 02:53:43 2013
@@ -225,7 +225,7 @@ public class MessageSendPresenterTest ex
folder.setFullName("FOLDER");
presenter.bind();
- presenter.revealDisplay(testUser, folder, oldmessage, oldDetails,
type);
+// presenter.revealDisplay(testUser, folder, oldmessage, oldDetails,
type);
}
@SuppressWarnings("unchecked")
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchFoldersHandler.java
Thu Sep 12 02:53:43 2013
@@ -133,8 +133,12 @@ public class FetchFoldersHandler extends
private void walkFolders(Folder folder, IMAPFolderProxy imapFolder) throws
ActionException, MessagingException{
for (Folder f : folder.list()) {
IMAPFolderProxy iFolder = createIMAPFolder(f);
+<<<<<<< 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.
imapFolder.getChildIMAPFolders().add(iFolder);
+=======
+ imapFolder.getChildren().add(iFolder);
+>>>>>>>
walkFolders(f, iFolder);
}
}
Added:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java?rev=1522153&view=auto
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java
(added)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java
Thu Sep 12 02:53:43 2013
@@ -0,0 +1,99 @@
+package org.apache.hupa.server.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import javax.mail.Folder;
+import javax.mail.MessagingException;
+import javax.mail.NoSuchProviderException;
+import javax.mail.Session;
+import javax.servlet.http.HttpSession;
+
+import net.customware.gwt.dispatch.shared.ActionException;
+
+import org.apache.hupa.shared.SConsts;
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+
+import com.google.web.bindery.requestfactory.server.RequestFactoryServlet;
+import com.sun.mail.imap.IMAPStore;
+
+public class IMAPFolderService {
+
+ private static boolean useSSL = true;
+
+ public static String echo(String s){
+ return s;
+ }
+
+ public static List<IMAPFolder> requestFolders() throws
MessagingException, ActionException{
+ HttpSession session =
RequestFactoryServlet.getThreadLocalRequest().getSession();
+ Session mailSession = Session.getDefaultInstance(new
Properties(), null);
+ IMAPStore store = (IMAPStore)mailSession.getStore(useSSL ?
"imaps" : "imap");
+
+ User user = (User) session.getAttribute(SConsts.USER_SESS_ATTR);
+ store.connect("imap.gmail.com", 993, user.getName(),
user.getPassword());
+
+
+ com.sun.mail.imap.IMAPFolder folder = (com.sun.mail.imap.IMAPFolder)
store.getDefaultFolder();
+
+ // List of mail 'root' imap folders
+ List<IMAPFolder> imapFolders = new ArrayList<IMAPFolder>();
+
+ // Create IMAPFolder tree list
+ for (Folder f : folder.list()) {
+ IMAPFolder imapFolder = createIMAPFolder(f);
+ imapFolders.add(imapFolder);
+ walkFolders(f, imapFolder);
+ }
+ return imapFolders;
+ }
+
+ /**
+ * Walk through the folder's sub-folders and add sub-folders to current
imapFolder
+ *
+ * @param folder Folder to walk
+ * @param imapFolder Current IMAPFolder
+ * @throws ActionException If an error occurs
+ * @throws MessagingException If an error occurs
+ */
+ private static void walkFolders(Folder folder, IMAPFolder imapFolder)
throws MessagingException{
+ for (Folder f : folder.list()) {
+ IMAPFolder iFolder = createIMAPFolder(f);
+ imapFolder.getChildren().add(iFolder);
+ walkFolders(f, iFolder);
+ }
+ }
+
+ /**
+ * Create a new IMAPFolder from the given Folder
+ *
+ * @param folder Current folder
+ * @return imapFolder Created IMAPFolder
+ * @throws ActionException If an error occurs
+ * @throws MessagingException If an error occurs
+ */
+ private static IMAPFolder createIMAPFolder(Folder folder){
+
+ String fullName = folder.getFullName();
+ String delimiter;
+ IMAPFolder iFolder = null;
+
+ try {
+ System.out.println("Creating folder: " + fullName + " for user: ");
+ delimiter = String.valueOf(folder.getSeparator());
+ iFolder = new IMAPFolder(fullName);
+ iFolder.setDelimiter(delimiter);
+ if("[Gmail]".equals(folder.getFullName()))
+ return iFolder;
+ iFolder.setMessageCount(folder.getMessageCount());
+ iFolder.setSubscribed(folder.isSubscribed());
+ iFolder.setUnseenMessageCount(folder.getUnreadMessageCount());
+ } catch (MessagingException e) {
+ e.printStackTrace();
+ }
+
+ return iFolder;
+ }
+}
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=1522153&r1=1522152&r2=1522153&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:53:43 2013
@@ -46,6 +46,7 @@ import org.apache.hupa.shared.rf.EntityB
*/
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public class IMAPFolder extends EntityBase implements Serializable {
private Long id;
@@ -69,6 +70,9 @@ public class IMAPFolder extends EntityBa
}
+=======
+public class IMAPFolder implements Serializable {
+>>>>>>>
/**
=======
@@ -112,6 +116,7 @@ public class IMAPFolder extends EntityBa
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
=======
private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
@@ -119,10 +124,13 @@ public class IMAPFolder extends EntityBa
=======
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 List<IMAPFolder> children = new ArrayList<IMAPFolder>();
+>>>>>>>
private String fullName;
private String delimiter;
- private int msgCount;
- private int unseenMsgCount;
+ private int messageCount;
+ private int unseenMessageCount;
private boolean subscribed = false;
public IMAPFolder() {
@@ -159,10 +167,11 @@ public class IMAPFolder extends EntityBa
/**
* Set the child folders
*
- * @param childs
+ * @param children
*/
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public void setChildIMAPFolders(List<IMAPFolder> childs) {
=======
public void setChildIMAPFolders(ArrayList<IMAPFolder> childs) {
@@ -171,6 +180,10 @@ public class IMAPFolder extends EntityBa
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;
+=======
+ public void setChildren(List<IMAPFolder> children) {
+ this.children = children;
+>>>>>>>
}
/**
@@ -180,6 +193,7 @@ public class IMAPFolder extends EntityBa
*/
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public List<IMAPFolder> getChildIMAPFolders() {
=======
public ArrayList<IMAPFolder> getChildIMAPFolders() {
@@ -188,6 +202,10 @@ public class IMAPFolder extends EntityBa
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;
+=======
+ public List<IMAPFolder> getChildren() {
+ return children;
+>>>>>>>
}
/**
@@ -231,7 +249,7 @@ public class IMAPFolder extends EntityBa
* @return msgCount
*/
public int getMessageCount() {
- return msgCount;
+ return messageCount;
}
/**
@@ -240,7 +258,7 @@ public class IMAPFolder extends EntityBa
* @param msgCount
*/
public void setMessageCount(int msgCount) {
- this.msgCount = msgCount;
+ this.messageCount = msgCount;
}
/**
@@ -249,7 +267,7 @@ public class IMAPFolder extends EntityBa
* @param unseenMsgCount
*/
public void setUnseenMessageCount(int unseenMsgCount) {
- this.unseenMsgCount = unseenMsgCount;
+ this.unseenMessageCount = unseenMsgCount;
}
/**
@@ -257,8 +275,8 @@ public class IMAPFolder extends EntityBa
*
* @return unseenMsgCount
*/
- public int getUnseeMessageCount() {
- return unseenMsgCount;
+ public int getUnseenMessageCount() {
+ return unseenMessageCount;
}
@Override
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/AbstractEntityProxy.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/AbstractEntityProxy.java?rev=1522153&r1=1522152&r2=1522153&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/AbstractEntityProxy.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/proxy/AbstractEntityProxy.java
Thu Sep 12 02:53:43 2013
@@ -1,8 +1,6 @@
package org.apache.hupa.shared.proxy;
-import com.google.web.bindery.requestfactory.shared.EntityProxy;
+import com.google.web.bindery.requestfactory.shared.ValueProxy;
-public interface AbstractEntityProxy extends EntityProxy{
- Long getId();
- Long getVersion();
+public interface AbstractEntityProxy extends ValueProxy{
}
Modified:
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/IMAPFolderProxy.java?rev=1522153&r1=1522152&r2=1522153&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/IMAPFolderProxy.java
Thu Sep 12 02:53:43 2013
@@ -4,12 +4,13 @@ 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, locator = IMAPFolderLocator.class)
+@ProxyFor(value=IMAPFolder.class)
public interface IMAPFolderProxy extends AbstractEntityProxy {
- int getUnseeMessageCount();
+ int getUnseenMessageCount();
String getName();
@@ -17,8 +18,8 @@ public interface IMAPFolderProxy extends
void setFullName(String oldFullName);
- List<IMAPFolderProxy> getChildIMAPFolders();
- void setChildIMAPFolders(List<IMAPFolderProxy> childs);
+ List<IMAPFolderProxy> getChildren();
+ void setChildren(List<IMAPFolderProxy> children);
void setUnseenMessageCount(int count);
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=1522153&r1=1522152&r2=1522153&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:53:43 2013
@@ -93,8 +93,12 @@ public class FetchFoldersResult implemen
=======
for (IMAPFolderProxy folder : folders) {
ret.append(folder.getFullName()).append("\n");
+<<<<<<< HEAD
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.
+=======
+ for (IMAPFolderProxy f : folder.getChildren()) {
+>>>>>>>
childFolder(f, ret);
}
}
@@ -114,8 +118,12 @@ public class FetchFoldersResult implemen
=======
private void childFolder(IMAPFolderProxy child, StringBuffer ret) {
ret.append(child.getFullName()).append("\n");
+<<<<<<< HEAD
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.
+=======
+ for (IMAPFolderProxy folder : child.getChildren()) {
+>>>>>>>
childFolder(folder, ret);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
