james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From don...@apache.org
Subject svn commit: r1522383 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LabelListView.java LabelNode.java
Date Thu, 12 Sep 2013 04:44:11 GMT
Author: dongxu
Date: Thu Sep 12 04:44:11 2013
New Revision: 1522383

URL: http://svn.apache.org/r1522383
Log:
fixed issue#65, while this should be improved to add some cache or something like

Modified:
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java?rev=1522383&r1=1522382&r2=1522383&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java Thu
Sep 12 04:44:11 2013
@@ -288,7 +288,7 @@ public class LabelListView extends Compo
 		HasData<LabelNode> display;
 
 		public List<LabelNode> getDataList() {
-			return Collections.unmodifiableList(folderNodes);
+			return folderNodes;
 		}
 
 		public ImapLabelListDataProvider(HupaRequestFactory rf) {
@@ -312,7 +312,7 @@ public class LabelListView extends Compo
 						updateRowCount(-1, true);
 					} else {
 						for (ImapFolder folder : response) {
-							fillCellList(folderNodes, folder, null);
+							fillCellList(folderNodes, folder, LabelNode.ROOT);
 						}
 						updateRowData(0, folderNodes);
 					}

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java?rev=1522383&r1=1522382&r2=1522383&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelNode.java Thu Sep
12 04:44:11 2013
@@ -4,6 +4,9 @@ import org.apache.hupa.shared.domain.Ima
 
 public class LabelNode implements Comparable<LabelNode> {
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixed issue#65, while this should be improved to add some cache
or something like
 	
 	public static LabelNode ROOT = new LabelNode("---"); 
 	
@@ -56,15 +59,21 @@ public class LabelNode implements Compar
 	}
 	@Override
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixed issue#65, while this should be improved to add some cache
or something like
 	public int compareTo(LabelNode o) {
 		if(name == null) return -1;
 		if(o == null) return 1;
 		return name.compareTo(o.name);
+<<<<<<< HEAD
 =======
 	public int compareTo(LabelNode arg0) {
 		// TODO Auto-generated method stub
 		return 0;
 >>>>>>> add rename RF to label setting feature
+=======
+>>>>>>> fixed issue#65, while this should be improved to add some cache
or something like
 	}
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message