You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:26:10 UTC

svn commit: r1522202 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml java/org/apache/hupa/client/ui/IMAPMessageListView.java java/org/apache/hupa/client/ui/MessagesCellTable.java webapp/Hupa.css

Author: dongxu
Date: Thu Sep 12 03:26:09 2013
New Revision: 1522202

URL: http://svn.apache.org/r1522202
Log:
make messages list pager be available

Modified:
    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
    james/hupa/trunk/client/src/main/webapp/Hupa.css

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=1522202&r1=1522201&r2=1522202&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:26:09 2013
@@ -234,10 +234,13 @@
 =======
 			margin: 0px 8px 8px 8px;
 <<<<<<< HEAD
+<<<<<<< HEAD
 			min-height: 400px;
 >>>>>>> make it look more beautiful
 =======
 			min-height: 300px;
+=======
+>>>>>>> make messages list pager be available
 		}
 		.southPanel{
 			text-align: center;

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=1522202&r1=1522201&r2=1522202&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:26:09 2013
@@ -1679,26 +1679,26 @@ public class IMAPMessageListView extends
 				assert result != null;
 //				folder.setMessageCount(result.getRealCount());// TODO if do this, there will be auto bean has been frozen.
 //				folder.setUnseenMessageCount(result.getRealUnreadCount());
-				dataProvider.setList(result.getMessages());
-				sortHandler =  new ListHandler<Message>(dataProvider.getList());
+//				dataProvider.setList(result.getMessages());
+//				sortHandler =  new ListHandler<Message>(dataProvider.getList());
 
 //		        sortHandler.setComparator(addressColumn, new Comparator<Contact>() {
 //		          public int compare(Contact o1, Contact o2) {
 //		            return o1.address.compareTo(o2.address);
 //		          }
 //		        });
-				table.addColumnSortHandler(sortHandler);
+//				table.addColumnSortHandler(sortHandler);
 				table.setRowCount(result.getRealCount());
 				if (result.getMessages() != null) {
-					table.setRowData(start + table.getPageSize(), result.getMessages());
+					table.setRowData(start, result.getMessages());
 				} else {
-					table.setRowData(start + table.getPageSize(), result.getMessages());
+					table.setRowData(start, result.getMessages());
 				}
 				
 	            pager.setPageStart(start);
-	            if (start == 0 || !table.isRowCountExact()) {
-	            	table.setRowCount(start + result.getMessages().size(), result.getMessages().size() < table.getPageSize());
-	            }
+//	            if (start == 0 || !table.isRowCountExact()) {
+//	            	table.setRowCount(start + result.getMessages().size(), result.getMessages().size() < table.getPageSize());
+//	            }
 //				flush();
 				// Notify presenter to update folder tree view
 				eventBus.fireEvent(new MessagesReceivedEvent(folder1, result.getMessages()));
@@ -1706,8 +1706,8 @@ public class IMAPMessageListView extends
 		});
 	}
 
-	private ListDataProvider<Message> dataProvider;
-    ListHandler<Message> sortHandler;
+//	private ListDataProvider<Message> dataProvider;
+//    ListHandler<Message> sortHandler;
 
 
 	protected void refreshSelection() {
@@ -1736,8 +1736,8 @@ public class IMAPMessageListView extends
 	        final MessagesCellTable table) {
 		this.table = table;
 		this.eventBus = eventBus;
-		dataProvider = new ListDataProvider<Message>();
-		dataProvider.addDataDisplay(table);
+//		dataProvider = new ListDataProvider<Message>();
+//		dataProvider.addDataDisplay(table);
 
 		table.setSelectionModel(selectionModel);
 	    selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
@@ -1807,6 +1807,7 @@ public class IMAPMessageListView extends
 
 	    SimplePager.Resources pagerResources = GWT.create(SimplePager.Resources.class);
 	    pager = new SimplePager(TextLocation.CENTER, pagerResources, false, 0, true);
+	    pager.setDisplay(table);
 
 		deleteMailButton = new EnableButton(constants.deleteMailButton());
 		newMailButton = new Button(constants.newMailButton());
@@ -1820,7 +1821,7 @@ public class IMAPMessageListView extends
 		loading = new Loading(constants.loading());
 
 		LayoutPanel solidCenterPanel = new LayoutPanel();
-		solidCenterPanel.addStyleName(HupaCSS.C_msg_list_container);
+//		solidCenterPanel.addStyleName(HupaCSS.C_msg_list_container);
 
 
 		HorizontalPanel buttonBar = new HorizontalPanel();

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=1522202&r1=1522201&r2=1522202&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:26:09 2013
@@ -512,12 +512,11 @@ import com.google.gwt.i18n.client.DateTi
 import com.google.gwt.resources.client.ImageResource;
 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 DataGrid<Message> {
 
-	private static final int PAGE_SIZE = 15;
+	private static final int PAGE_SIZE = 5;
 	
 	private HupaImageBundle imageBundle;
 
@@ -531,6 +530,7 @@ public class MessagesCellTable extends D
 		addColumn(new SubjectColumn());
 		addColumn(new AttachmentColumn());
 		addColumn(new DateColumn());
+		setRowCount(PAGE_SIZE, false);
 		setKeyboardSelectionPolicy(KeyboardSelectionPolicy.DISABLED);
 	}
 	private class CheckboxColumn extends Column<Message, Boolean> {

Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1522202&r1=1522201&r2=1522202&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.css (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 03:26:09 2013
@@ -414,7 +414,7 @@ div.hupa-bottom {
 table.hupa-login {
 =======
 .hupa-login {
-	margin-top:10%;
+	margin-top:10px;
 	margin-left:auto;
 	margin-right:auto;
 >>>>>>> make it look more beautiful



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