Author: dongxu
Date: Thu Sep 12 04:49:50 2013
New Revision: 1522400

URL: http://svn.apache.org/r1522400
Log:
Fix grid not resizing since we werent implementing RequiresResize in its 
container. In fact we could get rid of its container

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

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522400&r1=1522399&r2=1522400&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
 Thu Sep 12 04:49:50 2013
@@ -45,6 +45,7 @@ import com.google.gwt.uibinder.client.Ui
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.RequiresResize;
+<<<<<<< HEAD
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.inject.Inject;
@@ -97,11 +98,13 @@ import com.google.gwt.event.shared.Event
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
+=======
+>>>>>>> Fix grid not resizing since we werent implementing RequiresResize in 
its container. In fact we could get rid of its container
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.inject.Inject;
 
-public class MessageListView extends Composite implements 
MessageListActivity.Displayable {
+public class MessageListView extends Composite implements 
MessageListActivity.Displayable, RequiresResize {
 
        @UiField SimpleLayoutPanel thisView;
        private MessagesCellTable grid;
@@ -274,5 +277,13 @@ public class MessageListView extends Com
        }
 >>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in 
 >>>>>>> toolsbar
 
+<<<<<<< HEAD
 >>>>>>> let messages list activity make use of mvp
+=======
+    @Override
+    public void onResize() {
+        grid.onResize();
+    }
+
+>>>>>>> Fix grid not resizing since we werent implementing RequiresResize in 
its container. In fact we could get rid of its container
 }



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

Reply via email to