Merge branch 'master' into bug1407-new

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/StartProcedureType.java

@@ -2,7 +2,7 @@ package com.sap.sailing.domain.common.racelog;
 
 public enum StartProcedureType {
     //RRS26("Fix Line Start (RRS26)"),
-    //GateStart("Gate Start"),
+    GateStart("Gate Start"),
     ESS("\"Extreme Sailing Series\"-Start");
     
     private String displayName;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractChartPanel.java

@@ -18,6 +18,7 @@ import org.moxieapps.gwt.highcharts.client.Series;
 import org.moxieapps.gwt.highcharts.client.ToolTip;
 import org.moxieapps.gwt.highcharts.client.ToolTipData;
 import org.moxieapps.gwt.highcharts.client.ToolTipFormatter;
+import org.moxieapps.gwt.highcharts.client.PlotLine.DashStyle;
 import org.moxieapps.gwt.highcharts.client.events.ChartClickEvent;
 import org.moxieapps.gwt.highcharts.client.events.ChartClickEventHandler;
 import org.moxieapps.gwt.highcharts.client.events.ChartSelectionEvent;
@@ -179,6 +180,7 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
                 return dateFormatHoursMinutes.format(new Date(axisLabelsData.getValueAsLong()));
             }
         }));
+        timePlotLine = chart.getXAxis().createPlotLine().setColor("#656565").setWidth(1.5).setDashStyle(DashStyle.SOLID);
 
         if (compactChart) {
             chart.setSpacingBottom(10).setSpacingLeft(10).setSpacingRight(10).setSpacingTop(2)
@@ -596,6 +598,10 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
             return;
         }
 
+        if (allowTimeAdjust) {
+            updateTimePlotLine(date);
+        }
+        
         switch (timer.getPlayMode()) {
         case Live: {
             // is date before first cache entry or is cache empty?
@@ -624,6 +630,12 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
         }
     }
 
+    private void updateTimePlotLine(Date date) {
+        chart.getXAxis().removePlotLine(timePlotLine);
+        timePlotLine.setValue(date.getTime());
+        chart.getXAxis().addPlotLines(timePlotLine);
+    }
+
     @Override
     public void onResize() {
         chart.setSizeToMatchContainer();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/RaceChart.java

@@ -3,6 +3,7 @@ package com.sap.sailing.gwt.ui.client.shared.charts;
 import java.util.Date;
 
 import org.moxieapps.gwt.highcharts.client.Chart;
+import org.moxieapps.gwt.highcharts.client.PlotLine;
 import org.moxieapps.gwt.highcharts.client.Point;
 import org.moxieapps.gwt.highcharts.client.Series;
 import org.moxieapps.gwt.highcharts.client.XAxis;
@@ -28,6 +29,7 @@ import com.sap.sailing.gwt.ui.client.Timer.PlayModes;
 public abstract class RaceChart extends SimplePanel implements RaceSelectionChangeListener,
     TimeListener, TimeZoomChangeListener, TimeRangeChangeListener {
     protected Chart chart;
+    protected PlotLine timePlotLine;
 
     protected final Timer timer;
     protected final TimeRangeWithZoomProvider timeRangeWithZoomProvider; 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java

@@ -20,6 +20,7 @@ import org.moxieapps.gwt.highcharts.client.Series;
 import org.moxieapps.gwt.highcharts.client.ToolTip;
 import org.moxieapps.gwt.highcharts.client.ToolTipData;
 import org.moxieapps.gwt.highcharts.client.ToolTipFormatter;
+import org.moxieapps.gwt.highcharts.client.PlotLine.DashStyle;
 import org.moxieapps.gwt.highcharts.client.events.ChartClickEvent;
 import org.moxieapps.gwt.highcharts.client.events.ChartClickEventHandler;
 import org.moxieapps.gwt.highcharts.client.events.ChartSelectionEvent;
@@ -162,6 +163,7 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
                 return dateFormatHoursMinutes.format(new Date(axisLabelsData.getValueAsLong()));
             }
         }));
+        timePlotLine = chart.getXAxis().createPlotLine().setColor("#656565").setWidth(1.5).setDashStyle(DashStyle.SOLID);
 
         chart.getYAxis(0).setAxisTitleText(stringMessages.fromDeg()).setStartOnTick(false).setShowFirstLabel(false)
                 .setLabels(new YAxisLabels().setFormatter(new AxisLabelsFormatter() {
@@ -245,6 +247,7 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
                 }
             }
         }
+        
         chart.redraw();
     }
 
@@ -504,6 +507,8 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
         if(!isVisible()) {
             return;
         }
+
+        updateTimePlotLine(date);
         
         switch(timer.getPlayMode()) {
             case Live:
@@ -535,6 +540,12 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
         }
      }
 
+    private void updateTimePlotLine(Date date) {
+        chart.getXAxis().removePlotLine(timePlotLine);
+        timePlotLine.setValue(date.getTime());
+        chart.getXAxis().addPlotLines(timePlotLine);
+    }
+
     @Override
     public void onResize() {
         chart.setSizeToMatchContainer();

java/target/start

@@ -1,10 +1,10 @@
-#!/bin/sh
-
-# source variables
-. `pwd`/env.sh
-
-scriptdir=`dirname "$0"`
-LIB_DIR=`pwd`/native-libraries
-echo Script directory is $scriptdir and LIB_DIR is $LIB_DIR
-nohup "$JAVA_HOME/bin/java" -XX:+UseMembar -D$SERVER_NAME -Dcom.sap.sailing.server.name=$SERVER_NAME -Djava.io.tmpdir=`pwd`/tmp -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console $TELNET_PORT -configuration ./ -clean 2>/dev/null >/dev/null &
-echo "Started $SERVER_NAME on port $TELNET_PORT - use telnet localhost $TELNET_PORT to connect to the OSGi console"
+#!/bin/sh
+
+# source variables
+. `pwd`/env.sh
+
+scriptdir=`dirname "$0"`
+LIB_DIR=`pwd`/native-libraries
+echo Script directory is $scriptdir and LIB_DIR is $LIB_DIR
+nohup "$JAVA_HOME/bin/java" -XX:+UseMembar -D$SERVER_NAME -Dcom.sap.sailing.server.name=$SERVER_NAME -Djava.io.tmpdir=`pwd`/tmp -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console $TELNET_PORT -configuration ./ -clean 2>/dev/null >/dev/null &
+echo "Started $SERVER_NAME on port $TELNET_PORT - use telnet localhost $TELNET_PORT to connect to the OSGi console"