Author: dongxu Date: Thu Sep 12 05:00:54 2013 New Revision: 1522430 URL: http://svn.apache.org/r1522430 Log: remove deprecated code
Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java?rev=1522430&r1=1522429&r2=1522430&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java Thu Sep 12 05:00:54 2013 @@ -129,7 +129,7 @@ import com.google.gwt.uibinder.client.Ui import com.google.gwt.user.cellview.client.SimplePager; import com.google.gwt.user.cellview.client.SimplePager.TextLocation; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.inject.Inject; public class MessageListFooterView extends Composite implements MessageListFooterActivity.Displayable { @@ -148,6 +148,7 @@ public class MessageListFooterView exten <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD interface MessageListFooterUiBinder extends UiBinder<HTMLPanel, MessageListFooterView> { >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one ======= @@ -157,6 +158,9 @@ public class MessageListFooterView exten ======= interface MessageListFooterUiBinder extends UiBinder<SimplePanel, MessageListFooterView> { >>>>>>> make message list view panel work as expected partly +======= + interface MessageListFooterUiBinder extends UiBinder<HorizontalPanel, MessageListFooterView> { +>>>>>>> remove deprecated code } private static MessageListFooterUiBinder binder = GWT.create(MessageListFooterUiBinder.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml?rev=1522430&r1=1522429&r2=1522430&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml Thu Sep 12 05:00:54 2013 @@ -33,8 +33,22 @@ >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one ======= xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:c='urn:import:com.google.gwt.user.cellview.client'> - <g:SimplePanel> + + <ui:style> + .moveMessage { + position:absolute; + right:20px; + } + </ui:style> + <g:HorizontalPanel> <c:SimplePager ui:field="simplePager" /> +<<<<<<< HEAD </g:SimplePanel> >>>>>>> make message list view panel work as expected partly +======= + <g:SimplePanel addStyleNames="{style.moveMessage}"> + <g:HTML>Hello</g:HTML> + </g:SimplePanel> + </g:HorizontalPanel> +>>>>>>> remove deprecated code </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