remove useless files
git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1526349 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java~HEAD b/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java~HEAD
deleted file mode 100644
index 5df16a4..0000000
--- a/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java~HEAD
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.activity;
-
-import java.util.List;
-
-import org.apache.hupa.client.ui.LabelNode;
-
-import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.inject.Inject;
-
-public class LabelPropertiesActivity extends AppBaseActivity {
-
- @Override
- public void start(AcceptsOneWidget container, EventBus eventBus) {
- container.setWidget(display.asWidget());
- }
-
- @Inject private Displayable display;
-
- public interface Displayable extends IsWidget {
- void cascade(LabelNode labelNode, List<LabelNode> list, int cascadeTypeAdd);
- HasClickHandlers getSave();
- }
-}
diff --git a/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java~HEAD b/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java~HEAD
deleted file mode 100644
index 8261ef5..0000000
--- a/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java~HEAD
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************
- * 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.inject.Inject;
-
-/**
- * This class is responsible for ActivityManager instantiations through GIN, it
- * also associate every ActivityManager with the corresponding display region
- */
-public class ActivityManagerInitializer {
-
- @Inject
- public ActivityManagerInitializer(AppLayout appPanelView) {
- }
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/evo/AppController.java~HEAD b/client/src/main/java/org/apache/hupa/client/evo/AppController.java~HEAD
deleted file mode 100644
index 5ba549c..0000000
--- a/client/src/main/java/org/apache/hupa/client/evo/AppController.java~HEAD
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************
- * 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.ui.AppLayout;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.place.shared.Place;
-import com.google.gwt.place.shared.PlaceChangeEvent;
-import com.google.gwt.place.shared.PlaceController;
-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;
-
-public class AppController {
-
- @Inject private PlaceHistoryHandler placeHistoryHandler;
- @Inject private AppLayout appPanelView;
- @Inject private PlaceController placeController;
- @Inject private HupaRequestFactory requestFactory;
- private Place currentPlace;
-
- @Inject
- public AppController(EventBus eventBus, ActivityManagerInitializer initializeActivityManagerByGin) {
- eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceLayoutHandler());
- }
-
- public void start() {
- RootLayoutPanel.get().add(appPanelView.getAppLayoutPanel());
- 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)) {
- appPanelView.setDefaultLayout();
- } else if (newPlace instanceof DefaultPlace) {
- appPanelView.setLoginLayout();
- }
- 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);
- }
- }
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java~HEAD b/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java~HEAD
deleted file mode 100644
index ce28cca..0000000
--- a/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java~HEAD
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************
- * 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 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 {
- @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();
- }
- });
- }
-
- private void replaceLoading() {
- DOM.removeChild(RootPanel.getBodyElement(), DOM.getElementById("loading"));
- }
-
-// private final AppGinjector injector = GWT.create(AppGinjector.class);
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java~HEAD
deleted file mode 100644
index 3cc81c4..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java~HEAD
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************
- * 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.ui.HupaLayoutable;
-import org.apache.hupa.client.ui.LoginLayoutable;
-
-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
- * also associate every ActivityManager with the corresponding display region
- */
-public class ActivityManagerInitializer {
-
- @Inject
- public ActivityManagerInitializer(LoginLayoutable loginLayout, HupaLayoutable hupaLayout,
-
- @Named("ContactsListRegion") ActivityManager contactsListActivityManager,
- @Named("ContactPropertiesRegion") ActivityManager contactPropertiesActivityManager,
- @Named("LabelListRegion") ActivityManager labelListActivityManager,
- @Named("SettingNavRegion") ActivityManager settingNavActivityManager,
- @Named("LabelPropertiesRegion") ActivityManager labelPropertiesActivityManager,
- @Named("LoginPage") ActivityManager loginActivityManager,
- @Named("TopBarRegion") ActivityManager topBarActivityManager,
- @Named("LogoRegion") ActivityManager logoActivityManager,
- @Named("NotificationRegion") ActivityManager notificationActivityManager,
- @Named("NavigationRegion") ActivityManager navigationActivityManager,
- @Named("ToolBarRegion") ActivityManager toolBarActivityManager,
- @Named("FolderListRegion") ActivityManager folderListActivityManager,
- @Named("MessageListRegion") ActivityManager messageListActivityManager,
- @Named("MessageListFooterRegion") ActivityManager messageListFooterActivityManager,
- @Named("MessageContentRegion") ActivityManager messageContentActivityManager,
- @Named("StatusRegion") ActivityManager statusActivityManager,
- @Named("ComposeToolBarRegion") ActivityManager composeToolBarActivityManager,
- @Named("SearchBoxRegion") ActivityManager searchBoxActivityManager,
- @Named("ComposeRegion") ActivityManager composeActivityManager) {
- contactsListActivityManager.setDisplay(hupaLayout.getContactsListView());
- contactPropertiesActivityManager.setDisplay(hupaLayout.getContactPropertiesView());
- labelPropertiesActivityManager.setDisplay(hupaLayout.getLabelPropertiesView());
- labelListActivityManager.setDisplay(hupaLayout.getLabelListView());
- settingNavActivityManager.setDisplay(hupaLayout.getSettingNavView());
- loginActivityManager.setDisplay(loginLayout.getLoginView());
- topBarActivityManager.setDisplay(hupaLayout.getTopBarView());
- logoActivityManager.setDisplay(hupaLayout.getLogoView());
- notificationActivityManager.setDisplay(hupaLayout.getNotificationView());
- navigationActivityManager.setDisplay(hupaLayout.getNavigationView());
- toolBarActivityManager.setDisplay(hupaLayout.getToolBarView());
- folderListActivityManager.setDisplay(hupaLayout.getFolderListView());
- messageListActivityManager.setDisplay(hupaLayout.getMessageListView());
- messageListFooterActivityManager.setDisplay(hupaLayout.getMessageListFooterView());
- messageContentActivityManager.setDisplay(hupaLayout.getMessageContentView());
- statusActivityManager.setDisplay(hupaLayout.getStatusView());
- composeToolBarActivityManager.setDisplay(hupaLayout.getComposeToolBarView());
- searchBoxActivityManager.setDisplay(hupaLayout.getSearchBoxView());
- composeActivityManager.setDisplay(hupaLayout.getComposeView());
- }
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java~HEAD
deleted file mode 100644
index c6c4780..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java~HEAD
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************
- * 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 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
-})
-public interface AppPlaceHistoryMapper extends PlaceHistoryMapper {
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java~HEAD
deleted file mode 100644
index d0ca57f..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/CachingTopActivityMapper.java~HEAD
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************
- * 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;
-import com.google.gwt.activity.shared.ActivityMapper;
-import com.google.gwt.activity.shared.CachingActivityMapper;
-import com.google.gwt.activity.shared.FilteredActivityMapper;
-import com.google.gwt.place.shared.Place;
-import com.google.inject.Inject;
-
-public class CachingTopActivityMapper implements ActivityMapper {
-
- private ActivityMapper filteredActivityMapper;
-
- @Inject
- public CachingTopActivityMapper(TopActivityMapper topActivityMapper) {
-
- FilteredActivityMapper.Filter filter = new FilteredActivityMapper.Filter() {
- @Override
- public Place filter(Place place) {
- return place;
- }
- };
-
- CachingActivityMapper cachingActivityMapper = new CachingActivityMapper(topActivityMapper);
- filteredActivityMapper = new FilteredActivityMapper(filter, cachingActivityMapper);
- }
-
- @Override
- public Activity getActivity(Place place) {
- return filteredActivityMapper.getActivity(place);
- }
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java~HEAD
deleted file mode 100644
index b1f126e..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java~HEAD
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************
- * 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 com.google.gwt.activity.shared.Activity;
-import com.google.gwt.activity.shared.ActivityMapper;
-import com.google.gwt.activity.shared.CachingActivityMapper;
-import com.google.gwt.activity.shared.FilteredActivityMapper;
-import com.google.gwt.place.shared.Place;
-import com.google.inject.Inject;
-
-public class CachingWestActivityMapper implements ActivityMapper {
-
- private ActivityMapper filteredActivityMapper;
-
- @Inject
- public CachingWestActivityMapper(WestActivityMapper westActivityMapper) {
-
- FilteredActivityMapper.Filter filter = new FilteredActivityMapper.Filter() {
- @Override
- public Place filter(Place place) {
- return (place instanceof DefaultPlace || place instanceof FolderPlace) ? place
- : new FolderPlace("");
- }
- };
-
- CachingActivityMapper cachingActivityMapper = new CachingActivityMapper(westActivityMapper);
- filteredActivityMapper = new FilteredActivityMapper(filter, cachingActivityMapper);
- }
-
- @Override
- public Activity getActivity(Place place) {
- return filteredActivityMapper.getActivity(place);
- }
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java~HEAD
deleted file mode 100644
index 6ebc716..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java~HEAD
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************
- * 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.ComposeActivity;
-import org.apache.hupa.client.place.ComposePlace;
-
-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;
-import com.google.gwt.place.shared.Place;
-import com.google.gwt.place.shared.PlaceController;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-public class ComposeActivityMapper implements ActivityMapper {
- private final Provider<ComposeActivity> composeActivityProvider;
-
- @Inject protected PlaceController placeController;
-
- @Inject
- public ComposeActivityMapper(Provider<ComposeActivity> composeActivityProvider) {
- this.composeActivityProvider = composeActivityProvider;
- }
-
- public Activity getActivity(final Place place) {
- if (!(place instanceof ComposePlace))
- return null;
- final ComposePlace here = (ComposePlace) place;
- if (!"new".equals(here.getToken()) && here.getParameters() == null)
- return null;
- return new ActivityAsyncProxy() {
- @Override
- protected void doAsync(RunAsyncCallback callback) {
- GWT.runAsync(callback);
- }
-
- @Override
- protected Activity createInstance() {
- return composeActivityProvider.get().with(here);
- }
- };
- }
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java~HEAD
deleted file mode 100644
index 9064a14..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java~HEAD
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************
- * 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;
-import com.google.gwt.place.shared.Place;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-public class TopActivityMapper implements ActivityMapper {
- private final Provider<TopActivity> topActivityProvider;
-
- @Inject
- public TopActivityMapper(Provider<TopActivity> topActivityProvider) {
- this.topActivityProvider = topActivityProvider;
- }
-
- public Activity getActivity(Place place) {
- if(place instanceof DefaultPlace) return null;
- return topActivityProvider.get();
- }
-}
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java~HEAD b/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java~HEAD
deleted file mode 100644
index defa6b5..0000000
--- a/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java~HEAD
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************
- * 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 com.google.gwt.activity.shared.Activity;
-import com.google.gwt.activity.shared.ActivityMapper;
-import com.google.gwt.place.shared.Place;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-public class WestActivityMapper implements ActivityMapper {
- private final Provider<WestActivity> westActivityProvider;
-
- @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;
- }
-}
