Merge branch 'bug3529' of ssh://trac@sapsailing.com/home/trac/git into bug3529

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardContextSettings.java

@@ -15,7 +15,6 @@ public class LeaderboardContextSettings extends AbstractGenericSerializableSetti
     private transient StringSetting leaderboardName;
     private transient StringSetting leaderboardGroupName;
     private transient StringSetting displayName;
-    private transient StringSetting zoomTo;
     private transient StringSetting raceName;
     private transient StringSetting regattaName;
 
@@ -34,7 +33,6 @@ public class LeaderboardContextSettings extends AbstractGenericSerializableSetti
         leaderboardName = new StringSetting("name", this);
         leaderboardGroupName = new StringSetting(LeaderboardUrlSettings.PARAM_LEADERBOARD_GROUP_NAME, this);
         displayName = new StringSetting("displayName", this);
-        zoomTo = new StringSetting(LeaderboardUrlSettings.PARAM_ZOOM_TO, this);
         raceName = new StringSetting(LeaderboardUrlSettings.PARAM_RACE_NAME, this);
         regattaName = new StringSetting(LeaderboardUrlSettings.PARAM_REGATTA_NAME, this);
     }
@@ -53,9 +51,6 @@ public class LeaderboardContextSettings extends AbstractGenericSerializableSetti
     public String getDisplayName() {
         return displayName.getValue();
     }
-    public String getZoomTo() {
-        return zoomTo.getValue();
-    }
     public String getRaceName() {
         return raceName.getValue();
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java

@@ -109,14 +109,6 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
         } else {
             RootPanel.get().add(new Label(getStringMessages().noSuchLeaderboard()));
         }
-        final String zoomTo = leaderboardContextSettings.getZoomTo();
-        if (zoomTo != null) {
-            RootPanel.getBodyElement().setAttribute("style",
-                    "zoom: " + zoomTo + ";-moz-transform: scale(" + zoomTo
-                            + ");-moz-transform-origin: 0 0;-o-transform: scale(" + zoomTo
-                            + ");-o-transform-origin: 0 0;-webkit-transform: scale(" + zoomTo
-                            + ");-webkit-transform-origin: 0 0;");
-        }
     }
 
     private void createUI(LeaderboardContextSettings leaderboardContextSettings, EventDTO event) {
@@ -217,6 +209,16 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
 
     protected void configureWithSettings(
             PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> settings, Timer timer) {
+        LeaderboardPerspectiveOwnSettings perspectiveOwnSettings = settings.getPerspectiveOwnSettings();
+        final String zoomTo = perspectiveOwnSettings.getZoomTo();
+        if (zoomTo != null) {
+            RootPanel.getBodyElement().setAttribute("style",
+                    "zoom: " + zoomTo + ";-moz-transform: scale(" + zoomTo
+                            + ");-moz-transform-origin: 0 0;-o-transform: scale(" + zoomTo
+                            + ");-o-transform-origin: 0 0;-webkit-transform: scale(" + zoomTo
+                            + ");-webkit-transform-origin: 0 0;");
+        }
+        
         LeaderboardSettings leaderboardSettings = settings.findSettingsByComponentId(LeaderboardPanelLifecycle.ID);
         if (leaderboardSettings.getDelayBetweenAutoAdvancesInMilliseconds() != null) {
             timer.setPlayMode(PlayModes.Live); // the leaderboard, viewed via the entry point, goes "live" and "playing"

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPerspectiveOwnSettings.java

@@ -2,6 +2,7 @@ package com.sap.sailing.gwt.ui.leaderboard;
 
 import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
 import com.sap.sse.common.settings.generic.BooleanSetting;
+import com.sap.sse.common.settings.generic.StringSetting;
 
 public class LeaderboardPerspectiveOwnSettings extends AbstractGenericSerializableSettings {
     private static final long serialVersionUID = 8978956250485028963L;
@@ -12,6 +13,7 @@ public class LeaderboardPerspectiveOwnSettings extends AbstractGenericSerializab
     private transient BooleanSetting showCharts;
     private transient BooleanSetting showOverallLeaderboard;
     private transient BooleanSetting showSeriesLeaderboards;
+    private transient StringSetting zoomTo;
     
     LeaderboardPerspectiveOwnSettings() {
 
@@ -35,6 +37,7 @@ public class LeaderboardPerspectiveOwnSettings extends AbstractGenericSerializab
         showCharts = new BooleanSetting(LeaderboardUrlSettings.PARAM_SHOW_CHARTS, this, false);
         showOverallLeaderboard = new BooleanSetting(LeaderboardUrlSettings.PARAM_SHOW_OVERALL_LEADERBOARD, this, false);
         showSeriesLeaderboards = new BooleanSetting(LeaderboardUrlSettings.PARAM_SHOW_SERIES_LEADERBOARDS, this, false);
+        zoomTo = new StringSetting(LeaderboardUrlSettings.PARAM_ZOOM_TO, this, "1");
     }
     public boolean isShowRaceDetails() {
         return showRaceDetails.getValue();
@@ -54,5 +57,7 @@ public class LeaderboardPerspectiveOwnSettings extends AbstractGenericSerializab
     public boolean isShowSeriesLeaderboards() {
         return showSeriesLeaderboards.getValue();
     }
-    
+    public String getZoomTo() {
+        return zoomTo.getValue();
+    }
 }