new place/ url mappings

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationActivityMapper.java

@@ -26,8 +26,8 @@ import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesCompetitorAnalyticsPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesLeaderboardPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesRegattaLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesLeaderboardsPlace;
 import com.sap.sailing.gwt.home.client.place.regatta.RegattaPlace;
 import com.sap.sailing.gwt.home.client.place.searchresult.SearchResultActivityProxy;
 import com.sap.sailing.gwt.home.client.place.searchresult.SearchResultPlace;
@@ -159,9 +159,9 @@ public class ApplicationActivityMapper implements ActivityMapper {
         
         switch (place.getNavigationTab()) {
             case OverallLeaderboard:
-                return new EventSeriesLeaderboardPlace(context);
+                return new EventSeriesOverallLeaderboardPlace(context);
             case RegattaLeaderboards:
-                return new EventSeriesRegattaLeaderboardPlace(context);
+                return new EventSeriesLeaderboardsPlace(context);
             case CompetitorAnalytics:
                 return new EventSeriesCompetitorAnalyticsPlace(context);
         }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationHistoryMapper.java

@@ -15,8 +15,8 @@ import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPla
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesCompetitorAnalyticsPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesLeaderboardPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesRegattaLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesOverallLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesLeaderboardsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.SeriesEventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.SeriesMediaPlace;
 import com.sap.sailing.gwt.home.client.place.regatta.RegattaPlace;
@@ -47,8 +47,8 @@ import com.sap.sailing.gwt.home.client.place.whatsnew.WhatsNewPlace;
         SeriesDefaultPlace.Tokenizer.class,
         SeriesEventsPlace.Tokenizer.class,
         EventSeriesCompetitorAnalyticsPlace.Tokenizer.class,
-        EventSeriesLeaderboardPlace.Tokenizer.class,
-        EventSeriesRegattaLeaderboardPlace.Tokenizer.class,
+        EventSeriesOverallLeaderboardPlace.Tokenizer.class,
+        EventSeriesLeaderboardsPlace.Tokenizer.class,
         SeriesMediaPlace.Tokenizer.class
 
 })

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventDefaultPlace.java

@@ -1,5 +1,6 @@
 package com.sap.sailing.gwt.home.client.place.event2;
 
+import com.google.gwt.place.shared.Prefix;
 
 public class EventDefaultPlace extends AbstractEventPlace {
 
@@ -11,6 +12,7 @@ public class EventDefaultPlace extends AbstractEventPlace {
         super(eventUuidAsString);
     }
 
+    @Prefix(EventPrefixes.EventDefault)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<EventDefaultPlace> {
         @Override
         protected EventDefaultPlace getRealPlace(EventContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventPrefixes.java

@@ -0,0 +1,21 @@
+package com.sap.sailing.gwt.home.client.place.event2;
+
+
+public class EventPrefixes {
+
+    public static final String EventDefault = "/event/";
+    public static final String MultiregattaOverview = "/multiregatta/overview/";
+    public static final String MultiregattaRegattas = "/multiregatta/regattas/";
+    public static final String MultiregattaMedia = "/multiregatta/media/";
+    public static final String RegattaOverview = "/regatta/overview/";
+    public static final String RegattaRaces = "/regatta/races/";
+    public static final String RegattaLeaderboard = "/regatta/leaderboard/";
+    public static final String RegattaCompetitorAnalytics = "/regatta/competitoranalytics/";
+    public static final String RegattaMedia = "/regatta/media/";
+    public static final String SeriesDefault = "/series/";
+    public static final String SeriesEvents = "/series/events/";
+    public static final String EventSeriesCompetitorAnalytics = "/series/competitoranalytics/";
+    public static final String EventSeriesOverallLeaderboard = "/series/overallleaderboard/";
+    public static final String EventSeriesLeaderboards = "/series/leaderboards/";
+    public static final String EventSeriesMedia = "/series/media/";
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/multiregatta/TabletAndDesktopEventView.java

@@ -4,12 +4,14 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanelPlaceSelectionEvent;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
+import com.sap.sailing.gwt.common.client.i18n.TextMessages;
 import com.sap.sailing.gwt.home.client.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
 import com.sap.sailing.gwt.home.client.place.event2.partials.header.EventHeader;
@@ -52,6 +54,15 @@ public class TabletAndDesktopEventView extends Composite implements EventMultire
     @Override
     public void navigateTabsTo(AbstractMultiregattaEventPlace place) {
         tabPanelUi.activatePlace(place);
+        StringBuilder titleBuilder = new StringBuilder(TextMessages.INSTANCE.sapSailing()).append(" - ");
+
+        titleBuilder.append(currentPresenter.showRegattaMetadata() ? currentPresenter.getRegattaMetadata()
+                .getDisplayName() : currentPresenter.getCtx().getEventDTO().getName());
+        String currentTabTitle = tabPanelUi.getCurrentTabTitle();
+        if (currentTabTitle != null && !currentTabTitle.isEmpty()) {
+            titleBuilder.append(" - ").append(currentTabTitle);
+        }
+        Window.setTitle(titleBuilder.toString());
     }
 
     @SuppressWarnings("unchecked")

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/multiregatta/tabs/MultiregattaMediaPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
 
 public class MultiregattaMediaPlace extends AbstractMultiregattaEventPlace {
@@ -13,6 +15,7 @@ public class MultiregattaMediaPlace extends AbstractMultiregattaEventPlace {
         super(context);
     }
 
+    @Prefix(EventPrefixes.MultiregattaMedia)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<MultiregattaMediaPlace> {
         @Override
         protected MultiregattaMediaPlace getRealPlace(EventContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/multiregatta/tabs/MultiregattaOverviewPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
 
 public class MultiregattaOverviewPlace extends AbstractMultiregattaEventPlace {
@@ -13,6 +15,7 @@ public class MultiregattaOverviewPlace extends AbstractMultiregattaEventPlace {
         super(context);
     }
 
+    @Prefix(EventPrefixes.MultiregattaOverview)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<MultiregattaOverviewPlace> {
         @Override
         protected MultiregattaOverviewPlace getRealPlace(EventContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/multiregatta/tabs/MultiregattaRegattasPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
 
 public class MultiregattaRegattasPlace extends AbstractMultiregattaEventPlace {
@@ -13,6 +15,7 @@ public class MultiregattaRegattasPlace extends AbstractMultiregattaEventPlace {
         super(context);
     }
 
+    @Prefix(EventPrefixes.MultiregattaRegattas)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<MultiregattaRegattasPlace> {
         @Override
         protected MultiregattaRegattasPlace getRealPlace(EventContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/regatta/tabs/RegattaCompetitorAnalyticsPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
 
 public class RegattaCompetitorAnalyticsPlace extends AbstractEventRegattaPlace {
@@ -18,6 +20,7 @@ public class RegattaCompetitorAnalyticsPlace extends AbstractEventRegattaPlace {
         return new RegattaCompetitorAnalyticsPlace(ctx);
     }
 
+    @Prefix(EventPrefixes.RegattaCompetitorAnalytics)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<RegattaCompetitorAnalyticsPlace> {
 
         @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/regatta/tabs/RegattaLeaderboardPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
 
 public class RegattaLeaderboardPlace extends AbstractEventRegattaPlace {
@@ -18,6 +20,7 @@ public class RegattaLeaderboardPlace extends AbstractEventRegattaPlace {
         return new RegattaLeaderboardPlace(ctx);
     }
 
+    @Prefix(EventPrefixes.RegattaLeaderboard)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<RegattaLeaderboardPlace> {
         @Override
         protected RegattaLeaderboardPlace getRealPlace(EventContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/regatta/tabs/RegattaMediaPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
 
 public class RegattaMediaPlace extends AbstractEventRegattaPlace {
@@ -18,6 +20,7 @@ public class RegattaMediaPlace extends AbstractEventRegattaPlace {
         return new RegattaMediaPlace(ctx);
     }
 
+    @Prefix(EventPrefixes.RegattaMedia)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<RegattaMediaPlace> {
 
         @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/regatta/tabs/RegattaOverviewPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
 
 public class RegattaOverviewPlace extends AbstractEventRegattaPlace {
@@ -18,6 +20,7 @@ public class RegattaOverviewPlace extends AbstractEventRegattaPlace {
         return new RegattaOverviewPlace(ctx);
     }
 
+    @Prefix(EventPrefixes.RegattaOverview)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<RegattaOverviewPlace> {
 
         @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/regatta/tabs/RegattaRacesPlace.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
 
+import com.google.gwt.place.shared.Prefix;
 import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
 
 public class RegattaRacesPlace extends AbstractEventRegattaPlace {
@@ -18,6 +20,7 @@ public class RegattaRacesPlace extends AbstractEventRegattaPlace {
         return new RegattaRacesPlace(ctx);
     }
 
+    @Prefix(EventPrefixes.RegattaRaces)
     public static class Tokenizer extends AbstractEventPlace.Tokenizer<RegattaRacesPlace> {
         @Override
         protected RegattaRacesPlace getRealPlace(EventContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/EventsPlace.java

@@ -12,7 +12,7 @@ public class EventsPlace extends Place {
     public static class Tokenizer implements PlaceTokenizer<EventsPlace> {
         @Override
         public String getToken(EventsPlace place) {
-            return null;
+            return "";
         }
 
         @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/SeriesDefaultPlace.java

@@ -1,5 +1,8 @@
 package com.sap.sailing.gwt.home.client.place.fakeseries;
 
+import com.google.gwt.place.shared.Prefix;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
+
 
 public class SeriesDefaultPlace extends AbstractSeriesPlace {
 
@@ -11,6 +14,7 @@ public class SeriesDefaultPlace extends AbstractSeriesPlace {
         super(eventUuidAsString);
     }
 
+    @Prefix(EventPrefixes.SeriesDefault)
     public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<SeriesDefaultPlace> {
         @Override
         protected SeriesDefaultPlace getRealPlace(SeriesContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesCompetitorAnalyticsPlace.java

@@ -1,5 +1,7 @@
 package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
 
+import com.google.gwt.place.shared.Prefix;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
@@ -13,6 +15,7 @@ public class EventSeriesCompetitorAnalyticsPlace extends AbstractSeriesTabPlace
         super(context);
     }
 
+    @Prefix(EventPrefixes.EventSeriesCompetitorAnalytics)
     public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<EventSeriesCompetitorAnalyticsPlace> {
         @Override
         protected EventSeriesCompetitorAnalyticsPlace getRealPlace(SeriesContext context) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardPlace.java

@@ -1,22 +0,0 @@
-package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
-
-import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
-
-public class EventSeriesLeaderboardPlace extends AbstractSeriesTabPlace {
-    public EventSeriesLeaderboardPlace(String id) {
-        super(id);
-    }
-    
-    public EventSeriesLeaderboardPlace(SeriesContext context) {
-        super(context);
-    }
-
-    public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<EventSeriesLeaderboardPlace> {
-        @Override
-        protected EventSeriesLeaderboardPlace getRealPlace(SeriesContext context) {
-            return new EventSeriesLeaderboardPlace(context);
-        }
-    }
-}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardTabView.java

@@ -28,7 +28,7 @@ import com.sap.sse.gwt.shared.GwtHttpRequestUtils;
 /**
  * Created by pgtaboada on 25.11.14.
  */
-public class EventSeriesLeaderboardTabView extends Composite implements SeriesTabView<EventSeriesLeaderboardPlace>,
+public class EventSeriesLeaderboardTabView extends Composite implements SeriesTabView<EventSeriesOverallLeaderboardPlace>,
         LeaderboardUpdateListener {
 
     private SeriesView.Presenter currentPresenter;
@@ -42,8 +42,8 @@ public class EventSeriesLeaderboardTabView extends Composite implements SeriesTa
     }
 
     @Override
-    public Class<EventSeriesLeaderboardPlace> getPlaceClassForActivation() {
-        return EventSeriesLeaderboardPlace.class;
+    public Class<EventSeriesOverallLeaderboardPlace> getPlaceClassForActivation() {
+        return EventSeriesOverallLeaderboardPlace.class;
     }
 
     @Override
@@ -57,7 +57,7 @@ public class EventSeriesLeaderboardTabView extends Composite implements SeriesTa
     }
 
     @Override
-    public void start(final EventSeriesLeaderboardPlace myPlace, final AcceptsOneWidget contentArea) {
+    public void start(final EventSeriesOverallLeaderboardPlace myPlace, final AcceptsOneWidget contentArea) {
 
         contentArea.setWidget(new Placeholder());
 
@@ -138,8 +138,8 @@ public class EventSeriesLeaderboardTabView extends Composite implements SeriesTa
     private static MyBinder ourUiBinder = GWT.create(MyBinder.class);
 
     @Override
-    public EventSeriesLeaderboardPlace placeToFire() {
-        return new EventSeriesLeaderboardPlace(currentPresenter.getCtx());
+    public EventSeriesOverallLeaderboardPlace placeToFire() {
+        return new EventSeriesOverallLeaderboardPlace(currentPresenter.getCtx());
     }
 
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesLeaderboardsPlace.java

@@ -0,0 +1,25 @@
+package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
+
+import com.google.gwt.place.shared.Prefix;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
+
+public class EventSeriesLeaderboardsPlace extends AbstractSeriesTabPlace {
+    public EventSeriesLeaderboardsPlace(String id) {
+        super(id);
+    }
+    
+    public EventSeriesLeaderboardsPlace(SeriesContext context) {
+        super(context);
+    }
+
+    @Prefix(EventPrefixes.EventSeriesLeaderboards)
+    public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<EventSeriesLeaderboardsPlace> {
+        @Override
+        protected EventSeriesLeaderboardsPlace getRealPlace(SeriesContext context) {
+            return new EventSeriesLeaderboardsPlace(context);
+        }
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesOverallLeaderboardPlace.java

@@ -0,0 +1,25 @@
+package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
+
+import com.google.gwt.place.shared.Prefix;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
+import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
+
+public class EventSeriesOverallLeaderboardPlace extends AbstractSeriesTabPlace {
+    public EventSeriesOverallLeaderboardPlace(String id) {
+        super(id);
+    }
+    
+    public EventSeriesOverallLeaderboardPlace(SeriesContext context) {
+        super(context);
+    }
+
+    @Prefix(EventPrefixes.EventSeriesOverallLeaderboard)
+    public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<EventSeriesOverallLeaderboardPlace> {
+        @Override
+        protected EventSeriesOverallLeaderboardPlace getRealPlace(SeriesContext context) {
+            return new EventSeriesOverallLeaderboardPlace(context);
+        }
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesRegattaLeaderboardPlace.java

@@ -1,22 +0,0 @@
-package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
-
-import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
-import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
-
-public class EventSeriesRegattaLeaderboardPlace extends AbstractSeriesTabPlace {
-    public EventSeriesRegattaLeaderboardPlace(String id) {
-        super(id);
-    }
-    
-    public EventSeriesRegattaLeaderboardPlace(SeriesContext context) {
-        super(context);
-    }
-
-    public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<EventSeriesRegattaLeaderboardPlace> {
-        @Override
-        protected EventSeriesRegattaLeaderboardPlace getRealPlace(SeriesContext context) {
-            return new EventSeriesRegattaLeaderboardPlace(context);
-        }
-    }
-}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/EventSeriesRegattaLeaderboardTabView.java

@@ -25,7 +25,7 @@ import com.sap.sailing.gwt.ui.leaderboard.MultiLeaderboardPanel;
 import com.sap.sailing.gwt.ui.shared.fakeseries.EventSeriesViewDTO.EventSeriesState;
 import com.sap.sse.gwt.shared.GwtHttpRequestUtils;
 
-public class EventSeriesRegattaLeaderboardTabView extends Composite implements SeriesTabView<EventSeriesRegattaLeaderboardPlace>,
+public class EventSeriesRegattaLeaderboardTabView extends Composite implements SeriesTabView<EventSeriesLeaderboardsPlace>,
         LeaderboardUpdateListener {
 
     private SeriesView.Presenter currentPresenter;
@@ -39,8 +39,8 @@ public class EventSeriesRegattaLeaderboardTabView extends Composite implements S
     }
 
     @Override
-    public Class<EventSeriesRegattaLeaderboardPlace> getPlaceClassForActivation() {
-        return EventSeriesRegattaLeaderboardPlace.class;
+    public Class<EventSeriesLeaderboardsPlace> getPlaceClassForActivation() {
+        return EventSeriesLeaderboardsPlace.class;
     }
 
     @Override
@@ -54,7 +54,7 @@ public class EventSeriesRegattaLeaderboardTabView extends Composite implements S
     }
 
     @Override
-    public void start(final EventSeriesRegattaLeaderboardPlace myPlace, final AcceptsOneWidget contentArea) {
+    public void start(final EventSeriesLeaderboardsPlace myPlace, final AcceptsOneWidget contentArea) {
 
         contentArea.setWidget(new Placeholder());
 
@@ -136,8 +136,8 @@ public class EventSeriesRegattaLeaderboardTabView extends Composite implements S
     private static MyBinder ourUiBinder = GWT.create(MyBinder.class);
 
     @Override
-    public EventSeriesRegattaLeaderboardPlace placeToFire() {
-        return new EventSeriesRegattaLeaderboardPlace(currentPresenter.getCtx());
+    public EventSeriesLeaderboardsPlace placeToFire() {
+        return new EventSeriesLeaderboardsPlace(currentPresenter.getCtx());
     }
 
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesEventsPlace.java

@@ -1,5 +1,7 @@
 package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
 
+import com.google.gwt.place.shared.Prefix;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
@@ -13,6 +15,7 @@ public class SeriesEventsPlace extends AbstractSeriesTabPlace {
         super(context);
     }
 
+    @Prefix(EventPrefixes.SeriesEvents)
     public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<SeriesEventsPlace> {
 
         @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/tabs/SeriesMediaPlace.java

@@ -1,5 +1,7 @@
 package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
 
+import com.google.gwt.place.shared.Prefix;
+import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesContext;
@@ -13,6 +15,7 @@ public class SeriesMediaPlace extends AbstractSeriesTabPlace {
         super(context);
     }
 
+    @Prefix(EventPrefixes.EventSeriesMedia)
     public static class Tokenizer extends AbstractSeriesPlace.Tokenizer<SeriesMediaPlace> {
 
         @Override