Author: dongxu
Date: Thu Sep 12 03:23:37 2013
New Revision: 1522195
URL: http://svn.apache.org/r1522195
Log:
use DataGrid instead of CellTable to list messages.
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
Thu Sep 12 03:23:37 2013
@@ -36,9 +36,9 @@ public class ActivityManagerInitializer
@Named("TopRegion") ActivityManager topActivityManager,
@Named("WestRegion") ActivityManager
westActivityManager,
@Named("MainContentRegion") ActivityManager
mainContentActivityManager) {
- topActivityManager.setDisplay(appPanelView.getTopContainer());
+ topActivityManager.setDisplay(appPanelView.getNorthContainer());
westActivityManager.setDisplay(appPanelView.getWestContainer());
-
mainContentActivityManager.setDisplay(appPanelView.getMainContainer());
+
mainContentActivityManager.setDisplay(appPanelView.getCenterContainer());
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
Thu Sep 12 03:23:37 2013
@@ -48,7 +48,7 @@ public class AppController {
}
public void start() {
- RootLayoutPanel.get().add(appPanelView.getMainLayoutPanel());
+ RootLayoutPanel.get().add(appPanelView.getAppLayoutPanel());
placeHistoryHandler.handleCurrentHistory();
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
Thu Sep 12 03:23:37 2013
@@ -74,11 +74,16 @@ public interface AppLayout {
=======
public interface AppLayout {
+<<<<<<< HEAD
DockLayoutPanel getMainLayoutPanel();
>>>>>>> use DockLayoutPanel as the App Layout
AcceptsOneWidget getTopContainer();
+=======
+ DockLayoutPanel getAppLayoutPanel();
+ AcceptsOneWidget getNorthContainer();
+>>>>>>> use DataGrid instead of CellTable to list messages.
AcceptsOneWidget getWestContainer();
- AcceptsOneWidget getMainContainer();
+ AcceptsOneWidget getCenterContainer();
void setLoginLayout();
void setDefaultLayout();
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
Thu Sep 12 03:23:37 2013
@@ -67,6 +67,7 @@ import com.google.gwt.user.client.ui.Flo
import com.google.gwt.user.client.ui.DockLayoutPanel;
>>>>>>> use DockLayoutPanel as the App Layout
import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
@@ -78,6 +79,7 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private final DockLayoutPanel appLayoutPanel;
interface AppLayoutUiBinder extends UiBinder<DockLayoutPanel,
AppLayoutImpl> {
@@ -96,6 +98,9 @@ public class AppLayoutImpl implements Ap
>>>>>>> decorate the theme
=======
private final DockLayoutPanel mainLayoutPanel;
+=======
+ private final DockLayoutPanel appLayoutPanel;
+>>>>>>> use DataGrid instead of CellTable to list messages.
interface AppLayoutUiBinder extends UiBinder<DockLayoutPanel,
AppLayoutImpl> {
>>>>>>> use DockLayoutPanel as the App Layout
@@ -137,15 +142,19 @@ public class AppLayoutImpl implements Ap
@UiField SimplePanel westPanel;
@UiField SimplePanel eastPanel;
- @UiField SimplePanel centerPanel;
+ @UiField LayoutPanel centerPanel;
@Inject
public AppLayoutImpl() {
+<<<<<<< HEAD
mainLayoutPanel = binder.createAndBindUi(this);
<<<<<<< HEAD
>>>>>>> decorate the theme
=======
>>>>>>> decorate the theme
+=======
+ appLayoutPanel = binder.createAndBindUi(this);
+>>>>>>> use DataGrid instead of CellTable to list messages.
setLoginLayout();
}
@@ -153,6 +162,7 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DockLayoutPanel getAppLayoutPanel() {
return appLayoutPanel;
}
@@ -185,11 +195,15 @@ public class AppLayoutImpl implements Ap
=======
public DockLayoutPanel getMainLayoutPanel() {
return mainLayoutPanel;
+=======
+ public DockLayoutPanel getAppLayoutPanel() {
+ return appLayoutPanel;
+>>>>>>> use DataGrid instead of CellTable to list messages.
}
>>>>>>> use DockLayoutPanel as the App Layout
@Override
- public AcceptsOneWidget getTopContainer() {
+ public AcceptsOneWidget getNorthContainer() {
return new AcceptsOneWidget() {
@Override
public void setWidget(IsWidget w) {
@@ -227,6 +241,7 @@ public class AppLayoutImpl implements Ap
@Override
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public AcceptsOneWidget getCenterContainer() {
=======
public AcceptsOneWidget getMainContainer() {
@@ -234,6 +249,9 @@ public class AppLayoutImpl implements Ap
=======
public AcceptsOneWidget getMainContainer() {
>>>>>>> decorate the theme
+=======
+ public AcceptsOneWidget getCenterContainer() {
+>>>>>>> use DataGrid instead of CellTable to list messages.
return new AcceptsOneWidget() {
@Override
public void setWidget(IsWidget w) {
@@ -241,12 +259,16 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> use DataGrid instead of CellTable to list messages.
if(centerPanel.getWidgetCount() > 0){
centerPanel.remove(0);
}
if(widget != null){
centerPanel.add(widget);
}
+<<<<<<< HEAD
=======
mainPanel.setWidget(widget);
>>>>>>> decorate the theme
@@ -256,6 +278,8 @@ public class AppLayoutImpl implements Ap
=======
centerPanel.setWidget(widget);
>>>>>>> use DockLayoutPanel as the App Layout
+=======
+>>>>>>> use DataGrid instead of CellTable to list messages.
}
};
}
@@ -264,6 +288,7 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
arrangeLayoutSize(8, 2, 15, 0);
}
@@ -367,13 +392,24 @@ public class AppLayoutImpl implements Ap
mainLayoutPanel.setWidgetSize(southPanel, 2);
mainLayoutPanel.setWidgetSize(eastPanel, 0);
>>>>>>> use DockLayoutPanel as the App Layout
+=======
+ this.arrangeLayout(true);
+>>>>>>> use DataGrid instead of CellTable to list messages.
}
public void setLoginLayout() {
- mainLayoutPanel.setWidgetSize(westPanel, 0);
- mainLayoutPanel.setWidgetSize(northPanel, 8);
- mainLayoutPanel.setWidgetSize(southPanel, 2);
- mainLayoutPanel.setWidgetSize(eastPanel, 0);
+ this.arrangeLayout(false);
+ }
+
+ private void arrangeLayout(boolean needWest){
+ this.arrangeLayoutSize(8, 2, needWest ? 15 : 0, 0);
+ }
+
+ private void arrangeLayoutSize(double n, double s, double w, double e){
+ appLayoutPanel.setWidgetSize(northPanel, n);
+ appLayoutPanel.setWidgetSize(southPanel, s);
+ appLayoutPanel.setWidgetSize(westPanel, w);
+ appLayoutPanel.setWidgetSize(eastPanel, e);
}
<<<<<<< HEAD
>>>>>>> decorate the theme
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
Thu Sep 12 03:23:37 2013
@@ -71,6 +71,7 @@
=======
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:my='urn:import:org.apache.hupa.client.ui'>
@@ -120,6 +121,9 @@
=======
>>>>>>> decorate the theme
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:my='urn:import:org.apache.hupa.client.ui'>
+=======
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:h='urn:import:org.apache.hupa.client.ui'>
+>>>>>>> use DataGrid instead of CellTable to list messages.
<ui:style>
.Hupa {
text-align: left;
@@ -250,19 +254,19 @@
=======
<g:DockLayoutPanel unit='EM' addStyleNames="{style.Hupa}">
<g:north size='8'>
- <g:SimplePanel ui:field="northPanel"
addStyleNames="{style.northPanel}" />
+ <g:SimplePanel ui:field="northPanel"
addStyleNames="{style.northPanel}"/>
</g:north>
<g:south size='2'>
<g:SimplePanel ui:field="southPanel" />
</g:south>
- <g:west size='18'>
- <g:SimplePanel ui:field="westPanel"
addStyleNames="{style.westPanel}" />
+ <g:west size='12'>
+ <g:SimplePanel ui:field="westPanel"
addStyleNames="{style.westPanel}"/>
</g:west>
<g:east size='0'>
<g:SimplePanel ui:field="eastPanel" />
</g:east>
<g:center>
- <g:SimplePanel ui:field="centerPanel"
addStyleNames="{style.centerPanel}" />
+ <g:LayoutPanel ui:field="centerPanel"
addStyleNames="{style.centerPanel}"/>
</g:center>
</g:DockLayoutPanel>
>>>>>>> use DockLayoutPanel as the App Layout
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
Thu Sep 12 03:23:37 2013
@@ -132,11 +132,15 @@ import com.google.gwt.core.client.Schedu
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+<<<<<<< HEAD
>>>>>>> clean some code. Pager issue remain
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
=======
>>>>>>> remove gwt-incubator dependency in Messages List Model;
+=======
+import com.google.gwt.dom.client.Style.Unit;
+>>>>>>> use DataGrid instead of CellTable to list messages.
import com.google.gwt.event.dom.client.HasChangeHandlers;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.dom.client.KeyCodes;
@@ -158,13 +162,17 @@ import com.google.gwt.user.client.ui.Com
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.MultiWordSuggestOracle;
import com.google.gwt.user.client.ui.SuggestBox;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import com.google.gwt.user.client.ui.VerticalPanel;
>>>>>>> remove gwt-incubator dependency in Messages List Model;
+=======
+>>>>>>> use DataGrid instead of CellTable to list messages.
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.CellPreviewEvent;
import com.google.gwt.view.client.CellPreviewEvent.Handler;
@@ -1810,8 +1818,8 @@ public class IMAPMessageListView extends
searchButton = new Button(constants.searchButton());
loading = new Loading(constants.loading());
- VerticalPanel msgListContainer = new VerticalPanel();
- msgListContainer.addStyleName(HupaCSS.C_msg_list_container);
+ LayoutPanel solidCenterPanel = new LayoutPanel();
+ solidCenterPanel.addStyleName(HupaCSS.C_msg_list_container);
HorizontalPanel buttonBar = new HorizontalPanel();
@@ -1856,7 +1864,6 @@ public class IMAPMessageListView extends
hPanel.add(searchPanel);
hPanel.setCellHorizontalAlignment(searchPanel,
HorizontalPanel.ALIGN_RIGHT);
- msgListContainer.add(hPanel);
CommandsBar commandsBar = new CommandsBar();
commandsBar.addLeft(new HTML(constants.select() + ":"));
@@ -1867,14 +1874,18 @@ public class IMAPMessageListView extends
commandsBar.addRight(pager);
- msgListContainer.add(commandsBar);
+ solidCenterPanel.add(hPanel);
+ solidCenterPanel.add(commandsBar);
+ solidCenterPanel.add(table);
+ solidCenterPanel.setWidgetTopHeight(hPanel, 0, Unit.EM, 3,
Unit.EM);
+ solidCenterPanel.setWidgetTopHeight(commandsBar, 3, Unit.EM, 3,
Unit.EM);
+ solidCenterPanel.setWidgetTopHeight(table, 6, Unit.EM, 100,
Unit.PCT);
- msgListContainer.add(table);
// msgListContainer.add(mailTable);
confirmBox.setText(messages.confirmDeleteMessages());
confirmDeleteAllBox.setText(messages.confirmDeleteAllMessages());
- initWidget(msgListContainer);
+ initWidget(solidCenterPanel);
}
public void reloadData() {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522195&r1=1522194&r2=1522195&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
Thu Sep 12 03:23:37 2013
@@ -510,11 +510,12 @@ import com.google.gwt.cell.client.ImageR
import com.google.gwt.cell.client.TextCell;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.resources.client.ImageResource;
-import com.google.gwt.user.cellview.client.CellTable;
import com.google.gwt.user.cellview.client.Column;
+import com.google.gwt.user.cellview.client.DataGrid;
+import
com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy;
import com.google.inject.Inject;
-public class MessagesCellTable extends CellTable<Message> {
+public class MessagesCellTable extends DataGrid<Message> {
private static final int PAGE_SIZE = 15;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
