Author: dongxu Date: Thu Sep 12 03:56:50 2013 New Revision: 1522276 URL: http://svn.apache.org/r1522276 Log: support code split
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.FolderListActivity; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.place.SettingPlace; import com.google.gwt.activity.shared.Activity; @@ -30,12 +31,19 @@ import com.google.gwt.core.client.RunAsy ======= ======= import org.apache.hupa.client.place.DefaultPlace; +======= +>>>>>>> support code split import org.apache.hupa.client.place.MailFolderPlace; >>>>>>> make folder list panel work as expected import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -48,7 +56,8 @@ public class FolderListActivityMapper im private final Provider<FolderListActivity> folderListActivityProvider; @Inject - public FolderListActivityMapper(Provider<FolderListActivity> folderListActivityProvider) { + public FolderListActivityMapper( + Provider<FolderListActivity> folderListActivityProvider) { this.folderListActivityProvider = folderListActivityProvider; } @@ -71,9 +80,27 @@ public class FolderListActivityMapper im ======= public Activity getActivity(Place place) { +<<<<<<< HEAD if(place instanceof DefaultPlace)return null; else if (place instanceof MailFolderPlace) folderListActivityProvider.get(); return folderListActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + if (place instanceof MailFolderPlace) { + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return folderListActivityProvider.get(); + } + }; + + } + return null; +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -24,10 +24,15 @@ import org.apache.hupa.client.activity.L import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; ======= >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -43,6 +48,9 @@ public class LoginActivityMapper impleme @Override public Activity getActivity(Place place) { <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> support code split return new ActivityAsyncProxy() { @Override protected void doAsync(RunAsyncCallback callback) { @@ -54,8 +62,11 @@ public class LoginActivityMapper impleme return loginActivityProvider.get(); } }; +<<<<<<< HEAD ======= return loginActivityProvider.get(); >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one +======= +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -27,7 +27,12 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; ======= import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -60,7 +65,21 @@ public class LogoActivityMapper implemen }; ======= public Activity getActivity(Place place) { +<<<<<<< HEAD return logoActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return logoActivityProvider.get(); + } + }; +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -42,7 +42,12 @@ import org.apache.hupa.client.rf.HupaReq import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceController; import com.google.inject.Inject; @@ -86,6 +91,7 @@ public class MessageContentActivityMappe this.messageContentActivityProvider = messageContentActivityProvider; } +<<<<<<< HEAD public Activity getActivity(Place place) { <<<<<<< HEAD <<<<<<< HEAD @@ -103,6 +109,22 @@ public class MessageContentActivityMappe >>>>>>> scrub code return messageContentActivityProvider.get().with( (MailFolderPlace) place); +======= + public Activity getActivity(final Place place) { + if (place instanceof MailFolderPlace) { + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return messageContentActivityProvider.get().with( + (MailFolderPlace) place); + } + }; +>>>>>>> support code split } return null; >>>>>>> make message content work as expected partly Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.MessageListActivity; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.place.FolderPlace; import org.apache.hupa.client.place.MessagePlace; @@ -31,12 +32,19 @@ import com.google.gwt.core.client.RunAsy ======= ======= import org.apache.hupa.client.place.DefaultPlace; +======= +>>>>>>> support code split import org.apache.hupa.client.place.MailFolderPlace; >>>>>>> make message list view panel work as expected partly import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -49,11 +57,13 @@ public class MessageListActivityMapper i private final Provider<MessageListActivity> messageListActivityProvider; @Inject - public MessageListActivityMapper(Provider<MessageListActivity> messageListActivityProvider) { + public MessageListActivityMapper( + Provider<MessageListActivity> messageListActivityProvider) { this.messageListActivityProvider = messageListActivityProvider; } <<<<<<< HEAD +<<<<<<< HEAD @Override protected Activity lazyLoadActivity(final Place place) { if (place instanceof FolderPlace) { @@ -83,5 +93,23 @@ public class MessageListActivityMapper i else if (place instanceof MailFolderPlace) return messageListActivityProvider.get().with((MailFolderPlace)place); return messageListActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + public Activity getActivity(final Place place) { + if (place instanceof MailFolderPlace) { + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return messageListActivityProvider.get().with( + (MailFolderPlace) place); + } + }; + } + return null; +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -27,7 +27,12 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; ======= import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -60,7 +65,17 @@ public class MessageListFooterActivityMa };} ======= public Activity getActivity(Place place) { - return messageListFooterActivityProvider.get(); + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return messageListFooterActivityProvider.get(); + } + }; } >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -27,11 +27,14 @@ import com.google.gwt.activity.shared.Ac import com.google.gwt.activity.shared.ActivityMapper; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; +<<<<<<< HEAD ======= import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -39,6 +42,7 @@ import com.google.inject.Provider; public class NavigationActivityMapper implements ActivityMapper { private final Provider<NavigationActivity> navigationActivityProvider; <<<<<<< HEAD +<<<<<<< HEAD @Inject public NavigationActivityMapper( @@ -48,12 +52,21 @@ public class NavigationActivityMapper im @Inject public NavigationActivityMapper(Provider<NavigationActivity> navigationActivityProvider) { >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + + @Inject + public NavigationActivityMapper( + Provider<NavigationActivity> navigationActivityProvider) { +>>>>>>> support code split this.navigationActivityProvider = navigationActivityProvider; } public Activity getActivity(Place place) { <<<<<<< HEAD +<<<<<<< HEAD if(place instanceof DefaultPlace) return null; +======= +>>>>>>> support code split return new ActivityAsyncProxy() { @Override protected void doAsync(RunAsyncCallback callback) { @@ -65,8 +78,11 @@ public class NavigationActivityMapper im return navigationActivityProvider.get(); } }; +<<<<<<< HEAD ======= return navigationActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -27,11 +27,14 @@ import com.google.gwt.activity.shared.Ac import com.google.gwt.activity.shared.ActivityMapper; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; +<<<<<<< HEAD ======= import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -46,7 +49,10 @@ public class StatusActivityMapper implem public Activity getActivity(Place place) { <<<<<<< HEAD +<<<<<<< HEAD if(place instanceof DefaultPlace) return null; +======= +>>>>>>> support code split return new ActivityAsyncProxy() { @Override protected void doAsync(RunAsyncCallback callback) { @@ -58,8 +64,11 @@ public class StatusActivityMapper implem return statusActivityProvider.get(); } }; +<<<<<<< HEAD ======= return statusActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -33,7 +33,12 @@ import com.google.gwt.core.client.RunAsy import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -86,7 +91,21 @@ public class ToolBarActivityMapper imple } public Activity getActivity(Place place) { +<<<<<<< HEAD return toolBarActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return toolBarActivityProvider.get(); + } + }; +>>>>>>> support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java?rev=1522276&r1=1522275&r2=1522276&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -27,7 +27,12 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; ======= import com.google.gwt.activity.shared.ActivityMapper; +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +>>>>>>> support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -60,7 +65,21 @@ public class TopBarActivityMapper implem }; ======= public Activity getActivity(Place place) { +<<<<<<< HEAD return topBarActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return topBarActivityProvider.get(); + } + }; +>>>>>>> support code split } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org