Author: dongxu Date: Thu Sep 12 02:08:28 2013 New Revision: 1522119 URL: http://svn.apache.org/r1522119 Log: Make the evo more clear.
Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvoCallback.java - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvoCallback.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java~HEAD - copied, changed from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvoCallback.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvolution.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/ActivityPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingTopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/Displayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/TopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WidgetContainerDisplayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WidgetDisplayable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Thu Sep 12 02:08:28 2013 @@ -75,5 +75,5 @@ <set-property name="user.agent" value="gecko1_8,safari"/> <!-- Specify the app entry point class. --> - <entry-point class='org.apache.hupa.client.HupaEvolution'/> + <entry-point class='org.apache.hupa.client.evo.HupaEvo'/> </module> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 02:08:28 2013 @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.hupa.client.CachingDispatchAsync; -import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java Thu Sep 12 02:08:28 2013 @@ -381,11 +381,11 @@ import java.util.ArrayList; import net.customware.gwt.dispatch.client.DispatchAsync; import org.apache.hupa.client.HandlerRegistrationAdapter; -import org.apache.hupa.client.HupaEvoCallback; import org.apache.hupa.client.activity.MessageSendActivity.Type; -import org.apache.hupa.client.mvp.WidgetDisplayable; -import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.evo.HupaEvoCallback; +import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; @@ -692,10 +692,10 @@ public class IMAPMessageListActivity ext } }); } - public IMAPMessageListActivity with(User user, IMAPFolder imapFolder, String string){ - this.user = user; - this.folder = imapFolder; - this.searchValue = string; + public IMAPMessageListActivity with(MailFolderPlace place){ + this.user = place.getUser(); + this.folder = place.getFolder(); + this.searchValue = place.getSearchValue(); return this; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 02:08:28 2013 @@ -36,9 +36,9 @@ package org.apache.hupa.client.activity; import net.customware.gwt.dispatch.client.DispatchAsync; import org.apache.hupa.client.HupaConstants; -import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.events.FlashEvent; import org.apache.hupa.shared.events.SessionExpireEvent; import org.apache.hupa.shared.events.SessionExpireEventHandler; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 02:08:28 2013 @@ -54,10 +54,10 @@ import org.apache.hupa.shared.domain.Use import net.customware.gwt.dispatch.client.DispatchAsync; import net.customware.gwt.dispatch.shared.Action; -import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.mvp.MessageSendPresenter.Type; import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.Util; import org.apache.hupa.shared.data.IMAPFolder; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java Thu Sep 12 02:08:28 2013 @@ -34,9 +34,9 @@ package org.apache.hupa.client.activity; import net.customware.gwt.dispatch.client.DispatchAsync; import org.apache.hupa.client.HupaConstants; -import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.DefaultPlace; +import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.data.User; >>>>>>> introduce the top activity import org.apache.hupa.shared.events.FlashEvent; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 02:08:28 2013 @@ -251,12 +251,12 @@ import java.util.List; import net.customware.gwt.dispatch.client.DispatchAsync; -import org.apache.hupa.client.HupaEvoCallback; import org.apache.hupa.client.activity.MessageSendActivity.Type; -import org.apache.hupa.client.mvp.WidgetContainerDisplayable; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.IMAPMessagePlace; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.ui.WidgetContainerDisplayable; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.client.widgets.IMAPTreeItem; import org.apache.hupa.shared.data.IMAPFolder; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java Thu Sep 12 02:08:28 2013 @@ -1,27 +1,10 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.evo; import org.apache.hupa.client.ui.AppLayout; +import com.google.gwt.activity.shared.ActivityManager; import com.google.inject.Inject; +import com.google.inject.name.Named; /** * This class is responsible for ActivityManager instantiations through GIN, it @@ -30,7 +13,13 @@ import com.google.inject.Inject; public class ActivityManagerInitializer { @Inject - public ActivityManagerInitializer(AppLayout appPanelView) { + public ActivityManagerInitializer(AppLayout appPanelView, + @Named("TopRegion") ActivityManager topActivityManager, + @Named("WestRegion") ActivityManager westActivityManager, + @Named("MainContentRegion") ActivityManager mainContentActivityManager) { + topActivityManager.setDisplay(appPanelView.getTopContainer()); + westActivityManager.setDisplay(appPanelView.getWestContainer()); + mainContentActivityManager.setDisplay(appPanelView.getMainContainer()); } } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java Thu Sep 12 02:08:28 2013 @@ -1,28 +1,7 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.evo; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.FolderPlace; -import org.apache.hupa.client.rf.CheckSessionRequest; -import org.apache.hupa.client.rf.HupaRequestFactory; +import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.ui.AppLayout; import com.google.gwt.event.shared.EventBus; @@ -32,36 +11,51 @@ import com.google.gwt.place.shared.Place import com.google.gwt.place.shared.PlaceHistoryHandler; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.inject.Inject; -import com.google.web.bindery.requestfactory.shared.Receiver; +/** + * This is the main controller of the application. + */ public class AppController { - @Inject private PlaceHistoryHandler placeHistoryHandler; - @Inject private AppLayout appPanelView; - @Inject private PlaceController placeController; - @Inject private HupaRequestFactory requestFactory; + private final PlaceController placeController; + private final PlaceHistoryHandler placeHistoryHandler; + private final AppLayout appPanelView; private Place currentPlace; + /** + * All parameters are injected by GIN + * + * @param placeController + * the application's PlaceController + * @param eventBus + * the application's EventBus + * @param placeHistoryHandler + * the application's PlaceHistoryHandler + * @param appLayout + * this is the application's main panel + * @param mainMenuView + * this is the application's navigation top bar + * @param activityManagerInitializer + * unused parameter, it's here just to force GIN's initialization + * of ActivityManagers + */ @Inject - public AppController(EventBus eventBus, ActivityManagerInitializer initializeActivityManagerByGin) { + public AppController(PlaceController placeController, EventBus eventBus, PlaceHistoryHandler placeHistoryHandler, + AppLayout appLayout, ActivityManagerInitializer activityManagerInitializer) { + this.placeController = placeController; + this.placeHistoryHandler = placeHistoryHandler; + this.appPanelView = appLayout; eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceLayoutHandler()); } public void start() { - RootLayoutPanel.get().add(appPanelView.getAppLayoutPanel()); + RootLayoutPanel.get().add(appPanelView.getMainLayoutPanel()); placeHistoryHandler.handleCurrentHistory(); } private final class PlaceLayoutHandler implements PlaceChangeEvent.Handler { @Override public void onPlaceChange(PlaceChangeEvent event) { - if (placeChange(event)) { - checkSession(); - } - refreshActivities(event); - } - - private void refreshActivities(PlaceChangeEvent event) { Place newPlace = event.getNewPlace(); if (newPlace != currentPlace) { if (isAuth(newPlace, currentPlace)) { @@ -72,25 +66,9 @@ public class AppController { currentPlace = newPlace; } } - - private void checkSession() { - CheckSessionRequest checkSession = requestFactory.sessionRequest(); - checkSession.isValid().fire(new Receiver<Boolean>() { - @Override - public void onSuccess(Boolean sessionValid) { - if (!sessionValid) { -// AppController.this.placeController.goTo(new DefaultPlace()); - } - } - }); - } - - private boolean placeChange(PlaceChangeEvent event) { - return currentPlace != null && !(currentPlace instanceof DefaultPlace) && event.getNewPlace() != currentPlace; - } - - private boolean isAuth(Place newPlace, Place currentPlace) { - return (newPlace instanceof FolderPlace) && !(currentPlace instanceof FolderPlace); + + public boolean isAuth(Place newPlace, Place currentPlace){ + return (newPlace instanceof MailFolderPlace) && !(currentPlace instanceof MailFolderPlace); } } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java Thu Sep 12 02:08:28 2013 @@ -1,51 +1,24 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.evo; +import org.apache.hupa.client.ioc.AppGinjector; + import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; -import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.RootPanel; public class HupaEvo implements EntryPoint { + + private final AppGinjector injector = GWT.create(AppGinjector.class); @Override public void onModuleLoad() { - handleExceptionsAsync(); - replaceLoading(); -// AppController appController = null;//injector.getAppController(); -// appController.start(); - } - - private void handleExceptionsAsync(){ - GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { - public void onUncaughtException(Throwable e) { - e.printStackTrace(); - } - }); + removeLoading(); + AppController appController = injector.getAppController(); + appController.start(); } - private void replaceLoading() { + private void removeLoading() { DOM.removeChild(RootPanel.getBodyElement(), DOM.getElementById("loading")); } -// private final AppGinjector injector = GWT.create(AppGinjector.class); - } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvoCallback.java (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvoCallback.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvoCallback.java?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvoCallback.java&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvoCallback.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaEvoCallback.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvoCallback.java Thu Sep 12 02:08:28 2013 @@ -1,8 +1,8 @@ -package org.apache.hupa.client; +package org.apache.hupa.client.evo; import net.customware.gwt.dispatch.client.DispatchAsync; -import org.apache.hupa.client.mvp.Displayable; +import org.apache.hupa.client.ui.Displayable; import org.apache.hupa.shared.events.LogoutEvent; import org.apache.hupa.shared.events.ServerStatusEvent; import org.apache.hupa.shared.events.ServerStatusEvent.ServerStatus; 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=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java Thu Sep 12 02:08:28 2013 @@ -99,7 +99,6 @@ import net.customware.gwt.dispatch.clien import net.customware.gwt.dispatch.client.DispatchAsync; import net.customware.gwt.dispatch.client.ExceptionHandler; -import org.apache.hupa.client.AppController; import org.apache.hupa.client.CachingDispatchAsync; import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; @@ -108,10 +107,11 @@ import org.apache.hupa.client.activity.M import org.apache.hupa.client.activity.TopActivity; import org.apache.hupa.client.activity.WestActivity; import org.apache.hupa.client.dnd.PagingScrollTableRowDragController; -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; +import org.apache.hupa.client.evo.AppController; +import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; +import org.apache.hupa.client.mapper.CachingTopActivityMapper; +import org.apache.hupa.client.mapper.CachingWestActivityMapper; +import org.apache.hupa.client.mapper.MainContentActivityMapper; import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.ui.AppLayout; import org.apache.hupa.client.ui.AppLayoutImpl; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java Thu Sep 12 02:08:28 2013 @@ -24,8 +24,12 @@ import org.apache.hupa.client.HupaContro ======= package org.apache.hupa.client.ioc; +<<<<<<< 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. import com.google.gwt.inject.client.GinModules; import com.google.gwt.inject.client.Ginjector; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java Thu Sep 12 02:08:28 2013 @@ -1,41 +1,18 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.mapper; -import org.apache.hupa.client.place.ComposePlace; -import org.apache.hupa.client.place.ContactPlace; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.FolderPlace; -import org.apache.hupa.client.place.MessagePlace; -import org.apache.hupa.client.place.SettingPlace; +import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.place.MessageSendPlace; import com.google.gwt.place.shared.PlaceHistoryMapper; import com.google.gwt.place.shared.WithTokenizers; @WithTokenizers({ DefaultPlace.Tokenizer.class, - FolderPlace.Tokenizer.class, - MessagePlace.Tokenizer.class, - ComposePlace.Tokenizer.class, - SettingPlace.Tokenizer.class, - ContactPlace.Tokenizer.class + MailFolderPlace.Tokenizer.class, + MessageSendPlace.Tokenizer.class, + IMAPMessagePlace.Tokenizer.class }) public interface AppPlaceHistoryMapper extends PlaceHistoryMapper { } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java Thu Sep 12 02:08:28 2013 @@ -1,22 +1,3 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.mapper; import com.google.gwt.activity.shared.Activity; Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java Thu Sep 12 02:08:28 2013 @@ -1,26 +1,7 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.mapper; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.FolderPlace; +import org.apache.hupa.client.place.MailFolderPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -39,8 +20,8 @@ public class CachingWestActivityMapper i FilteredActivityMapper.Filter filter = new FilteredActivityMapper.Filter() { @Override public Place filter(Place place) { - return (place instanceof DefaultPlace || place instanceof FolderPlace) ? place - : new FolderPlace(""); + return (place instanceof DefaultPlace || place instanceof MailFolderPlace) ? place + : new MailFolderPlace(); } }; Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java Thu Sep 12 02:08:28 2013 @@ -1,4 +1,4 @@ -package org.apache.hupa.client.mvp; +package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; @@ -33,14 +33,7 @@ public class MainContentActivityMapper i public Activity getActivity(Place place) { if (place instanceof MailFolderPlace) { -// return messageListActivityProvider.get().with(((MailInboxPlace) place).getUser()); - - MailFolderPlace p = ((MailFolderPlace)place); - if(p.getFolderName().equalsIgnoreCase("inbox")){ - return messageListActivityProvider.get().with(p.getUser(),p.getFolder(), p.getSearchValue()); - } else if(p.getFolderName().equalsIgnoreCase("trash")){ - return messageListActivityProvider.get().with(p.getUser(),p.getFolder(), p.getSearchValue()); - } + return messageListActivityProvider.get().with((MailFolderPlace)place); } else if (place instanceof DefaultPlace) { return loginActivityProvider.get(); } else if(place instanceof MessageSendPlace){ Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java Thu Sep 12 02:08:28 2013 @@ -1,26 +1,6 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.TopActivity; -import org.apache.hupa.client.place.DefaultPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -37,7 +17,6 @@ public class TopActivityMapper implement } public Activity getActivity(Place place) { - if(place instanceof DefaultPlace) return null; return topActivityProvider.get(); } } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java Thu Sep 12 02:08:28 2013 @@ -1,27 +1,7 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.WestActivity; -import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.FolderPlace; +import org.apache.hupa.client.place.MailFolderPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -30,19 +10,18 @@ import com.google.inject.Inject; import com.google.inject.Provider; public class WestActivityMapper implements ActivityMapper { - private final Provider<WestActivity> westActivityProvider; + private final Provider<WestActivity> westActivityProvider; + + @Inject + public WestActivityMapper(Provider<WestActivity> westActivityProvider) { + this.westActivityProvider = westActivityProvider; + } + + public Activity getActivity(Place place) { + if (place instanceof MailFolderPlace) { + return westActivityProvider.get().with(((MailFolderPlace)place)); + } - @Inject - public WestActivityMapper(Provider<WestActivity> westActivityProvider) { - this.westActivityProvider = westActivityProvider; - } - - public Activity getActivity(Place place) { - if (place instanceof FolderPlace) { - return westActivityProvider.get().with(((FolderPlace) place)); - } else if (!(place instanceof DefaultPlace)) { - return westActivityProvider.get(); - } - return null; - } + return null; + } } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/Displayable.java Thu Sep 12 02:08:28 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> Make the evo more clear. package org.apache.hupa.client.ui; public interface Displayable { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java Thu Sep 12 02:08:28 2013 @@ -23,7 +23,7 @@ import java.util.Iterator; import net.customware.gwt.dispatch.client.DispatchAsync; -import org.apache.hupa.client.HupaEvoCallback; +import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; import org.apache.hupa.shared.data.User; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java Thu Sep 12 02:08:28 2013 @@ -1,28 +1,8 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.ui; -import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Widget; -public interface WidgetContainerDisplayable extends IsWidget { +public interface WidgetContainerDisplayable extends WidgetDisplayable { void addWidget( Widget widget ); Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java?rev=1522119&r1=1522118&r2=1522119&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java Thu Sep 12 02:08:28 2013 @@ -1,22 +1,3 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - package org.apache.hupa.client.ui; import com.google.gwt.user.client.ui.Widget; Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java~HEAD (from r1522117, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java&r1=1522117&r2=1522119&rev=1522119&view=diff ============================================================================== (empty) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org