james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r1525515 [3/13] - in /james/hupa/trunk: ./ client/ client/src/main/java/org/apache/hupa/ client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ioc/ cli...
Date Mon, 23 Sep 2013 07:04:13 GMT
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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -22,53 +17,16 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
-=======
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 package org.apache.hupa.client.ioc;
 
 import java.util.logging.Logger;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import org.apache.hupa.client.HupaConstants;
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
->>>>>>> integrate them as a whole one - first: make the default place work
 import org.apache.hupa.client.HupaController;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.activity.ComposeActivity;
 import org.apache.hupa.client.activity.ComposeToolBarActivity;
 import org.apache.hupa.client.activity.ContactPropertiesActivity;
 import org.apache.hupa.client.activity.ContactsListActivity;
-<<<<<<< HEAD
-=======
-import org.apache.hupa.client.activity.ComposeContentActivity;
-import org.apache.hupa.client.activity.ComposeHeaderActivity;
-import org.apache.hupa.client.activity.ComposeStatusActivity;
-<<<<<<< HEAD
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-=======
-=======
-import org.apache.hupa.client.activity.ComposeActivity;
->>>>>>> make send text mail work excellently
-import org.apache.hupa.client.activity.ComposeToolBarActivity;
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-=======
->>>>>>> prepared for issue#73, established the UI layout
 import org.apache.hupa.client.activity.FolderListActivity;
-<<<<<<< HEAD
 import org.apache.hupa.client.activity.LabelListActivity;
 import org.apache.hupa.client.activity.LabelPropertiesActivity;
 import org.apache.hupa.client.activity.LoginActivity;
@@ -132,241 +90,29 @@ import org.apache.hupa.client.ui.TopBarV
 
 import com.google.gwt.activity.shared.ActivityManager;
 import com.google.gwt.core.client.GWT;
-=======
-=======
->>>>>>> Change to new mvp framework - first step
-import net.customware.gwt.dispatch.client.DefaultExceptionHandler;
-import net.customware.gwt.dispatch.client.DispatchAsync;
-import net.customware.gwt.dispatch.client.ExceptionHandler;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.client.CachingDispatchAsync;
-=======
-import org.apache.hupa.client.HupaController;
->>>>>>> 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;
-import org.apache.hupa.client.activity.LogoActivity;
-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.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.TopBarActivity;
-import org.apache.hupa.client.mapper.AppPlaceHistoryMapper;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.client.mapper.CachingTopActivityMapper;
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.client.mapper.CachingWestActivityMapper;
-=======
-import org.apache.hupa.client.mapper.LoginActivityMapper;
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-import org.apache.hupa.client.mapper.MainContentActivityMapper;
-=======
-import org.apache.hupa.client.AppController;
-=======
->>>>>>> Make the evo more clear.
-import org.apache.hupa.client.CachingDispatchAsync;
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-import org.apache.hupa.client.activity.IMAPMessageActivity;
-import org.apache.hupa.client.activity.IMAPMessageListActivity;
-import org.apache.hupa.client.activity.LoginActivity;
-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;
-<<<<<<< HEAD
-import org.apache.hupa.client.mvp.AppPlaceHistoryMapper;
-import org.apache.hupa.client.mvp.CachingTopActivityMapper;
-import org.apache.hupa.client.mvp.CachingWestActivityMapper;
-import org.apache.hupa.client.mvp.MainContentActivityMapper;
-<<<<<<< HEAD
-import org.apache.hupa.client.mvp.WestActivityMapper;
->>>>>>> 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.MainContentActivityMapper;
-<<<<<<< HEAD
->>>>>>> Make the evo more clear.
-=======
-=======
-=======
->>>>>>> make message list view panel work as expected partly
-=======
-import org.apache.hupa.client.mapper.ComposeContentActivityMapper;
-import org.apache.hupa.client.mapper.ComposeHeaderActivityMapper;
-import org.apache.hupa.client.mapper.ComposeStatusActivityMapper;
-<<<<<<< HEAD
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-=======
-=======
-=======
-=======
-import org.apache.hupa.client.mapper.CachingMessageListActivityMapper;
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
-=======
->>>>>>> add intents to labels list
-import org.apache.hupa.client.mapper.CachingTopBarActivityMapper;
->>>>>>> fixed issue#46 and issue#32
-import org.apache.hupa.client.mapper.ComposeActivityMapper;
->>>>>>> make send text mail work excellently
-import org.apache.hupa.client.mapper.ComposeToolBarActivityMapper;
-<<<<<<< HEAD
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-=======
-import org.apache.hupa.client.mapper.ContactPropertiesActivityMapper;
-import org.apache.hupa.client.mapper.ContactsListActivityMapper;
->>>>>>> prepared for issue#73, established the UI layout
-import org.apache.hupa.client.mapper.FolderListActivityMapper;
-import org.apache.hupa.client.mapper.LabelListActivityMapper;
-import org.apache.hupa.client.mapper.LabelPropertiesActivityMapper;
-import org.apache.hupa.client.mapper.LoginActivityMapper;
-import org.apache.hupa.client.mapper.LogoActivityMapper;
-import org.apache.hupa.client.mapper.MessageContentActivityMapper;
-import org.apache.hupa.client.mapper.MessageListActivityMapper;
-import org.apache.hupa.client.mapper.MessageListFooterActivityMapper;
-import org.apache.hupa.client.mapper.NavigationActivityMapper;
-import org.apache.hupa.client.mapper.NotificationActivityMapper;
-import org.apache.hupa.client.mapper.SearchBoxActivityMapper;
-import org.apache.hupa.client.mapper.StatusActivityMapper;
-import org.apache.hupa.client.mapper.ToolBarActivityMapper;
-<<<<<<< HEAD
-import org.apache.hupa.client.mapper.TopBarActivityMapper;
-<<<<<<< HEAD
->>>>>>> integrate all of the views to their corresponding activities and mappers
-import org.apache.hupa.client.mapper.WestActivityMapper;
->>>>>>> delete messages, make WestActivity Singleton
-=======
->>>>>>> make message list view panel work as expected partly
-=======
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-import org.apache.hupa.client.place.DefaultPlace;
-import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.ui.ComposeToolBarView;
-import org.apache.hupa.client.ui.ComposeView;
-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.HupaLayout;
-import org.apache.hupa.client.ui.HupaLayoutable;
-<<<<<<< HEAD
-import org.apache.hupa.client.ui.IMAPMessageListView;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 1. improve the inbox folder place.
-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;
-import org.apache.hupa.client.ui.LoginLayoutable;
-import org.apache.hupa.client.ui.LoginView;
-import org.apache.hupa.client.ui.LogoView;
-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.MessagesCellTable;
-import org.apache.hupa.client.ui.NavigationView;
-import org.apache.hupa.client.ui.NotificationView;
-import org.apache.hupa.client.ui.SearchBoxView;
-import org.apache.hupa.client.ui.StatusView;
-import org.apache.hupa.client.ui.ToolBarView;
-import org.apache.hupa.client.ui.TopBarView;
-
-import com.google.gwt.activity.shared.ActivityManager;
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
-import org.apache.hupa.client.ui.LoginView;
-import org.apache.hupa.client.ui.TopView;
-import org.apache.hupa.client.ui.WestView;
-
-import com.google.gwt.activity.shared.ActivityManager;
->>>>>>> Change to new mvp framework - first step
-=======
-import com.google.gwt.core.client.GWT;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.event.shared.SimpleEventBus;
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.gwt.place.shared.PlaceController;
 import com.google.gwt.place.shared.PlaceHistoryHandler;
 import com.google.gwt.place.shared.PlaceHistoryMapper;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import com.google.gwt.user.cellview.client.CellTree;
-=======
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> Change to new mvp framework - first step
-=======
-import com.google.gwt.user.cellview.client.CellTree;
->>>>>>> refactoring.
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-@SuppressWarnings("deprecation")
-=======
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> Change to new mvp framework - first step
-=======
 @SuppressWarnings("deprecation")
->>>>>>> add SuppressWarnings("depraction")
 public class AppGinModule extends AbstractGinModule {
 	public static Logger logger = Logger.getLogger(AppGinModule.class.getName());
 
 	@Override
 	protected void configure() {
 		// Views
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 		bind(HupaLayoutable.class).to(HupaLayout.class).in(Singleton.class);
 		bind(LoginLayoutable.class).to(LoginLayout.class).in(Singleton.class);
 
 		// Activities
 		bind(LoginActivity.Displayable.class).to(LoginView.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
 		bind(TopBarActivity.Displayable.class).to(TopBarView.class).in(Singleton.class);
 		bind(LogoActivity.Displayable.class).to(LogoView.class).in(Singleton.class);
 		bind(NotificationActivity.Displayable.class).to(NotificationView.class).in(Singleton.class);
@@ -378,9 +124,6 @@ public class AppGinModule extends Abstra
 		bind(MessageContentActivity.Displayable.class).to(MessageContentView.class);
 		bind(StatusActivity.Displayable.class).to(StatusView.class);
 		bind(ComposeToolBarActivity.Displayable.class).to(ComposeToolBarView.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 		bind(ComposeActivity.Displayable.class).to(ComposeView.class);
 		bind(SearchBoxActivity.Displayable.class).to(SearchBoxView.class);
 		
@@ -389,27 +132,6 @@ public class AppGinModule extends Abstra
 		bind(LabelPropertiesActivity.Displayable.class).to(LabelPropertiesView.class).in(Singleton.class);
 		bind(ContactsListActivity.Displayable.class).to(ContactsListView.class).in(Singleton.class);
 		bind(ContactPropertiesActivity.Displayable.class).to(ContactPropertiesView.class).in(Singleton.class);
-<<<<<<< HEAD
-=======
-		bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class);
-<<<<<<< HEAD
->>>>>>> fixed issue#61; add loading to mark, unmark.
-=======
-=======
-//		bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class);
->>>>>>> fixed issue#62
-=======
-		bind(ComposeActivity.Displayable.class).to(ComposeView.class);
->>>>>>> pull all folders for label settings
-		
-		bind(LabelListActivity.Displayable.class).to(LabelListView.class).in(Singleton.class);
-<<<<<<< HEAD
->>>>>>> make label settings prototype
-=======
-		bind(LabelPropertiesActivity.Displayable.class).to(LabelPropertiesView.class).in(Singleton.class);
->>>>>>> add rename RF to label setting feature
-=======
->>>>>>> prepared for issue#73, established the UI layout
 
 		bind(LoginActivity.class).in(Singleton.class);
 		bind(TopBarActivity.class).in(Singleton.class);
@@ -421,10 +143,6 @@ public class AppGinModule extends Abstra
 		bind(MessageListActivity.class).in(Singleton.class);
 		bind(ComposeToolBarActivity.class).in(Singleton.class);
 		bind(ComposeActivity.class).in(Singleton.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> prepare to add search feature
 		bind(SearchBoxActivity.class).in(Singleton.class);
 		
 		bind(LabelListActivity.class).in(Singleton.class);
@@ -434,7 +152,6 @@ 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);
@@ -546,299 +263,6 @@ public class AppGinModule extends Abstra
 	public ActivityManager getMessageListFooterActivityMapper(MessageListFooterActivityMapper activityMapper,
 			EventBus eventBus) {
 		return new ActivityManager(activityMapper, eventBus);
-=======
-=======
->>>>>>> Change to new mvp framework - first step
-		bind(AppLayout.class).to(AppLayoutImpl.class).in(Singleton.class);
-=======
-		bind(HupaLayout.class).to(HupaLayoutView.class).in(Singleton.class);
->>>>>>> move new theme ui from experiment to hupa evo
-=======
-		bind(HupaLayoutable.class).to(HupaOverallLayout.class).in(Singleton.class);
->>>>>>> refactoring
-=======
-		bind(HupaLayoutable.class).to(HupaLayout.class).in(Singleton.class);
-<<<<<<< HEAD
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-		bind(LoginLayoutable.class).to(LoginLayout.class).in(Singleton.class);
->>>>>>> integrate them as a whole one - first: make the default place work
-
-		// Activities
-		bind(LoginActivity.Displayable.class).to(LoginView.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-		bind(TopBarActivity.Displayable.class).to(TopBarView.class);
-		bind(LogoActivity.Displayable.class).to(LogoView.class);
-=======
-		bind(TopBarActivity.Displayable.class).to(TopBarView.class).in(Singleton.class);
-		bind(LogoActivity.Displayable.class).to(LogoView.class).in(Singleton.class);
->>>>>>> fixed issue#46 and issue#32
-		bind(NavigationActivity.Displayable.class).to(NavigationView.class);
-		bind(ToolBarActivity.Displayable.class).to(ToolBarView.class).in(Singleton.class);
-		// bind(FolderListActivity.Displayable.class).to(FolderListView.class);
-		bind(MessageListActivity.Displayable.class).to(MessageListView.class).in(Singleton.class);
-		bind(MessageListFooterActivity.Displayable.class).to(MessageListFooterView.class);
-		bind(MessageContentActivity.Displayable.class).to(MessageContentView.class);
-		bind(StatusActivity.Displayable.class).to(StatusView.class);
-		bind(ComposeToolBarActivity.Displayable.class).to(ComposeToolBarView.class);
-		bind(ComposeActivity.Displayable.class).to(ComposeView.class);
-
-		bind(LoginActivity.class).in(Singleton.class);
-		bind(TopBarActivity.class).in(Singleton.class);
-		bind(LogoActivity.class).in(Singleton.class);
-		bind(NavigationActivity.class).in(Singleton.class);
-		bind(ToolBarActivity.class).in(Singleton.class);
-		bind(FolderListActivity.class).in(Singleton.class);
-		bind(MessageListActivity.class).in(Singleton.class);
-		bind(ComposeToolBarActivity.class).in(Singleton.class);
-		bind(ComposeActivity.class).in(Singleton.class);
-=======
-		
-		bind(LabelListActivity.class).in(Singleton.class);
-		bind(LabelPropertiesActivity.class).in(Singleton.class);
-		
-<<<<<<< HEAD
-<<<<<<< HEAD
-		bind(_CenterSettingPanel.class).in(Singleton.class);
->>>>>>> attempt to add label setting feature
-=======
-//		bind(_CenterSettingPanel.class).in(Singleton.class);
->>>>>>> try to make switch to setting work
-=======
->>>>>>> make layout can be arranged by clicking the navigation buttons; make the layout changing by set their sizes to zero rather than remove/add from their parent widgets; merge to the master branch.
-
-<<<<<<< HEAD
->>>>>>> integrate all of the views to their corresponding activities and mappers
-		bind(TopActivity.Displayable.class).to(TopView.class);
-=======
-		bind(TopActivity.Displayable.class).to(TopView.class).in(Singleton.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-=======
-		bind(FolderListActivity.Displayable.class).to(FolderListView.class);
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-=======
-		bind(FolderListActivity.Displayable.class).to(FolderListView.class).in(Singleton.class);
-<<<<<<< HEAD
->>>>>>> fixed issue#61; add loading to mark, unmark.
-		bind(WestActivity.Displayable.class).to(WestView.class).in(Singleton.class);
-=======
->>>>>>> fixed issue#87, and remove deprecated west view related codes
-		bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class);
-		bind(MessageSendActivity.Displayable.class).to(MessageSendView.class);
-<<<<<<< HEAD
-		bind(IMAPMessageActivity.Displayable.class).to(IMAPMessageView.class);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-		bind(TopActivity.Displayable.class).to(TopView.class);
->>>>>>> introduce the top activity
-		bind(WestActivity.Displayable.class).to(WestView.class);
-		bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class);
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> 1. improve the inbox folder place.
-		
-		
-=======
-=======
-		bind(MessageTableModel.class).in(Singleton.class);
->>>>>>> Can fetch messages if click the Refresh button, but a strange issue occur.
-
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-		bind(PagingScrollTableRowDragController.class).in(Singleton.class);
-=======
->>>>>>> forward and reply message to use RF
-
-<<<<<<< HEAD
-		bind(WestActivity.class).in(Singleton.class);
-=======
-		
-=======
-=======
->>>>>>> try to rearrange the places and history managment.
-
->>>>>>> integrate all of the views to their corresponding activities and mappers
-		bind(LoginActivity.class).in(Singleton.class);
->>>>>>> remove gwt-incubator dependency in Messages List Model; 
-=======
->>>>>>> remove the duplicate bind of LoginActivity
-		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(CellTree.Resources.class).to(CellTree.BasicResources.class);
-		// Places
-		bind(PlaceHistoryMapper.class).to(AppPlaceHistoryMapper.class).in(Singleton.class);
-
-		bind(EventBus.class).to(SimpleEventBus.class).in(Singleton.class);
-
-<<<<<<< HEAD
-		// Application Controller
-<<<<<<< HEAD
-<<<<<<< HEAD
-		bind(AppController.class).in(Singleton.class);
-<<<<<<< HEAD
-		
-		bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-	}
-
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-//		bind(AppController.class).in(Singleton.class);
-=======
-		// bind(AppController.class).in(Singleton.class);
->>>>>>> integrate all of the views to their corresponding activities and mappers
-		bind(HupaController.class).in(Singleton.class);
->>>>>>> move new theme ui from experiment to hupa evo
-
-		install(new GinFactoryModuleBuilder().implement(FolderListActivity.Displayable.class, FolderListView.class)
-				.build(FolderListFactory.class));
-		// bind(ExceptionHandler.class).to(DefaultExceptionHandler.class);
-=======
-		bind(HupaController.class).in(Singleton.class);
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-=======
-	@Provides
-	@Singleton
-	@Named("TopRegion")
-	public ActivityManager getTopRegionActivityMapper(CachingTopActivityMapper activityMapper,
-			EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-	
->>>>>>> introduce the top activity
-=======
-	
-=======
-
-<<<<<<< HEAD
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-
-	
-	@Provides
-	@Singleton
-	@Named("ContactsListRegion")
-	public ActivityManager getContactsListActivityMapper(ContactsListActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-	
-	@Provides
-	@Singleton
-	@Named("ContactPropertiesRegion")
-	public ActivityManager getContactPropertiesActivityMapper(ContactPropertiesActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-	
-	@Provides
-	@Singleton
-	@Named("LabelListRegion")
-	public ActivityManager getLabelListActivityMapper(LabelListActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-	
->>>>>>> make label settings prototype
-	@Provides
-	@Singleton
-	@Named("LabelPropertiesRegion")
-	public ActivityManager getLabelPropertiesActivityMapper(LabelPropertiesActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	
-	@Provides
-	@Singleton
-	@Named("SettingNavRegion")
-	public ActivityManager getSettingNavActivityMapper(SettingNavActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-	
-	@Provides
-	@Singleton
-	@Named("LoginPage")
-	public ActivityManager getLoginActivityMapper(LoginActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-	@Named("TopBarRegion")
-	public ActivityManager getTopBarActivityMapper(CachingTopBarActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-	@Named("LogoRegion")
-	public ActivityManager getLogoActivityMapper(LogoActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-<<<<<<< HEAD
-	
->>>>>>> make login page as one part of the overall layout & splite layout to little one
-=======
-
-	@Provides
-	@Singleton
-	@Named("NotificationRegion")
-	public ActivityManager getNotificationActivityMapper(NotificationActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-	@Provides
-	@Singleton
-	@Named("NavigationRegion")
-	public ActivityManager getNavigationActivityMapper(NavigationActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-	@Named("ToolBarRegion")
-	public ActivityManager getToolBarActivityMapper(ToolBarActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-	@Named("FolderListRegion")
-	public ActivityManager getFolderListActivityMapper(FolderListActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-	@Named("MessageListRegion")
-	public ActivityManager getMessageListActivityMapper(MessageListActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-	@Named("MessageListFooterRegion")
-	public ActivityManager getMessageListFooterActivityMapper(MessageListFooterActivityMapper activityMapper,
-			EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
 	}
 
 	@Provides
@@ -852,128 +276,14 @@ public class AppGinModule extends Abstra
 	@Provides
 	@Singleton
 	@Named("StatusRegion")
-<<<<<<< HEAD
-	public ActivityManager getStatusActivityMapper(
-			StatusActivityMapper activityMapper, EventBus eventBus) {
-		return new ActivityManager(activityMapper, eventBus);
-	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-/*
->>>>>>> track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN
-	@Provides
-	@Singleton
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Named("TopRegion")
-	public ActivityManager getTopRegionActivityMapper(
-			CachingTopActivityMapper activityMapper, EventBus eventBus) {
-=======
-=======
-	@Named("ComposeToolBarRegion")
-	public ActivityManager getComposeToolBarActivityMapper(
-			ComposeToolBarActivityMapper activityMapper, EventBus eventBus) {
-=======
 	public ActivityManager getStatusActivityMapper(StatusActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> make send text mail work excellently
 		return new ActivityManager(activityMapper, eventBus);
 	}
 
 	@Provides
 	@Singleton
-<<<<<<< HEAD
->>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel
-	@Named("ComposeHeaderRegion")
-	public ActivityManager getComposeHeaderActivityMapper(
-			ComposeHeaderActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-=======
 	@Named("ComposeRegion")
 	public ActivityManager getComposeActivityMapper(ComposeActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> make send text mail work excellently
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Named("MessageContentRegion")
-	public ActivityManager getMessageContentActivityMapper(MessageContentActivityMapper activityMapper,
-=======
-	@Named("WestRegion")
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public ActivityManager getVerticalMasterRegionActivityMapper(WestActivityMapper activityMapper,
->>>>>>> Change to new mvp framework - first step
-=======
-	public ActivityManager getWestRegionActivityMapper(WestActivityMapper activityMapper,
->>>>>>> introduce the top activity
-=======
-	public ActivityManager getWestRegionActivityMapper(CachingWestActivityMapper activityMapper,
->>>>>>> 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.
-=======
-	}
-
-	@Provides
-	@Singleton
-	@Named("WestRegion")
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public ActivityManager getVerticalMasterRegionActivityMapper(WestActivityMapper activityMapper,
->>>>>>> Change to new mvp framework - first step
-=======
-	public ActivityManager getWestRegionActivityMapper(WestActivityMapper activityMapper,
->>>>>>> introduce the top activity
-=======
-	public ActivityManager getWestRegionActivityMapper(CachingWestActivityMapper activityMapper,
->>>>>>> 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.
-			EventBus eventBus) {
-=======
-	public ActivityManager getWestRegionActivityMapper(CachingWestActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
-	public ActivityManager getWestRegionActivityMapper(WestActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> delete messages, make WestActivity Singleton
-=======
-	@Named("ComposeContentRegion")
-	public ActivityManager getComposeContentActivityMapper(
-			ComposeContentActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Named("StatusRegion")
-	public ActivityManager getStatusActivityMapper(StatusActivityMapper activityMapper, EventBus eventBus) {
-=======
-	@Named("ComposeStatusRegion")
-	public ActivityManager getComposeStatusActivityMapper(
-			ComposeStatusActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-		return new ActivityManager(activityMapper, eventBus);
-	}
-
-	@Provides
-	@Singleton
-<<<<<<< HEAD
-	@Named("ComposeRegion")
-	public ActivityManager getComposeActivityMapper(ComposeActivityMapper activityMapper, EventBus eventBus) {
-=======
-	public ActivityManager getWestRegionActivityMapper(
-			WestActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> integrate all of the views to their corresponding activities and mappers
 		return new ActivityManager(activityMapper, eventBus);
 	}
 
@@ -981,153 +291,33 @@ public class AppGinModule extends Abstra
 	@Singleton
 	@Named("ComposeToolBarRegion")
 	public ActivityManager getComposeToolBarActivityMapper(ComposeToolBarActivityMapper activityMapper,
-=======
-	@Named("MainContentRegion")
-<<<<<<< HEAD
-	public ActivityManager getVerticalMasterRegionActivityMapper(MainContentActivityMapper activityMapper,
->>>>>>> Change to new mvp framework - first step
-=======
-	public ActivityManager getMainContentRegionActivityMapper(MainContentActivityMapper activityMapper,
->>>>>>> introduce the top activity
-=======
-	@Named("MainContentRegion")
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public ActivityManager getVerticalMasterRegionActivityMapper(MainContentActivityMapper activityMapper,
->>>>>>> Change to new mvp framework - first step
-=======
-	public ActivityManager getMainContentRegionActivityMapper(MainContentActivityMapper activityMapper,
-<<<<<<< HEAD
->>>>>>> introduce the top activity
 			EventBus eventBus) {
 		return new ActivityManager(activityMapper, eventBus);
 	}
 
 	@Provides
 	@Singleton
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> prepare to add search feature
 	@Named("SearchBoxRegion")
 	public ActivityManager getSearchBoxActivityMapper(SearchBoxActivityMapper activityMapper,
 			EventBus eventBus) {
 		return new ActivityManager(activityMapper, eventBus);
-<<<<<<< HEAD
-=======
-	protected DispatchAsync provideDispatchAsync(ExceptionHandler exceptionHandler) {
-		return new CachingDispatchAsync(exceptionHandler);
->>>>>>> Change to new mvp framework - first step
-=======
-	protected DispatchAsync provideDispatchAsync(ExceptionHandler exceptionHandler) {
-		return new CachingDispatchAsync(exceptionHandler);
->>>>>>> Change to new mvp framework - first step
-	}
-=======
-	        EventBus eventBus) {
-=======
-	public ActivityManager getMainContentRegionActivityMapper(
-			MainContentActivityMapper activityMapper, EventBus eventBus) {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-	@Named("ComposeToolBarRegion")
-	public ActivityManager getComposeToolBarActivityMapper(ComposeToolBarActivityMapper activityMapper,
-			EventBus eventBus) {
->>>>>>> make send text mail work excellently
-		return new ActivityManager(activityMapper, eventBus);
-	}
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-	// @Provides
-	// @Singleton
-	// protected DispatchAsync provideDispatchAsync(ExceptionHandler
-	// exceptionHandler) {
-	// return new CachingDispatchAsync(exceptionHandler);
-	// }
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-
-=======
->>>>>>> add SuppressWarnings("depraction")
-=======
-*/
->>>>>>> track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN
-	@Provides
-	@Singleton
-=======
-
-	@Provides
-	@Singleton
->>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances of some activities
-=======
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-=======
 	}
 
 	@Provides
 	@Singleton
->>>>>>> prepare to add search feature
 	public PlaceController getPlaceController(EventBus eventBus) {
 		return new PlaceController(eventBus);
 	}
 
 	@Provides
 	@Singleton
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public PlaceHistoryHandler getHistoryHandler(PlaceController placeController, PlaceHistoryMapper historyMapper,
-	        EventBus eventBus) {
-		PlaceHistoryHandler historyHandler = new PlaceHistoryHandler(historyMapper);
-<<<<<<< HEAD
-<<<<<<< HEAD
-		historyHandler.register(placeController, eventBus, new DefaultPlace("@"));
-		return historyHandler;
-	}
-
-	@Provides
-	@Singleton
-	HupaRequestFactory getRequestFactory(EventBus eventBus) {
-		HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
-		rf.initialize(eventBus);
-		return rf;
-	}
-
-=======
-=======
->>>>>>> Change to new mvp framework - first step
-=======
-	public PlaceHistoryHandler getHistoryHandler(
-			PlaceController placeController, PlaceHistoryMapper historyMapper,
-			EventBus eventBus) {
-		PlaceHistoryHandler historyHandler = new PlaceHistoryHandler(
-				historyMapper);
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> integrate all of the views to their corresponding activities and mappers
-		historyHandler.register(placeController, eventBus, new DefaultPlace());
-=======
-		historyHandler.register(placeController, eventBus, new DefaultPlace("@"));
->>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token
-=======
-		historyHandler.register(placeController, eventBus,
-				new DefaultPlace("@"));
->>>>>>> make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism
-=======
 	public PlaceHistoryHandler getHistoryHandler(PlaceController placeController, PlaceHistoryMapper historyMapper,
 			EventBus eventBus) {
 		PlaceHistoryHandler historyHandler = new PlaceHistoryHandler(historyMapper);
 		historyHandler.register(placeController, eventBus, new DefaultPlace("@"));
->>>>>>> make send text mail work excellently
 		return historyHandler;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> Change to new mvp framework - first step
-=======
 	@Provides
 	@Singleton
 	HupaRequestFactory getRequestFactory(EventBus eventBus) {
@@ -1136,5 +326,4 @@ public class AppGinModule extends Abstra
 		return rf;
 	}
 
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
 }

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
 /****************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one   *
  * or more contributor license agreements.  See the NOTICE file *
@@ -22,36 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-<<<<<<< HEAD
 package org.apache.hupa.client.ioc;
 
 import org.apache.hupa.client.HupaController;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.client.ioc;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-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.
-=======
-package org.apache.hupa.client.ioc;
-
-import org.apache.hupa.client.AppController;
->>>>>>> Change to new mvp framework - first step
-=======
-=======
->>>>>>> move new theme ui from experiment to hupa evo
-import org.apache.hupa.client.evo.AppController;
->>>>>>> Make the evo more clear.
-=======
->>>>>>> make send text mail work excellently
 
 import com.google.gwt.inject.client.GinModules;
 import com.google.gwt.inject.client.Ginjector;
@@ -63,22 +31,6 @@ import com.google.gwt.inject.client.Ginj
  */
 @GinModules(AppGinModule.class)
 public interface AppGinjector extends Ginjector {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-//  AppController getAppController();
-  HupaController getHupaController();
-=======
-  AppController getAppController();
->>>>>>> Change to new mvp framework - first step
-=======
-  AppController getAppController();
-<<<<<<< HEAD
->>>>>>> Change to new mvp framework - first step
-=======
-=======
 //  AppController getAppController();
->>>>>>> track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN
   HupaController getHupaController();
->>>>>>> move new theme ui from experiment to hupa evo
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingMessageListActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingMessageListActivityMapper.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingMessageListActivityMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingMessageListActivityMapper.java Mon Sep 23 07:04:08 2013
@@ -19,14 +19,7 @@
 
 package org.apache.hupa.client.mapper;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.place.FolderPlace;
-=======
->>>>>>> change place management and make refresh folder and message list more gentle
-=======
-import org.apache.hupa.client.place.FolderPlace;
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
 import org.apache.hupa.client.place.MessagePlace;
 
 import com.google.gwt.activity.shared.Activity;
@@ -46,23 +39,6 @@ public class CachingMessageListActivityM
 		FilteredActivityMapper.Filter filter = new FilteredActivityMapper.Filter() {
 			@Override
 			public Place filter(Place place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-				return place instanceof MessagePlace ? new FolderPlace(((MessagePlace) place).getTokenWrapper()
-						.getFolder()) : place;
-			}
-		};
-
-		filteredActivityMapper = new FilteredActivityMapper(filter,
-				new CachingActivityMapper(messageListActivityMapper));
-=======
-				return place instanceof MessagePlace ? Place.NOWHERE : place;
-			}
-		};
-
-		filteredActivityMapper = new FilteredActivityMapper(filter, new CachingActivityMapper(messageListActivityMapper));
->>>>>>> change place management and make refresh folder and message list more gentle
-=======
 				return place instanceof MessagePlace ? new FolderPlace(((MessagePlace) place).getTokenWrapper()
 						.getFolder()) : place;
 			}
@@ -70,7 +46,6 @@ public class CachingMessageListActivityM
 
 		filteredActivityMapper = new FilteredActivityMapper(filter,
 				new CachingActivityMapper(messageListActivityMapper));
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
 	}
 
 	@Override

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -20,63 +20,16 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.FolderListActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> attempt to add label setting feature
 import org.apache.hupa.client.place.SettingPlace;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
-=======
-=======
-import org.apache.hupa.client.place.DefaultPlace;
-=======
->>>>>>> support code split
-=======
-import org.apache.hupa.client.place.ComposePlace;
->>>>>>> composing composing panel
-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.activity.shared.Activity;
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class FolderListActivityMapper extends _HupaActivityMapper {
-=======
-public class FolderListActivityMapper implements ActivityMapper {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-public class FolderListActivityMapper extends AbstractActivityMapper {
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-=======
-public class FolderListActivityMapper extends MainActivityMapper {
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-=======
 public class FolderListActivityMapper extends _HupaActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<FolderListActivity> folderListActivityProvider;
 
 	@Inject
@@ -84,62 +37,15 @@ public class FolderListActivityMapper ex
 		this.folderListActivityProvider = folderListActivityProvider;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	Activity asyncLoadActivity(final Place place) {
-		if (place instanceof SettingPlace)
-			return null;
-=======
 	@Override
-<<<<<<< HEAD
-	Activity getAppActivity(final Place place) {
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-=======
 	Activity asyncLoadActivity(final Place place) {
-<<<<<<< HEAD
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-=======
 		if (place instanceof SettingPlace)
 			return null;
->>>>>>> attempt to add label setting feature
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
 				GWT.runAsync(callback);
 			}
-<<<<<<< HEAD
-
-			@Override
-			protected Activity createInstance() {
-				return folderListActivityProvider.get();
-			}
-		};
-
-=======
-	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
-=======
-=======
-	public Activity getActivity(final Place place) {
-<<<<<<< HEAD
->>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances of some activities
-		if (place instanceof MailFolderPlace) {
-=======
-		if (place instanceof MailFolderPlace || place instanceof ComposePlace) {
->>>>>>> composing composing panel
-			return new ActivityAsyncProxy() {
-				@Override
-				protected void doAsync(RunAsyncCallback callback) {
-					GWT.runAsync(callback);
-				}
-=======
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
 
 			@Override
 			protected Activity createInstance() {
@@ -147,11 +53,5 @@ public class FolderListActivityMapper ex
 			}
 		};
 
-<<<<<<< HEAD
-		}
-		return null;
->>>>>>> support code split
-=======
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
 	}
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java Mon Sep 23 07:04:08 2013
@@ -29,15 +29,7 @@ import com.google.gwt.place.shared.Place
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 public class LabelListActivityMapper extends _HupaActivityMapper {
-=======
-public class LabelListActivityMapper extends MainActivityMapper {
->>>>>>> make label settings prototype
-=======
-public class LabelListActivityMapper extends _HupaActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<LabelListActivity> labelListActivityProvider;
 
 	@Inject

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -23,16 +23,8 @@ 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;
@@ -47,10 +39,6 @@ public class LoginActivityMapper impleme
 
 	@Override
 	public Activity getActivity(Place place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> support code split
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
@@ -62,11 +50,5 @@ 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -22,41 +22,13 @@ package org.apache.hupa.client.mapper;
 import org.apache.hupa.client.activity.LogoActivity;
 
 import com.google.gwt.activity.shared.Activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
 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
-=======
-=======
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 public class LogoActivityMapper extends _HupaActivityMapper {
-=======
-public class LogoActivityMapper implements ActivityMapper {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-public class LogoActivityMapper extends AbstractActivityMapper {
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-=======
-public class LogoActivityMapper extends MainActivityMapper {
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-=======
-public class LogoActivityMapper extends _HupaActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<LogoActivity> logoActivityProvider;
 
 	@Inject
@@ -64,35 +36,8 @@ public class LogoActivityMapper extends 
 		this.logoActivityProvider = topActivityProvider;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	public Activity asyncLoadActivity(Place place) {
-		return new ActivityAsyncProxy() {
-			@Override
-			protected void doAsync(RunAsyncCallback callback) {
-				GWT.runAsync(callback);
-			}
-
-			@Override
-			protected Activity createInstance() {
-				return logoActivityProvider.get();
-			}
-		};
-=======
-	public Activity getActivity(Place place) {
-<<<<<<< HEAD
-		return logoActivityProvider.get();
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
 	@Override
-<<<<<<< HEAD
-	public Activity getAppActivity(Place place) {
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-=======
 	public Activity asyncLoadActivity(Place place) {
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
@@ -104,6 +49,5 @@ public class LogoActivityMapper extends 
 				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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -20,50 +20,15 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.MessageContentActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.place.MessagePlace;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
-=======
-=======
-import org.apache.hupa.client.place.DefaultPlace;
-=======
->>>>>>> scrub code
-=======
-import org.apache.hupa.client.place.IMAPMessagePlace;
->>>>>>> try to rearrange the places and history managment.
-import org.apache.hupa.client.place.MailFolderPlace;
-<<<<<<< HEAD
->>>>>>> prepare for message content panel
-=======
-import org.apache.hupa.client.rf.HupaRequestFactory;
->>>>>>> make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's
-
-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 org.apache.hupa.client.place.MessagePlace;
-
-import com.google.gwt.activity.shared.Activity;
->>>>>>> change place management and make refresh folder and message list more gentle
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 public class MessageContentActivityMapper extends _MessageActivityMapper {
 	private final Provider<MessageContentActivity> messageContentActivityProvider;
 
@@ -88,75 +53,5 @@ public class MessageContentActivityMappe
 				return messageContentActivityProvider.get();
 			}
 		};
-=======
-public class MessageContentActivityMapper implements ActivityMapper {
-
-	@Inject protected PlaceController placeController;
-	@Inject protected HupaRequestFactory requestFactory;
-=======
-public class MessageContentActivityMapper extends _MessageActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
-	private final Provider<MessageContentActivity> messageContentActivityProvider;
-
-	@Inject
-	public MessageContentActivityMapper(Provider<MessageContentActivity> messageContentActivityProvider) {
-		this.messageContentActivityProvider = messageContentActivityProvider;
-	}
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-	public Activity getActivity(Place place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-		if(place instanceof DefaultPlace)return null;
-		else if (place instanceof MailFolderPlace) return null;
-		else if (place instanceof IMAPMessagePlace) return messageContentActivityProvider.get();
-		return messageContentActivityProvider.get();
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-		if (place instanceof DefaultPlace)
-			return null;
-		else if (place instanceof MailFolderPlace) {
-=======
-		if (place instanceof MailFolderPlace) {
->>>>>>> scrub code
-			return messageContentActivityProvider.get().with(
-					(MailFolderPlace) place);
-=======
-	public Activity getActivity(final Place place) {
-		if (place instanceof IMAPMessagePlace) {
-			return new ActivityAsyncProxy() {
-				@Override
-				protected void doAsync(RunAsyncCallback callback) {
-					GWT.runAsync(callback);
-				}
-
-				@Override
-				protected Activity createInstance() {
-					return messageContentActivityProvider.get().with(((IMAPMessagePlace)place).getToken());
-				}
-			};
->>>>>>> support code split
-		}
-		return null;
->>>>>>> make message content work as expected partly
-=======
-	@Override
-	protected Activity lazyLoadActivity(final Place place) {
-		return new ActivityAsyncProxy() {
-			@Override
-			protected void doAsync(RunAsyncCallback callback) {
-				GWT.runAsync(callback);
-			}
-
-			@Override
-			protected Activity createInstance() {
-				if (place instanceof MessagePlace) {
-					return messageContentActivityProvider.get().with(((MessagePlace) place).getTokenWrapper());
-				}
-				return messageContentActivityProvider.get();
-			}
-		};
->>>>>>> change place management and make refresh folder and message list more gentle
 	}
 }

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -20,59 +20,17 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.MessageListActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.place.FolderPlace;
 import org.apache.hupa.client.place.MessagePlace;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
-=======
-=======
-import org.apache.hupa.client.place.DefaultPlace;
-=======
->>>>>>> support code split
-import org.apache.hupa.client.place.MailFolderPlace;
-<<<<<<< HEAD
->>>>>>> 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 org.apache.hupa.client.place.SettingPlace;
-=======
-import org.apache.hupa.client.place.FolderPlace;
-import org.apache.hupa.client.place.MessagePlace;
->>>>>>> change place management and make refresh folder and message list more gentle
-
-import com.google.gwt.activity.shared.Activity;
->>>>>>> try to rearrange the places and history managment.
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class MessageListActivityMapper extends _MessageActivityMapper {
-=======
-public class MessageListActivityMapper implements ActivityMapper {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-public class MessageListActivityMapper extends MainActivityMapper {
->>>>>>> try to rearrange the places and history managment.
-=======
 public class MessageListActivityMapper extends _MessageActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<MessageListActivity> messageListActivityProvider;
 
 	@Inject
@@ -80,75 +38,19 @@ public class MessageListActivityMapper e
 		this.messageListActivityProvider = messageListActivityProvider;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	protected Activity lazyLoadActivity(final Place place) {
-		if (place instanceof FolderPlace) {
-			return messageListActivityProvider.get().with(((FolderPlace) place).getToken());
-		} else if(place instanceof MessagePlace){
-			return messageListActivityProvider.get().with(((MessagePlace) place).getTokenWrapper().getFolder());
-		}
-		return new ActivityAsyncProxy() {
-			@Override
-			protected void doAsync(RunAsyncCallback callback) {
-				GWT.runAsync(callback);
-			}
-
-			@Override
-			protected Activity createInstance() {
-				if (place instanceof FolderPlace) {
-					return messageListActivityProvider.get().with(((FolderPlace) place).getToken());
-				} else if(place instanceof MessagePlace){
-					return messageListActivityProvider.get().with(((MessagePlace) place).getTokenWrapper().getFolder());
-				}
-				return messageListActivityProvider.get();
-			}
-		};
-=======
-	public Activity getActivity(Place place) {
-		if(place instanceof DefaultPlace)return null;
-		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))
-=======
 	@Override
-<<<<<<< HEAD
-	Activity asyncLoadActivity(final Place place) {
-		if (place instanceof SettingPlace)
->>>>>>> try to rearrange the places and history managment.
-			return null;
-=======
 	protected Activity lazyLoadActivity(final Place place) {
-<<<<<<< HEAD
->>>>>>> change place management and make refresh folder and message list more gentle
-=======
 		if (place instanceof FolderPlace) {
 			return messageListActivityProvider.get().with(((FolderPlace) place).getToken());
 		} else if(place instanceof MessagePlace){
 			return messageListActivityProvider.get().with(((MessagePlace) place).getTokenWrapper().getFolder());
 		}
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
 				GWT.runAsync(callback);
 			}
 
-<<<<<<< HEAD
-				@Override
-				protected Activity createInstance() {
-					return messageListActivityProvider.get().with(((MailFolderPlace) place).getFullName());
-				}
-			};
-		}
-		return null;
->>>>>>> support code split
-=======
 			@Override
 			protected Activity createInstance() {
 				if (place instanceof FolderPlace) {
@@ -159,6 +61,5 @@ public class MessageListActivityMapper e
 				return messageListActivityProvider.get();
 			}
 		};
->>>>>>> fixed issue#57 - really disable the tools in toolbar
 	}
 }

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -22,33 +22,13 @@ package org.apache.hupa.client.mapper;
 import org.apache.hupa.client.activity.MessageListFooterActivity;
 
 import com.google.gwt.activity.shared.Activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
 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
-=======
-=======
->>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper do not map anything when it comes to setting place
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class MessageListFooterActivityMapper extends _MessageActivityMapper {
-=======
-public class MessageListFooterActivityMapper implements ActivityMapper {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
 public class MessageListFooterActivityMapper extends _MessageActivityMapper {
->>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper do not map anything when it comes to setting place
 	private final Provider<MessageListFooterActivity> messageListFooterActivityProvider;
 
 	@Inject
@@ -57,45 +37,16 @@ public class MessageListFooterActivityMa
 		this.messageListFooterActivityProvider = messageListFooterActivityProvider;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper do not map anything when it comes to setting place
 	@Override
 	protected Activity lazyLoadActivity(Place place) {return new ActivityAsyncProxy() {
 		@Override
 		protected void doAsync(RunAsyncCallback callback) {
 			GWT.runAsync(callback);
 		}
-<<<<<<< HEAD
-
-		@Override
-		protected Activity createInstance() {
-			return messageListFooterActivityProvider.get();
-		}
-	};}
-=======
-	public Activity getActivity(Place place) {
-		if(place instanceof DefaultPlace) return null;
-		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
-=======
 
 		@Override
 		protected Activity createInstance() {
 			return messageListFooterActivityProvider.get();
 		}
 	};}
->>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper do not map anything when it comes to setting place
 }

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -20,60 +20,27 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.NavigationActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
 import org.apache.hupa.client.place.DefaultPlace;
 
 import com.google.gwt.activity.shared.Activity;
 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;
 
 public class NavigationActivityMapper implements ActivityMapper {
 	private final Provider<NavigationActivity> navigationActivityProvider;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 	@Inject
 	public NavigationActivityMapper(
 			Provider<NavigationActivity> navigationActivityProvider) {
-=======
-	
-	@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
-<<<<<<< HEAD
-		if(place instanceof DefaultPlace) return null;
-=======
->>>>>>> support code split
-=======
 		if(place instanceof DefaultPlace) return null;
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
@@ -85,11 +52,5 @@ 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/NotificationActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NotificationActivityMapper.java Mon Sep 23 07:04:08 2013
@@ -28,15 +28,7 @@ import com.google.gwt.place.shared.Place
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 public class NotificationActivityMapper extends _HupaActivityMapper {
-=======
-public class NotificationActivityMapper extends MainActivityMapper {
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
-=======
-public class NotificationActivityMapper extends _HupaActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<NotificationActivity> notificationActivityProvider;
 
 	@Inject

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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -20,24 +20,12 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.StatusActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
 import org.apache.hupa.client.place.DefaultPlace;
 
 import com.google.gwt.activity.shared.Activity;
 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;
@@ -51,15 +39,7 @@ public class StatusActivityMapper implem
 	}
 
 	public Activity getActivity(Place place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-		if(place instanceof DefaultPlace) return null;
-=======
->>>>>>> support code split
-=======
 		if(place instanceof DefaultPlace) return null;
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
@@ -71,11 +51,5 @@ 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -20,10 +20,6 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.ToolBarActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.place.FolderPlace;
 import org.apache.hupa.client.place.MessagePlace;
 import org.apache.hupa.client.place.SettingPlace;
@@ -32,120 +28,21 @@ import org.apache.hupa.client.ui.ToolBar
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
-=======
-=======
-import org.apache.hupa.client.place.DefaultPlace;
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-
-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 org.apache.hupa.client.place.MailFolderPlace;
-=======
-import org.apache.hupa.client.place.FolderPlace;
-import org.apache.hupa.client.place.MessagePlace;
->>>>>>> change place management and make refresh folder and message list more gentle
-import org.apache.hupa.client.place.SettingPlace;
-import org.apache.hupa.client.ui.ToolBarView.Parameters;
-
-import com.google.gwt.activity.shared.Activity;
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-public class ToolBarActivityMapper extends _HupaActivityMapper {
-	private final Provider<ToolBarActivity> toolBarActivityProvider;
-
-	@Inject
-	public ToolBarActivityMapper(Provider<ToolBarActivity> toolActivityProvider) {
-		this.toolBarActivityProvider = toolActivityProvider;
-	}
-
-	@Override
-	Activity asyncLoadActivity(final Place place) {
-		if(place instanceof SettingPlace) return null;
-		final ToolBarActivity tba = toolBarActivityProvider.get();
-		if (place instanceof FolderPlace) { // might be from login page
-			FolderPlace here = (FolderPlace) place;
-			tba.getDisplay().setParameters(new Parameters(null, here.getToken(), null, null));
-		}
-		if(place instanceof MessagePlace){
-			return tba.with(((MessagePlace)place).getTokenWrapper().getFolder());
-		}
-
-		return new ActivityAsyncProxy() {
-			@Override
-			protected void doAsync(RunAsyncCallback callback) {
-				GWT.runAsync(callback);
-			}
-
-			@Override
-			protected Activity createInstance() {
-				String token = null;
-				if (place instanceof FolderPlace) {
-					token = ((FolderPlace) place).getToken();
-				}else if(place instanceof MessagePlace){
-					token = ((MessagePlace)place).getTokenWrapper().getFolder();
-				}
-				return tba.with(token);
-			}
-		};
-=======
-public class ToolBarActivityMapper implements ActivityMapper {
-=======
-public class ToolBarActivityMapper extends MainActivityMapper {
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-=======
 public class ToolBarActivityMapper extends _HupaActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<ToolBarActivity> toolBarActivityProvider;
 
 	@Inject
 	public ToolBarActivityMapper(Provider<ToolBarActivity> toolActivityProvider) {
 		this.toolBarActivityProvider = toolActivityProvider;
 	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-	public Activity getActivity(Place place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-		return toolBarActivityProvider.get();
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
-		if(place instanceof DefaultPlace) return null;
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-=======
-	
-=======
 
->>>>>>> fixed issue#18
 	@Override
-<<<<<<< HEAD
-	Activity asyncLoadActivity(Place place) {
-		final String token = ((MailFolderPlace)place).getFullName();
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-=======
 	Activity asyncLoadActivity(final Place place) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-		
->>>>>>> fix the bugs resulted from the no unit tests
-=======
-=======
 		if(place instanceof SettingPlace) return null;
->>>>>>> attempt to add label setting feature
 		final ToolBarActivity tba = toolBarActivityProvider.get();
 		if (place instanceof FolderPlace) { // might be from login page
 			FolderPlace here = (FolderPlace) place;
@@ -155,7 +52,6 @@ public class ToolBarActivityMapper exten
 			return tba.with(((MessagePlace)place).getTokenWrapper().getFolder());
 		}
 
->>>>>>> fixed issue#18
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
@@ -173,6 +69,5 @@ public class ToolBarActivityMapper exten
 				return tba.with(token);
 			}
 		};
->>>>>>> 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=1525515&r1=1525514&r2=1525515&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 Mon Sep 23 07:04:08 2013
@@ -22,41 +22,13 @@ package org.apache.hupa.client.mapper;
 import org.apache.hupa.client.activity.TopBarActivity;
 
 import com.google.gwt.activity.shared.Activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
 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
-=======
-=======
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-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;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 public class TopBarActivityMapper extends _HupaActivityMapper {
-=======
-public class TopBarActivityMapper implements ActivityMapper {
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-public class TopBarActivityMapper extends AbstractActivityMapper {
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-=======
-public class TopBarActivityMapper extends MainActivityMapper {
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
-=======
-public class TopBarActivityMapper extends _HupaActivityMapper {
->>>>>>> change place management and make refresh folder and message list more gentle
 	private final Provider<TopBarActivity> topBarActivityProvider;
 
 	@Inject
@@ -64,39 +36,8 @@ public class TopBarActivityMapper extend
 		this.topBarActivityProvider = topActivityProvider;
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-	@Override
-	Activity asyncLoadActivity(final Place place) {
-		return new ActivityAsyncProxy() {
-			@Override
-			protected void doAsync(RunAsyncCallback callback) {
-				GWT.runAsync(callback);
-			}
-
-			@Override
-			protected Activity createInstance() {
-				return topBarActivityProvider.get();
-			}
-		};
-=======
-	public Activity getActivity(Place place) {
-<<<<<<< HEAD
-		return topBarActivityProvider.get();
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
 	@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-	Activity getAppActivity(Place place) {
->>>>>>> try to fix some issues by reorganize the activity mapper and place controller
-=======
-	Activity getAppActivity(final Place place) {
->>>>>>> fixed issue#46 and issue#32
-=======
 	Activity asyncLoadActivity(final Place place) {
->>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize but failed, use the native one, and then refactor some names
 		return new ActivityAsyncProxy() {
 			@Override
 			protected void doAsync(RunAsyncCallback callback) {
@@ -108,6 +49,5 @@ public class TopBarActivityMapper extend
 				return topBarActivityProvider.get();
 			}
 		};
->>>>>>> support code split
 	}
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java Mon Sep 23 07:04:08 2013
@@ -23,28 +23,13 @@ import com.google.gwt.place.shared.Place
 
 public class AbstractPlace extends Place {
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 	public static final String SPLITTER = ":";
 
-=======
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-=======
-	public static final String SPLITTER = ":";
-
->>>>>>> change place management and make refresh folder and message list more gentle
 	@Override
 	public String toString() {
 		return getClass().getName().substring(
 				getClass().getName().lastIndexOf("."));
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
-=======
 
->>>>>>> make reload mail folder place work, fixed issue #7
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java Mon Sep 23 07:04:08 2013
@@ -19,34 +19,16 @@
 
 package org.apache.hupa.client.place;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import org.apache.hupa.client.ui.ToolBarView.Parameters;
 
 import com.google.gwt.place.shared.Place;
-=======
->>>>>>> composing composing panel
-=======
-import org.apache.hupa.client.ui.ToolBarView.Parameters;
-
-import com.google.gwt.place.shared.Place;
->>>>>>> coping with reply and forward sending message
 import com.google.gwt.place.shared.PlaceTokenizer;
 import com.google.gwt.place.shared.Prefix;
 
 public class ComposePlace extends AbstractPlace {
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 	private String token;
 	private Parameters parameters;
-=======
-	private String token;
-<<<<<<< HEAD
->>>>>>> beautify composing panel
-=======
-	private Parameters parameters;
->>>>>>> coping with reply and forward sending message
 
 	public ComposePlace(String token) {
 		this.token = token;
@@ -69,33 +51,6 @@ public class ComposePlace extends Abstra
 			return place.getToken();
 		}
 	}
-<<<<<<< HEAD
-
-	public Place with(Parameters parameters) {
-		this.parameters = parameters;
-		return this;
-	}
-
-	public Parameters getParameters() {
-		return parameters;
-	}
-=======
-  @Prefix("compose")
-  public static class Tokenizer implements PlaceTokenizer<ComposePlace> {
-
-    @Override
-    public ComposePlace getPlace(String token) {
-      return new ComposePlace();
-    }
-
-    @Override
-    public String getToken(ComposePlace place) {
-      return "compose";
-    }
-  }
->>>>>>> composing composing panel
-=======
->>>>>>> beautify composing panel
 
 	public Place with(Parameters parameters) {
 		this.parameters = parameters;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message