Author: dongxu Date: Thu Sep 12 04:58:45 2013 New Revision: 1522424 URL: http://svn.apache.org/r1522424 Log: scrub code, remove deprecated code
Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageFolderPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/NamedPlace.java Modified: 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/mapper/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java 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=1522424&r1=1522423&r2=1522424&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 04:58:45 2013 @@ -147,11 +147,14 @@ import org.apache.hupa.client.HupaContro >>>>>>> move new theme ui from experiment to hupa evo ======= import org.apache.hupa.client.activity.FolderListActivity; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers import org.apache.hupa.client.activity.IMAPMessageActivity; ======= >>>>>>> try to rearrange the places and history managment. import org.apache.hupa.client.activity.IMAPMessageListActivity; +======= +>>>>>>> scrub code, remove deprecated code import org.apache.hupa.client.activity.LabelListActivity; import org.apache.hupa.client.activity.LabelPropertiesActivity; import org.apache.hupa.client.activity.LoginActivity; @@ -159,13 +162,11 @@ import org.apache.hupa.client.activity.L import org.apache.hupa.client.activity.MessageContentActivity; import org.apache.hupa.client.activity.MessageListActivity; import org.apache.hupa.client.activity.MessageListFooterActivity; -import org.apache.hupa.client.activity.MessageSendActivity; import org.apache.hupa.client.activity.NavigationActivity; import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.SearchBoxActivity; import org.apache.hupa.client.activity.StatusActivity; import org.apache.hupa.client.activity.ToolBarActivity; -import org.apache.hupa.client.activity.TopActivity; import org.apache.hupa.client.activity.TopBarActivity; import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; <<<<<<< HEAD @@ -272,9 +273,9 @@ import org.apache.hupa.client.ui.Compose import org.apache.hupa.client.ui.ContactPropertiesView; import org.apache.hupa.client.ui.ContactsListView; import org.apache.hupa.client.ui.FolderListView; -import org.apache.hupa.client.ui.FoldersTreeViewModel; import org.apache.hupa.client.ui.HupaLayout; import org.apache.hupa.client.ui.HupaLayoutable; +<<<<<<< HEAD import org.apache.hupa.client.ui.IMAPMessageListView; <<<<<<< HEAD <<<<<<< HEAD @@ -284,6 +285,8 @@ import org.apache.hupa.client.ui.IMAPMes import org.apache.hupa.client.ui.IMAPMessageView; ======= >>>>>>> try to rearrange the places and history managment. +======= +>>>>>>> scrub code, remove deprecated code import org.apache.hupa.client.ui.LabelListView; import org.apache.hupa.client.ui.LabelPropertiesView; import org.apache.hupa.client.ui.LoginLayout; @@ -293,7 +296,6 @@ import org.apache.hupa.client.ui.LogoVie import org.apache.hupa.client.ui.MessageContentView; import org.apache.hupa.client.ui.MessageListFooterView; import org.apache.hupa.client.ui.MessageListView; -import org.apache.hupa.client.ui.MessageSendView; import org.apache.hupa.client.ui.MessagesCellTable; import org.apache.hupa.client.ui.NavigationView; import org.apache.hupa.client.ui.NotificationView; @@ -301,7 +303,6 @@ import org.apache.hupa.client.ui.SearchB import org.apache.hupa.client.ui.StatusView; import org.apache.hupa.client.ui.ToolBarView; import org.apache.hupa.client.ui.TopBarView; -import org.apache.hupa.client.ui.TopView; import com.google.gwt.activity.shared.ActivityManager; <<<<<<< HEAD @@ -433,6 +434,7 @@ public class AppGinModule extends Abstra bind(ContactPropertiesActivity.class).in(Singleton.class); +<<<<<<< HEAD bind(FolderListActivity.Displayable.class).to(FolderListView.class).in(Singleton.class); bind(MessagesCellTable.class).in(Singleton.class); @@ -672,9 +674,11 @@ public class AppGinModule extends Abstra bind(TopActivity.class).in(Singleton.class); bind(IMAPMessageListActivity.class).in(Singleton.class); bind(MessageSendActivity.class).in(Singleton.class); +======= + bind(FolderListActivity.Displayable.class).to(FolderListView.class).in(Singleton.class); +>>>>>>> scrub code, remove deprecated code bind(MessagesCellTable.class).in(Singleton.class); - bind(FoldersTreeViewModel.class).in(Singleton.class); bind(CellTree.Resources.class).to(CellTree.BasicResources.class); // Places bind(PlaceHistoryMapper.class).to(AppPlaceHistoryMapper.class).in(Singleton.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java?rev=1522424&r1=1522423&r2=1522424&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java Thu Sep 12 04:58:45 2013 @@ -22,9 +22,8 @@ package org.apache.hupa.client.mapper; import org.apache.hupa.client.place.ComposePlace; import org.apache.hupa.client.place.ContactPlace; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.MessagePlace; import org.apache.hupa.client.place.FolderPlace; -import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.place.MessagePlace; import org.apache.hupa.client.place.SettingPlace; import com.google.gwt.place.shared.PlaceHistoryMapper; @@ -33,7 +32,6 @@ import com.google.gwt.place.shared.WithT @WithTokenizers({ DefaultPlace.Tokenizer.class, FolderPlace.Tokenizer.class, - MessageSendPlace.Tokenizer.class, MessagePlace.Tokenizer.class, ComposePlace.Tokenizer.class, SettingPlace.Tokenizer.class, Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java?rev=1522424&r1=1522423&r2=1522424&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java Thu Sep 12 04:58:45 2013 @@ -44,6 +44,7 @@ public class DefaultPlace extends Abstra } @Prefix("") +<<<<<<< HEAD public static class Tokenizer implements PlaceTokenizer<DefaultPlace> { @Override @@ -105,6 +106,8 @@ public class DefaultPlace extends Abstra } @Prefix("!") +======= +>>>>>>> scrub code, remove deprecated code public static class Tokenizer implements PlaceTokenizer<DefaultPlace> { @Override Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java?rev=1522424&r1=1522423&r2=1522424&view=diff ============================================================================== --- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java (original) +++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java Thu Sep 12 04:58:45 2013 @@ -35,7 +35,7 @@ import org.apache.hupa.widgets.ui.HasEna ======= import gwtupload.client.IUploader; -import org.apache.hupa.client.activity.MessageSendActivity.Displayable; +import org.apache.hupa.client.activity.ComposeActivity.Displayable; import org.apache.hupa.shared.rpc.ContactsResult.Contact; import org.apache.hupa.widgets.ui.HasEnable; @@ -46,6 +46,9 @@ import com.google.gwt.user.client.ui.Has import com.google.gwt.user.client.ui.HasText; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> scrub code, remove deprecated code import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Widget; @@ -109,6 +112,7 @@ public class MockMessageSendDisplay impl <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> first commit @@ -120,6 +124,8 @@ public class MockMessageSendDisplay impl >>>>>>> first commit ======= >>>>>>> first commit +======= +>>>>>>> scrub code, remove deprecated code public HasHTML getMessageHTML() { return messageHtml; } @@ -180,6 +186,9 @@ public class MockMessageSendDisplay impl <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> scrub code, remove deprecated code @Override public void showCc() { // TODO Auto-generated method stub @@ -330,8 +339,11 @@ public class MockMessageSendDisplay impl return null; } +<<<<<<< HEAD ======= >>>>>>> first commit ======= >>>>>>> first commit +======= +>>>>>>> scrub code, remove deprecated code } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org