Author: dongxu Date: Thu Sep 12 02:50:59 2013 New Revision: 1522149 URL: http://svn.apache.org/r1522149 Log: Make the evo more clear.
Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvoCallback.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvolution.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/ActivityPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingTopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/Displayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/TopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WidgetContainerDisplayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WidgetDisplayable.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/activity/IMAPMessageActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java 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/ioc/AppGinjector.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java 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=1522149&r1=1522148&r2=1522149&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 02:50:59 2013 @@ -101,6 +101,7 @@ <!-- Specify the app entry point class. --> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <entry-point class='org.apache.hupa.client.evo.HupaEvo'/> ======= <entry-point class='org.apache.hupa.client.Hupa'/> @@ -108,4 +109,7 @@ ======= <entry-point class='org.apache.hupa.client.HupaEvolution'/> >>>>>>> Change to new mvp framework - first step +======= + <entry-point class='org.apache.hupa.client.evo.HupaEvo'/> +>>>>>>> Make the evo more clear. </module> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 02:50:59 2013 @@ -5,6 +5,7 @@ import java.util.List; import org.apache.hupa.client.CachingDispatchAsync; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.IMAPMessagePlace; import org.apache.hupa.client.ui.WidgetDisplayable; @@ -12,7 +13,11 @@ import org.apache.hupa.shared.SConsts; ======= import org.apache.hupa.client.HupaEvoCallback; import org.apache.hupa.client.mvp.WidgetDisplayable; +======= +import org.apache.hupa.client.evo.HupaEvoCallback; +>>>>>>> Make the evo more clear. import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.data.IMAPFolder; >>>>>>> 1. improve the inbox folder place. Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java Thu Sep 12 02:50:59 2013 @@ -425,6 +425,7 @@ import com.google.gwt.event.dom.client.C ======= ======= import org.apache.hupa.client.HandlerRegistrationAdapter; +<<<<<<< HEAD import org.apache.hupa.client.HupaEvoCallback; <<<<<<< HEAD >>>>>>> @@ -433,7 +434,13 @@ import org.apache.hupa.client.activity.M >>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.mvp.WidgetDisplayable; import org.apache.hupa.client.place.IMAPMessagePlace; +======= +import org.apache.hupa.client.activity.MessageSendActivity.Type; +import org.apache.hupa.client.evo.HupaEvoCallback; +import org.apache.hupa.client.place.MailFolderPlace; +>>>>>>> Make the evo more clear. import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; @@ -1005,6 +1012,7 @@ public class IMAPMessageListActivity ext } }); } +<<<<<<< HEAD public IMAPMessageListActivity with(User user, IMAPFolder imapFolder, String string){ this.user = user; <<<<<<< HEAD @@ -1014,6 +1022,12 @@ public class IMAPMessageListActivity ext this.folder = imapFolder; this.searchValue = string; >>>>>>> At first make the inbox work, but only when click the refresh button. >>>>>>> The page also be working, the other folder will be like the same. +======= + public IMAPMessageListActivity with(MailFolderPlace place){ + this.user = place.getUser(); + this.folder = place.getFolder(); + this.searchValue = place.getSearchValue(); +>>>>>>> Make the evo more clear. return this; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 02:50:59 2013 @@ -59,9 +59,9 @@ import org.apache.hupa.client.place.Mail >>>>>>> Change to new mvp framework - first step ======= import org.apache.hupa.client.HupaConstants; -import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.events.FlashEvent; import org.apache.hupa.shared.events.SessionExpireEvent; import org.apache.hupa.shared.events.SessionExpireEventHandler; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 02:50:59 2013 @@ -65,11 +65,14 @@ import org.apache.hupa.client.ui.WidgetD import net.customware.gwt.dispatch.client.DispatchAsync; import net.customware.gwt.dispatch.shared.Action; -import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.mvp.MessageSendPresenter.Type; import org.apache.hupa.client.place.MessageSendPlace; +<<<<<<< HEAD >>>>>>> 1. improve the inbox folder place. +======= +import org.apache.hupa.client.ui.WidgetDisplayable; +>>>>>>> Make the evo more clear. import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.Util; import org.apache.hupa.shared.data.IMAPFolder; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java Thu Sep 12 02:50:59 2013 @@ -38,6 +38,7 @@ import net.customware.gwt.dispatch.clien import org.apache.hupa.client.HupaConstants; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.ui.WidgetDisplayable; @@ -46,7 +47,11 @@ import org.apache.hupa.shared.data.User; ======= import org.apache.hupa.client.HupaEvoCallback; import org.apache.hupa.client.mvp.WidgetDisplayable; +======= +import org.apache.hupa.client.evo.HupaEvoCallback; +>>>>>>> Make the evo more clear. import org.apache.hupa.client.place.DefaultPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.data.User; >>>>>>> introduce the top activity import org.apache.hupa.shared.events.FlashEvent; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 02:50:59 2013 @@ -255,6 +255,7 @@ import java.util.List; import net.customware.gwt.dispatch.client.DispatchAsync; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.activity.MessageSendActivity.Type; import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.IMAPMessagePlace; @@ -302,11 +303,14 @@ import org.apache.hupa.shared.rpc.GetMes import org.apache.hupa.shared.rpc.GetMessageDetailsResult; ======= import org.apache.hupa.client.HupaEvoCallback; +======= +>>>>>>> Make the evo more clear. import org.apache.hupa.client.activity.MessageSendActivity.Type; -import org.apache.hupa.client.mvp.WidgetContainerDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.IMAPMessagePlace; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.ui.WidgetContainerDisplayable; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.client.widgets.IMAPTreeItem; import org.apache.hupa.shared.data.IMAPFolder; 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=1522149&r1=1522148&r2=1522149&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 02:50:59 2013 @@ -106,6 +106,7 @@ import net.customware.gwt.dispatch.clien import net.customware.gwt.dispatch.client.ExceptionHandler; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.CachingDispatchAsync; import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; @@ -121,6 +122,8 @@ import org.apache.hupa.client.mapper.Cac import org.apache.hupa.client.mapper.MainContentActivityMapper; ======= import org.apache.hupa.client.AppController; +======= +>>>>>>> Make the evo more clear. import org.apache.hupa.client.CachingDispatchAsync; import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; @@ -129,6 +132,7 @@ import org.apache.hupa.client.activity.M import org.apache.hupa.client.activity.TopActivity; import org.apache.hupa.client.activity.WestActivity; import org.apache.hupa.client.dnd.PagingScrollTableRowDragController; +<<<<<<< HEAD import org.apache.hupa.client.mvp.AppPlaceHistoryMapper; import org.apache.hupa.client.mvp.CachingTopActivityMapper; import org.apache.hupa.client.mvp.CachingWestActivityMapper; @@ -138,6 +142,13 @@ import org.apache.hupa.client.mvp.WestAc >>>>>>> Change to new mvp framework - first step ======= >>>>>>> At first make the inbox work, but only when click the refresh button. >>>>>>> The page also be working, the other folder will be like the same. +======= +import org.apache.hupa.client.evo.AppController; +import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; +import org.apache.hupa.client.mapper.CachingTopActivityMapper; +import org.apache.hupa.client.mapper.CachingWestActivityMapper; +import org.apache.hupa.client.mapper.MainContentActivityMapper; +>>>>>>> Make the evo more clear. import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.ui.AppLayout; import org.apache.hupa.client.ui.AppLayoutImpl; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java Thu Sep 12 02:50:59 2013 @@ -26,6 +26,7 @@ import org.apache.hupa.client.HupaContro package org.apache.hupa.client.ioc; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.AppController; >>>>>>> Change to new mvp framework - first step ======= @@ -36,6 +37,9 @@ package org.apache.hupa.client.ioc; import org.apache.hupa.client.AppController; >>>>>>> Change to new mvp framework - first step +======= +import org.apache.hupa.client.evo.AppController; +>>>>>>> Make the evo more clear. import com.google.gwt.inject.client.GinModules; import com.google.gwt.inject.client.Ginjector; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java Thu Sep 12 02:50:59 2013 @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -20,6 +21,8 @@ ======= >>>>>>> Make the evo more clear. +======= +>>>>>>> Make the evo more clear. package org.apache.hupa.client.ui; public interface Displayable { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java?rev=1522149&r1=1522148&r2=1522149&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java Thu Sep 12 02:50:59 2013 @@ -24,10 +24,14 @@ import java.util.Iterator; import net.customware.gwt.dispatch.client.DispatchAsync; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.evo.HupaEvoCallback; ======= import org.apache.hupa.client.HupaEvoCallback; >>>>>>> Change to new mvp framework - first step +======= +import org.apache.hupa.client.evo.HupaEvoCallback; +>>>>>>> Make the evo more clear. import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; import org.apache.hupa.shared.data.User; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org