Author: dongxu
Date: Thu Sep 12 03:46:45 2013
New Revision: 1522247
URL: http://svn.apache.org/r1522247
Log:
try to integrate the messages list's panel
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
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=1522247&r1=1522246&r2=1522247&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 03:46:45 2013
@@ -59,7 +59,7 @@ import org.apache.hupa.client.activity.M
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
public class MessageListView extends Composite implements
MessageListActivity.Displayable {
@@ -68,8 +68,12 @@ public class MessageListView extends Com
initWidget(binder.createAndBindUi(this));
}
+<<<<<<< HEAD
interface MessageListUiBinder extends UiBinder<HTMLPanel,
MessageListView> {
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ interface MessageListUiBinder extends UiBinder<SimplePanel,
MessageListView> {
+>>>>>>> try to integrate the messages list's panel
}
private static MessageListUiBinder binder = GWT
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml?rev=1522247&r1=1522246&r2=1522247&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
Thu Sep 12 03:46:45 2013
@@ -15,7 +15,14 @@
<g:SimpleLayoutPanel ui:field="thisView" />
=======
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+<<<<<<< HEAD
<g:HTMLPanel>MessageList
</g:HTMLPanel>
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <g:SimplePanel>
+ <g:HTMLPanel>MessageList
+ </g:HTMLPanel>
+ </g:SimplePanel>
+>>>>>>> try to integrate the messages list's panel
</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
