Author: dongxu
Date: Thu Sep 12 04:46:51 2013
New Revision: 1522391
URL: http://svn.apache.org/r1522391
Log:
add intents to labels list
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
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/activity/MessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522391&r1=1522390&r2=1522391&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Thu Sep 12 04:46:51 2013
@@ -316,7 +316,7 @@ public class MessageListActivity extends
@Inject private ToolBarActivity.Displayable toolBar;
@Inject private TopBarActivity.Displayable topBar;
private String folderName;
- private String searchValue;
+// private String searchValue;
private User user;
@Override
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522391&r1=1522390&r2=1522391&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 04:46:51 2013
@@ -170,6 +170,7 @@ import org.apache.hupa.client.mapper.App
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.mapper.CachingTopActivityMapper;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -225,6 +226,8 @@ import org.apache.hupa.client.mapper.Com
=======
import org.apache.hupa.client.mapper.CachingMessageListActivityMapper;
>>>>>>> change message list view to make it not refresh the whole list when
>>>>>>> click one of the messages
+=======
+>>>>>>> add intents to labels list
import org.apache.hupa.client.mapper.CachingTopBarActivityMapper;
>>>>>>> fixed issue#46 and issue#32
import org.apache.hupa.client.mapper.ComposeActivityMapper;
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=1522391&r1=1522390&r2=1522391&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:46:51 2013
@@ -22,7 +22,6 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
<<<<<<< HEAD
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.hupa.client.activity.LabelListActivity;
@@ -208,7 +207,6 @@ import com.google.gwt.user.client.ui.But
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.view.client.AsyncDataProvider;
import com.google.gwt.view.client.HasData;
import com.google.gwt.view.client.ProvidesKey;
@@ -273,10 +271,10 @@ public class LabelListView extends Compo
}
if (value.getFolder().getSubscribed()) {
- sb.appendHtmlConstant(value.getName());
+
sb.appendHtmlConstant(value.getNameForDisplay());
} else {
sb.appendHtmlConstant("<span
style='color:gray;'>");
- sb.appendHtmlConstant(value.getName());
+
sb.appendHtmlConstant(value.getNameForDisplay());
sb.appendHtmlConstant("</span>");
}
}
@@ -305,9 +303,10 @@ public class LabelListView extends Compo
@Override
protected void onRangeChanged(HasData<LabelNode> display) {
- final int start = display.getVisibleRange().getStart();
+ final int start = display.getVisibleRange().getStart();
rf.fetchFoldersRequest().fetch(null,
Boolean.TRUE).fire(new Receiver<List<ImapFolder>>() {
+
@Override
public void onSuccess(List<ImapFolder>
response) {
folderNodes.clear();
@@ -315,22 +314,24 @@ public class LabelListView extends Compo
updateRowCount(-1, true);
} else {
for (ImapFolder folder :
response) {
-
fillCellList(folderNodes, folder, LabelNode.ROOT);
+
fillCellList(folderNodes, folder, LabelNode.ROOT, " ");
}
updateRowData(start,
folderNodes);
}
}
- private void fillCellList(List<LabelNode>
folderNodes, ImapFolder curFolder, LabelNode parent) {
+ private void fillCellList(List<LabelNode>
folderNodes, ImapFolder curFolder, LabelNode parent,
+ String intents) {
LabelNode labelNode = new LabelNode();
labelNode.setFolder(curFolder);
labelNode.setName(curFolder.getName());
+ labelNode.setNameForDisplay(intents +
curFolder.getName());
labelNode.setParent(parent);
labelNode.setPath(curFolder.getFullName());
folderNodes.add(labelNode);
if (curFolder.getHasChildren()) {
for (ImapFolder subFolder :
curFolder.getChildren()) {
-
fillCellList(folderNodes, subFolder, labelNode);
+
fillCellList(folderNodes, subFolder, labelNode, intents +
" ");
}
}
}
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=1522391&r1=1522390&r2=1522391&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:46:51 2013
@@ -26,6 +26,7 @@ public class LabelNode implements Compar
public void setNameForDisplay(String nameForDisplay) {
this.nameForDisplay = nameForDisplay;
}
+<<<<<<< HEAD
=======
private ImapFolder folder;
private String name;
@@ -33,6 +34,8 @@ public class LabelNode implements Compar
private LabelNode parent;
>>>>>>> add rename RF to label setting feature
+=======
+>>>>>>> add intents to labels list
public ImapFolder getFolder() {
return folder;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
