Author: dongxu
Date: Thu Sep 12 04:02:21 2013
New Revision: 1522290
URL: http://svn.apache.org/r1522290
Log:
make compose panel left another widget rather than cell tree
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522290&r1=1522289&r2=1522290&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
Thu Sep 12 04:02:21 2013
@@ -226,30 +226,45 @@ import com.google.gwt.uibinder.client.Ui
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.cellview.client.CellTree;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
public class FolderListView extends Composite implements
FolderListActivity.Displayable {
- private static final Logger log = Logger.getLogger(FolderListView.class
- .getName());
- @UiField(provided = true) CellTree cellTree;
+ @UiField SimplePanel thisView;
+ private CellTree cellTree;
+ // FIXME here we can not support another cell tree, since both of their
style
+ // would not be cleared.
+ private HTMLPanel contactPanel;
@AssistedInject
public FolderListView(final FoldersTreeViewModel viewModel,
final EventBus eventBus, @Assisted Place place) {
+ initWidget(binder.createAndBindUi(this));
if (place instanceof ComposePlace) {
- // TODO this viewModel should be contacts
- cellTree = new CellTree(viewModel, null);
- log.fine("+++>swith to compose");
+ contactPanel = new HTMLPanel("contacts list");
+ if (thisView.getWidget() != null
+ && thisView.getWidget() instanceof
CellTree) {
+ thisView.remove(cellTree);
+ }
+ thisView.add(contactPanel);
} else {
cellTree = new CellTree(viewModel, null,
Resources.INSTANCE);
- log.fine("--->swith to other place");
+ cellTree.setAnimationEnabled(true);
+ if (thisView.getWidget() != null
+ && thisView.getWidget() instanceof
HTMLPanel) {
+ thisView.remove(contactPanel);
+ }
+ thisView.add(cellTree);
}
+<<<<<<< HEAD
cellTree.setAnimationEnabled(true);
initWidget(binder.createAndBindUi(this));
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+>>>>>>> make compose panel left another widget rather than cell tree
}
public interface Resources extends CellTree.Resources {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml?rev=1522290&r1=1522289&r2=1522290&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
Thu Sep 12 04:02:21 2013
@@ -27,9 +27,13 @@
>>>>>>> track the folder list tree model issue of invalid session, TODO how to
>>>>>>> retrieve folders data using GIN
=======
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
+<<<<<<< HEAD
>>>>>>> make message list view panel work as expected partly
<g:SimplePanel ui:field="FolderListView">
<c:CellTree ui:field="cellTree" />
</g:SimplePanel>
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <g:SimplePanel ui:field="thisView" />
+>>>>>>> make compose panel left another widget rather than cell tree
</ui:UiBinder>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
