Merge remote-tracking branch 'origin/master' into translation

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties

java/com.sap.sse.gwt/META-INF/MANIFEST.MF

@@ -9,9 +9,9 @@ Require-Bundle: com.google.gwt.osgi;bundle-version="2.7.0",
  com.sap.sse.common,
  com.sap.sse.filestorage
 Bundle-ActivationPolicy: lazy
-Import-Package: com.google.gwt.core.ext,
- com.google.gwt.core.ext.linker,
- com.google.gwt.core.ext.linker.impl,
+Import-Package: com.google.gwt.core.ext;resolution:=optional,
+ com.google.gwt.core.ext.linker;resolution:=optional,
+ com.google.gwt.core.ext.linker.impl;resolution:=optional,
  javax.servlet;version="2.6.0",
  javax.servlet.descriptor;version="2.6.0",
  javax.servlet.http;version="2.6.0",

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/SliderBar.java

@@ -730,9 +730,10 @@ public class SliderBar extends FocusPanel implements RequiresResize, HasValue<Do
      * @param minValue
      *            the current value for min
      * @param maxValue
-     *            the current valuefor max
+     *            the current value for max
+     * @return whether min or max have changed
      */
-    public void setMinAndMaxValue(Double minValue, Double maxValue, boolean fireEvent) {
+    public boolean setMinAndMaxValue(Double minValue, Double maxValue, boolean fireEvent) {
         boolean changed = false;
         if (!Util.equalsWithNull(minValue, this.minValue)) {
             this.minValue = minValue;
@@ -745,6 +746,7 @@ public class SliderBar extends FocusPanel implements RequiresResize, HasValue<Do
         if (changed) {
             onMinMaxValueChanged(fireEvent);
         }
+        return changed;
     }
     
     /**

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java

@@ -9,6 +9,7 @@ import com.google.gwt.dom.client.Style.Position;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.dom.client.Style.Visibility;
 import com.google.gwt.user.client.DOM;
+import com.sap.sse.common.Util;
 import com.sap.sse.gwt.client.controls.slider.TimeTicksCalculator.NormalizedInterval;
 import com.sap.sse.gwt.client.controls.slider.TimeTicksCalculator.TickPosition;
 
@@ -37,15 +38,13 @@ public class TimeSlider extends SliderBar {
     }
     
     private void calculateTicks() {
-        if (!isMinMaxInitialized())
-            return;
-
-        calculatedTimeTicks.clear();
-        
-        long minMaxDiffInMs = maxValue.longValue() - minValue.longValue();
-        long tickInterval = minMaxDiffInMs / TICKCOUNT; 
-        NormalizedInterval normalizedTimeTickInterval = calc.normalizeTimeTickInterval(tickInterval);
-        calculatedTimeTicks = calc.calculateTimeTicks(normalizedTimeTickInterval, minValue.longValue(), maxValue.longValue(), 1);
+        if (isMinMaxInitialized()) {
+            calculatedTimeTicks.clear();
+            long minMaxDiffInMs = maxValue.longValue() - minValue.longValue();
+            long tickInterval = minMaxDiffInMs / TICKCOUNT; 
+            NormalizedInterval normalizedTimeTickInterval = calc.normalizeTimeTickInterval(tickInterval);
+            calculatedTimeTicks = calc.calculateTimeTicks(normalizedTimeTickInterval, minValue.longValue(), maxValue.longValue(), 1);
+        }
     }
     
     /**
@@ -223,13 +222,18 @@ public class TimeSlider extends SliderBar {
     }
     
     @Override
-    public void setMinAndMaxValue(Double minValue, Double maxValue, boolean fireEvent) {
+    public boolean setMinAndMaxValue(Double minValue, Double maxValue, boolean fireEvent) {
+        final boolean result;
         if (!isZoomed) {
-            super.setMinAndMaxValue(minValue, maxValue, fireEvent);
+            result = super.setMinAndMaxValue(minValue, maxValue, fireEvent);
         } else {
+            boolean minChanged = !Util.equalsWithNull(this.minValue, minValue);
             this.minValue = minValue;
+            boolean maxChanged = !Util.equalsWithNull(this.maxValue, maxValue);
             this.maxValue = maxValue;
+            result = minChanged || maxChanged;
         }
+        return result;
     }
     
     @Override

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeModel.java

@@ -36,12 +36,21 @@ public class TimeRangeModel implements TimeRangeProvider {
     }
 
     public void setTimeRange(final Date fromTime, final Date toTime, TimeRangeChangeListener... listenersNotToNotify) {
-        this.fromTime = fromTime != null ? new Date(fromTime.getTime()) : null;
-        this.toTime = toTime != null ? new Date(toTime.getTime()) : null;
-
-        for (TimeRangeChangeListener listener : listeners) {
-            if (listenersNotToNotify == null || !Arrays.asList(listenersNotToNotify).contains(listener)) {
-                listener.onTimeRangeChanged(fromTime, toTime);
+        final boolean fromChanged = !Util.equalsWithNull(this.fromTime, fromTime);
+        final boolean toChanged = !Util.equalsWithNull(this.toTime, toTime);
+        if (fromChanged) {
+            // Note: java.util.Date is not immutable, therefore only a copy is really safe
+            this.fromTime = fromTime != null ? new Date(fromTime.getTime()) : null;
+        }
+        if (toChanged) {
+            // Note: java.util.Date is not immutable, therefore only a copy is really safe
+            this.toTime = toTime != null ? new Date(toTime.getTime()) : null;
+        }
+        if (fromChanged || toChanged) {
+            for (TimeRangeChangeListener listener : listeners) {
+                if (listenersNotToNotify == null || !Arrays.asList(listenersNotToNotify).contains(listener)) {
+                    listener.onTimeRangeChanged(fromTime, toTime);
+                }
             }
         }
     }

java/com.sap.sse.gwt/src/com/sap/sse/gwt/resources/LegacyResources.java

@@ -15,7 +15,7 @@ public interface LegacyResources extends ClientBundle {
 
     @Source("highcharts/js/highcharts.js")
     TextResource highcharts();
-
+    
     @Source("highcharts/js/themes/grid.js")
     TextResource highchartsThemeGrid();