Merge branch 'design2015-refactoring' into design2015

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaOverviewTabView.java

@@ -18,10 +18,10 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView;
 import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView.Presenter;
 import com.sap.sailing.gwt.home.client.place.event.multiregatta.MultiregattaTabView;
-import com.sap.sailing.gwt.home.client.place.event.overview.EventOverviewStage;
 import com.sap.sailing.gwt.home.client.place.event.partials.eventregatta.EventRegattaList;
 import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.reload.RefreshManager;
 import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.reload.RefreshableWidget;
+import com.sap.sailing.gwt.home.desktop.partials.eventstage.EventOverviewStage;
 import com.sap.sailing.gwt.home.desktop.partials.liveraces.LiveRacesList;
 import com.sap.sailing.gwt.home.desktop.partials.multiregattalist.MultiRegattaList;
 import com.sap.sailing.gwt.home.desktop.partials.raceoffice.RaceOfficeSection;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaOverviewTabView.ui.xml

@@ -1,10 +1,9 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'
-        	 xmlns:dp='urn:import:com.sap.sailing.gwt.home.desktop.partials'
-  			 xmlns:o="urn:import:com.sap.sailing.gwt.home.client.place.event.overview">
+        	 xmlns:dp='urn:import:com.sap.sailing.gwt.home.desktop.partials'>
   	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
   	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
   <g:HTMLPanel>
-    <o:EventOverviewStage ui:field="stageUi" />
+    <dp:eventstage.EventOverviewStage ui:field="stageUi" />
     <div class="{res.mediaCss.grid}" ui:field="newContentContainerUi">
       <div class="{res.mediaCss.small12} {res.mediaCss.columns} {res.mainCss.spacermarginbottommedium}">
         <dp:liveraces.LiveRacesList ui:field="liveRacesListUi" addStyleNames="{res.mainCss.spacermargin} {res.mainCss.spacermargintopmedium}" />

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaOverviewTabView.java

@@ -8,12 +8,12 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event.overview.EventOverviewStage;
 import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView;
 import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView.Presenter;
 import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
 import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.reload.RefreshManager;
 import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.reload.RefreshableWidget;
+import com.sap.sailing.gwt.home.desktop.partials.eventstage.EventOverviewStage;
 import com.sap.sailing.gwt.home.desktop.partials.liveraces.LiveRacesList;
 import com.sap.sailing.gwt.home.desktop.partials.multiregattalist.MultiRegattaListItem;
 import com.sap.sailing.gwt.home.desktop.partials.standings.StandingsList;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaOverviewTabView.ui.xml

@@ -1,5 +1,4 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'
-	  xmlns:o="urn:import:com.sap.sailing.gwt.home.client.place.event.overview"
 	  xmlns:dp='urn:import:com.sap.sailing.gwt.home.desktop.partials'>
   <ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
   <g:HTMLPanel>
@@ -7,7 +6,7 @@
       <g:SimplePanel addStyleNames="{res.mediaCss.small12} {res.mediaCss.columns}" ui:field="regattaInfoContainerUi"/>
 	  <dp:liveraces.LiveRacesList ui:field="liveRacesListUi" addStyleNames="{res.mediaCss.small12} {res.mediaCss.columns} {res.mainCss.spacermargintopmedium}" />
     </div>
-    <o:EventOverviewStage ui:field="stageUi" addStyleNames="{res.mainCss.spacermargin} {res.mainCss.spacermargintopsmall}" />
+    <dp:eventstage.EventOverviewStage ui:field="stageUi" addStyleNames="{res.mainCss.spacermargin} {res.mainCss.spacermargintopsmall}" />
     <div class="{res.mediaCss.grid}">
       <div class="{res.mediaCss.small12} {res.mediaCss.columns}">
         <dp:standings.StandingsList ui:field="standingsUi" addStyleNames="{res.mainCss.spacermargin} {res.mainCss.spacermargintopmedium}" />

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/SharedLeaderboardRegattaTabView.java

@@ -6,7 +6,7 @@ import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
 import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
 import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaAnalyticsDataManager;
 import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
-import com.sap.sailing.gwt.home.client.place.event.utils.EventParamUtils;
+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;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;

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

@@ -12,7 +12,7 @@ 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.place.fakeseries.partials.header.SeriesHeader;
+import com.sap.sailing.gwt.home.desktop.partials.seriesheader.SeriesHeader;
 import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
 import com.sap.sailing.gwt.ui.client.StringMessages;

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

@@ -1,9 +1,8 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
-  xmlns:g="urn:import:com.google.gwt.user.client.ui" 
-  xmlns:c="urn:import:com.sap.sailing.gwt.common.client.controls.tabbar"
-  xmlns:tabs="urn:import:com.sap.sailing.gwt.home.client.place.fakeseries.tabs" 
-  xmlns:h="urn:import:com.sap.sailing.gwt.home.client.place.fakeseries.partials.header">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"
+	xmlns:c="urn:import:com.sap.sailing.gwt.common.client.controls.tabbar"
+	xmlns:dp="urn:import:com.sap.sailing.gwt.home.desktop.partials"
+	xmlns:t="urn:import:com.sap.sailing.gwt.home.client.place.fakeseries.tabs">
   <ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
   <ui:with field="tm" type="com.sap.sailing.gwt.common.client.i18n.TextMessages" />
   <ui:style>
@@ -13,11 +12,9 @@
       margin: 0;
       padding: 0;
     }
-
     .mainHeader {
       width: 66.6666666666667%;
     }
-
     .sharingHeader {
       width: 33.3333333333333%;
       float: right;
@@ -25,21 +22,17 @@
       position: relative;
       padding: 1.333333333333333em 0;
       text-align: right;
-
       background-color: maroon;
       height: 2rem;
     }
-
     .breadcrumb, .intro {
       box-sizing: border-box;
       -moz-box-sizing: border-box;
     }
-
     .breadcrumb {
       font-size: 0.866666666666667em;
       font-weight: 600;
     }
-
     .intro {
       height: 5em;
     }
@@ -47,25 +40,25 @@
   <g:HTMLPanel>
     <c:TabPanel ui:field="tabPanelUi">
       <c:header>
-        <h:SeriesHeader ui:field="seriesHeader" />
+        <dp:seriesheader.SeriesHeader ui:field="seriesHeader" />
       </c:header>
       <c:tabcontent title="{i18n.overview}">
-        <tabs:SeriesOverviewTabView />
+        <t:SeriesOverviewTabView />
       </c:tabcontent>
       <c:tabcontent title="{i18n.events}">
-        <tabs:SeriesEventsTabView />
+        <t:SeriesEventsTabView />
       </c:tabcontent>
       <c:tabcontent title="{tm.overallLeaderboard}">
-        <tabs:EventSeriesLeaderboardTabView />
+        <t:EventSeriesLeaderboardTabView />
       </c:tabcontent>
       <c:tabcontent title="{tm.regattaLeaderboards}">
-        <tabs:EventSeriesLeaderboardsTabView />
+        <t:EventSeriesLeaderboardsTabView />
       </c:tabcontent>
       <c:tabcontent title="{i18n.competitorsAnalytics}">
-        <tabs:EventSeriesCompetitorAnalyticsTabView />
+        <t:EventSeriesCompetitorAnalyticsTabView />
       </c:tabcontent>
       <c:tabcontent title="{i18n.media}">
-        <tabs:SeriesMediaTabView />
+        <t:SeriesMediaTabView />
       </c:tabcontent>
     </c:TabPanel>
   </g:HTMLPanel>

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

@@ -14,10 +14,10 @@ import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.place.event.oldmultileaderboard.OldMultiLeaderboardDelegateFullscreenViewer;
 import com.sap.sailing.gwt.home.client.place.event.oldmultileaderboard.OldMultiLeaderboard;
-import com.sap.sailing.gwt.home.client.place.event.utils.EventParamUtils;
 import com.sap.sailing.gwt.home.client.place.fakeseries.EventSeriesAnalyticsDataManager;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesTabView;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesView;
+import com.sap.sailing.gwt.home.desktop.utils.EventParamUtils;
 import com.sap.sailing.gwt.home.shared.partials.placeholder.Placeholder;
 import com.sap.sailing.gwt.ui.client.LeaderboardUpdateListener;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;

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

@@ -3,10 +3,10 @@ package com.sap.sailing.gwt.home.client.place.fakeseries.tabs;
 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.client.place.event.utils.EventParamUtils;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesTabPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.EventSeriesAnalyticsDataManager;
 import com.sap.sailing.gwt.home.client.place.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;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventstage/EventOverviewStage.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event.overview;
+package com.sap.sailing.gwt.home.desktop.partials.eventstage;
 
 import java.util.List;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.fakeseries.partials.header;
+package com.sap.sailing.gwt.home.desktop.partials.seriesheader;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.ui.xml

@@ -3,7 +3,7 @@
 		xmlns:dp="urn:import:com.sap.sailing.gwt.home.desktop.partials">
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
-	<ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.fakeseries.partials.header.SeriesHeaderResources" />
+	<ui:with field="local_res" type="com.sap.sailing.gwt.home.desktop.partials.seriesheader.SeriesHeaderResources" />
 	<g:HTMLPanel addStyleNames="{res.mediaCss.grid}">
 		<div class="{res.mediaCss.small12} {res.mediaCss.large9} {res.mediaCss.columns}">
 			<div class="{local_res.css.eventheader_intro}">

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.fakeseries.partials.header;
+package com.sap.sailing.gwt.home.desktop.partials.seriesheader;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/utils/EventParamUtils.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event.utils;
+package com.sap.sailing.gwt.home.desktop.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -30,19 +30,6 @@ public class EventParamUtils {
         return result;
     }
 
-    public static List<DetailType> getDetailTypeListFromParamValue(List<String> list) {
-        List<DetailType> result = new ArrayList<DetailType>();
-        if (list != null) {
-            for (String entry : list) {
-                try {
-                    result.add(DetailType.valueOf(entry));
-                } catch (IllegalArgumentException e) {
-                }
-            }
-        }
-        return result;
-    }
-
     public static LeaderboardSettings createLeaderboardSettingsFromURLParameters(Map<String, List<String>> parameterMap) {
         LeaderboardSettings result;
         Long refreshIntervalMillis = parameterMap.containsKey(LeaderboardUrlSettings.PARAM_REFRESH_INTERVAL_MILLIS) ? Long
@@ -125,8 +112,21 @@ public class EventParamUtils {
         }
         return result;
     }
+    
+    private static List<DetailType> getDetailTypeListFromParamValue(List<String> list) {
+        List<DetailType> result = new ArrayList<DetailType>();
+        if (list != null) {
+            for (String entry : list) {
+                try {
+                    result.add(DetailType.valueOf(entry));
+                } catch (IllegalArgumentException e) {
+                }
+            }
+        }
+        return result;
+    }
 
-    public static List<String> getStringListFromParamValue(List<String> list) {
+    private static List<String> getStringListFromParamValue(List<String> list) {
         List<String> result = new ArrayList<String>();
         if (list != null) {
             result.addAll(list);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/utils/WindowUtils.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event.utils;
+package com.sap.sailing.gwt.home.desktop.utils;
 
 import com.google.gwt.user.client.Window;