Author: dongxu Date: Thu Sep 12 03:17:34 2013 New Revision: 1522184 URL: http://svn.apache.org/r1522184 Log: remove some gwt-incubator stuff
Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/widgets/DragRefetchPagingScrollTable.java james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RefetchPagingScrollTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1522184&r1=1522183&r2=1522184&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Thu Sep 12 03:17:34 2013 @@ -48,6 +48,7 @@ <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' /> <inherits name='com.google.gwt.gen2.table.override.Override'/> <<<<<<< HEAD +<<<<<<< HEAD <inherits name='com.google.gwt.gen2.table.ScrollTable'/> <inherits name='net.customware.gwt.dispatch.Dispatch' /> <<<<<<< HEAD @@ -65,6 +66,9 @@ <inherits name='net.customware.gwt.dispatch.Dispatch' />--> <inherits name='net.customware.gwt.presenter.Presenter' /> >>>>>>> try to change fetch messages to use RF +======= + <inherits name='com.google.gwt.gen2.table.ScrollTable'/> +>>>>>>> remove some gwt-incubator stuff <inherits name="com.google.gwt.activity.Activity"/> <inherits name="com.google.gwt.place.Place"/> <inherits name="com.google.gwt.inject.Inject"/> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522184&r1=1522183&r2=1522184&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java Thu Sep 12 03:17:34 2013 @@ -115,7 +115,6 @@ import org.apache.hupa.client.activity.L import org.apache.hupa.client.activity.MessageSendActivity; import org.apache.hupa.client.activity.TopActivity; import org.apache.hupa.client.activity.WestActivity; -import org.apache.hupa.client.dnd.PagingScrollTableRowDragController; import org.apache.hupa.client.evo.AppController; import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; import org.apache.hupa.client.mapper.CachingTopActivityMapper; @@ -167,7 +166,6 @@ import org.apache.hupa.client.ui.IMAPMes import org.apache.hupa.client.ui.IMAPMessageView; import org.apache.hupa.client.ui.LoginView; import org.apache.hupa.client.ui.MessageSendView; -import org.apache.hupa.client.ui.MessageTableModel; import org.apache.hupa.client.ui.MessagesCellTable; import org.apache.hupa.client.ui.TopView; import org.apache.hupa.client.ui.WestView; @@ -427,9 +425,6 @@ public class AppGinModule extends Abstra bind(MessageSendActivity.class).in(Singleton.class); bind(IMAPMessageActivity.class).in(Singleton.class); - - bind(PagingScrollTableRowDragController.class).in(Singleton.class); - bind(MessageTableModel.class).in(Singleton.class); bind(MessagesCellTable.class).in(Singleton.class); // Places bind(PlaceHistoryMapper.class).to(AppPlaceHistoryMapper.class).in(Singleton.class); 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=1522184&r1=1522183&r2=1522184&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:17:34 2013 @@ -80,7 +80,6 @@ import com.google.gwt.dom.client.Style.U ======= >>>>>>> Change to new mvp framework - first step import org.apache.hupa.client.bundles.HupaImageBundle; -import org.apache.hupa.client.dnd.PagingScrollTableRowDragController; import org.apache.hupa.client.rf.FetchMessagesRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.widgets.CommandsBar; @@ -1723,8 +1722,7 @@ public class IMAPMessageListView extends MessagesCellTable table; private boolean pending; @Inject - public IMAPMessageListView(final PagingScrollTableRowDragController controller, - final MessageTableModel mTableModel, final HupaConstants constants, final HupaMessages messages, + public IMAPMessageListView(final HupaConstants constants, final HupaMessages messages, final EventBus eventBus, final HupaRequestFactory requestFactory, final MessagesCellTable table) { this.table = table; Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml?rev=1522184&r1=1522183&r2=1522184&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml Thu Sep 12 03:17:34 2013 @@ -20,6 +20,7 @@ <inherits name='com.google.gwt.widgetideas.WidgetIdeas'/> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' /> <inherits name='com.google.gwt.gen2.table.override.Override'/> @@ -30,6 +31,8 @@ <inherits name='com.google.gwt.gen2.table.override.Override'/> <inherits name='com.google.gwt.gen2.table.ScrollTable'/> >>>>>>> first commit +======= +>>>>>>> remove some gwt-incubator stuff <inherits name='org.cobogw.gwt.user.User' /> <source path="widgets"/> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org