From fde1ddbc361f2dbfb1289dd011545868832753da Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Wed, 23 Sep 2015 11:24:49 +0200 Subject: [PATCH] Refactoring - Moved desktop series tab places and views into respective packages --- .../desktop/places/fakeseries/SeriesActivityProxy.java | 4 ++-- .../SharedLeaderboardEventSeriesTabView.java | 5 +---- .../fakeseries/TabletAndDesktopSeriesView.ui.xml | 10 +++++----- .../EventSeriesCompetitorAnalyticsPlace.java | 2 +- .../EventSeriesCompetitorAnalyticsTabView.java | 3 ++- .../EventSeriesCompetitorAnalyticsTabView.ui.xml | 0 .../fakeseries/eventstab}/SeriesEventsPlace.java | 2 +- .../fakeseries/eventstab}/SeriesEventsTabView.java | 2 +- .../fakeseries/eventstab}/SeriesEventsTabView.ui.xml | 0 .../leaderboardstab}/EventSeriesLeaderboardsPlace.java | 2 +- .../EventSeriesLeaderboardsTabView.java | 2 +- .../EventSeriesLeaderboardsTabView.ui.xml | 0 .../EventSeriesOverallLeaderboardPlace.java | 2 +- .../EventSeriesOverallLeaderboardTabView.java} | 9 +++++---- .../EventSeriesOverallLeaderboardTabView.ui.xml} | 0 .../gwt/home/mobile/places/series/SeriesActivity.java | 2 +- .../SeriesMiniOverallLeaderboardActivity.java | 2 +- .../gwt/home/shared/app/ApplicationHistoryMapper.java | 8 ++++---- .../gwt/home/shared/app/ApplicationPlaceUpdater.java | 6 +++--- 19 files changed, 30 insertions(+), 31 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries}/SharedLeaderboardEventSeriesTabView.java (86%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/analyticstab}/EventSeriesCompetitorAnalyticsPlace.java (93%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/analyticstab}/EventSeriesCompetitorAnalyticsTabView.java (97%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/analyticstab}/EventSeriesCompetitorAnalyticsTabView.ui.xml (100%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/eventstab}/SeriesEventsPlace.java (92%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/eventstab}/SeriesEventsTabView.java (97%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/eventstab}/SeriesEventsTabView.ui.xml (100%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/leaderboardstab}/EventSeriesLeaderboardsPlace.java (92%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/leaderboardstab}/EventSeriesLeaderboardsTabView.java (98%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/leaderboardstab}/EventSeriesLeaderboardsTabView.ui.xml (100%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs => desktop/places/fakeseries/overallleaderboardtab}/EventSeriesOverallLeaderboardPlace.java (92%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.java => desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.java} (89%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.ui.xml => desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.ui.xml} (100%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java index 9f5299a8718..d87b19de09f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivityProxy.java @@ -5,10 +5,10 @@ import java.util.UUID; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.SeriesEventsPlace; import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator; import com.sap.sailing.gwt.home.desktop.places.error.ErrorPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.eventstab.SeriesEventsPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.mobile.places.series.minileaderboard.SeriesMiniOverallLeaderboardPlace; import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace; import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SharedLeaderboardEventSeriesTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SharedLeaderboardEventSeriesTabView.java similarity index 86% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SharedLeaderboardEventSeriesTabView.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SharedLeaderboardEventSeriesTabView.java index 2676b7f696d..40467c8e921 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SharedLeaderboardEventSeriesTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SharedLeaderboardEventSeriesTabView.java @@ -1,11 +1,8 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Composite; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.gwt.home.desktop.places.fakeseries.AbstractSeriesTabPlace; -import com.sap.sailing.gwt.home.desktop.places.fakeseries.EventSeriesAnalyticsDataManager; -import com.sap.sailing.gwt.home.desktop.places.fakeseries.SeriesTabView; import com.sap.sailing.gwt.home.desktop.utils.EventParamUtils; import com.sap.sailing.gwt.ui.client.LeaderboardUpdateListener; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.ui.xml index c80cb75b397..a03b5ff6cad 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.ui.xml @@ -2,7 +2,7 @@ + xmlns:s="urn:import:com.sap.sailing.gwt.home.desktop.places.fakeseries"> @@ -43,16 +43,16 @@ - + - + - + - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsPlace.java similarity index 93% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsPlace.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsPlace.java index 32acc718519..a4eef6c6e34 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsPlace.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.analyticstab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.client.place.event.EventPrefixes; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsTabView.java similarity index 97% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsTabView.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsTabView.java index 3643f411137..feca67e33d7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsTabView.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.analyticstab; import java.util.ArrayList; import java.util.Iterator; @@ -19,6 +19,7 @@ import com.sap.sailing.gwt.home.desktop.partials.old.competitorcharts.OldCompeti import com.sap.sailing.gwt.home.desktop.partials.old.competitorcharts.OldCompetitorChartsDelegateFullscreenViewer; import com.sap.sailing.gwt.home.desktop.places.fakeseries.EventSeriesAnalyticsDataManager; import com.sap.sailing.gwt.home.desktop.places.fakeseries.SeriesView; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.SharedLeaderboardEventSeriesTabView; import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.partials.placeholder.Placeholder; import com.sap.sailing.gwt.ui.client.CompetitorSelectionChangeListener; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsTabView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsTabView.ui.xml similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsTabView.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/analyticstab/EventSeriesCompetitorAnalyticsTabView.ui.xml diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsPlace.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsPlace.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsPlace.java index 88215ffc45a..34977cadb58 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsPlace.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.eventstab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.client.place.event.EventPrefixes; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsTabView.java similarity index 97% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsTabView.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsTabView.java index 22766910700..641be2612e7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsTabView.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.eventstab; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsTabView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsTabView.ui.xml similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsTabView.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/eventstab/SeriesEventsTabView.ui.xml diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsPlace.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsPlace.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsPlace.java index 943cd341191..bbe8a11108c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsPlace.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.leaderboardstab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.client.place.event.EventPrefixes; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java similarity index 98% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsTabView.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java index 991a8f15c02..1c9ef2ebacc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.leaderboardstab; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsTabView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.ui.xml similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsTabView.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.ui.xml diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesOverallLeaderboardPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardPlace.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesOverallLeaderboardPlace.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardPlace.java index d44aed8f077..53dab4821b9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesOverallLeaderboardPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardPlace.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.client.place.event.EventPrefixes; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.java similarity index 89% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.java index c3c20b3cb18..371714577d3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.place.fakeseries.tabs; +package com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; @@ -14,15 +14,16 @@ import com.sap.sailing.gwt.home.desktop.partials.old.leaderboard.OldLeaderboard; import com.sap.sailing.gwt.home.desktop.partials.old.leaderboard.OldLeaderboardDelegateFullscreenViewer; import com.sap.sailing.gwt.home.desktop.places.fakeseries.EventSeriesAnalyticsDataManager; import com.sap.sailing.gwt.home.desktop.places.fakeseries.SeriesView; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.SharedLeaderboardEventSeriesTabView; import com.sap.sailing.gwt.home.shared.partials.placeholder.Placeholder; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; /** * Created by pgtaboada on 25.11.14. */ -public class EventSeriesLeaderboardTabView extends SharedLeaderboardEventSeriesTabView { +public class EventSeriesOverallLeaderboardTabView extends SharedLeaderboardEventSeriesTabView { - interface MyBinder extends UiBinder { + interface MyBinder extends UiBinder { } private static MyBinder ourUiBinder = GWT.create(MyBinder.class); @@ -32,7 +33,7 @@ public class EventSeriesLeaderboardTabView extends SharedLeaderboardEventSeriesT @UiField(provided = true) protected OldLeaderboard leaderboard; - public EventSeriesLeaderboardTabView() { + public EventSeriesOverallLeaderboardTabView() { leaderboard = new OldLeaderboard(new OldLeaderboardDelegateFullscreenViewer()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.ui.xml similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/overallleaderboardtab/EventSeriesOverallLeaderboardTabView.ui.xml diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java index 90e6a5400fb..d570f732749 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java @@ -6,8 +6,8 @@ import com.google.gwt.activity.shared.AbstractActivity; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.desktop.places.error.ErrorPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory; import com.sap.sailing.gwt.home.mobile.places.event.minileaderboard.MiniLeaderboardPlace; import com.sap.sailing.gwt.home.mobile.places.series.minileaderboard.SeriesMiniOverallLeaderboardPlace; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java index b3f0c65a5bc..8037259edd4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java @@ -6,8 +6,8 @@ import com.google.gwt.activity.shared.AbstractActivity; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.desktop.places.error.ErrorPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory; import com.sap.sailing.gwt.home.mobile.places.event.minileaderboard.MiniLeaderboardPlace; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationHistoryMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationHistoryMapper.java index 6e3249d7324..16c38443b03 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationHistoryMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationHistoryMapper.java @@ -14,12 +14,12 @@ import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaLeaderboa import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaMediaPlace; import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaOverviewPlace; import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesCompetitorAnalyticsPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesLeaderboardsPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.SeriesEventsPlace; import com.sap.sailing.gwt.home.desktop.places.aboutus.AboutUsPlace; import com.sap.sailing.gwt.home.desktop.places.contact.ContactPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.analyticstab.EventSeriesCompetitorAnalyticsPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.eventstab.SeriesEventsPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.leaderboardstab.EventSeriesLeaderboardsPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.desktop.places.searchresult.SearchResultPlace; import com.sap.sailing.gwt.home.desktop.places.sponsoring.SponsoringPlace; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationPlaceUpdater.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationPlaceUpdater.java index b424cf5fdc7..8370284f5e7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationPlaceUpdater.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationPlaceUpdater.java @@ -13,9 +13,9 @@ import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaLeaderboa import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaMediaPlace; import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaOverviewPlace; import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesCompetitorAnalyticsPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesLeaderboardsPlace; -import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.analyticstab.EventSeriesCompetitorAnalyticsPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.leaderboardstab.EventSeriesLeaderboardsPlace; +import com.sap.sailing.gwt.home.desktop.places.fakeseries.overallleaderboardtab.EventSeriesOverallLeaderboardPlace; import com.sap.sailing.gwt.home.shared.places.events.EventsPlace; import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext; import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;