Merge remote-tracking branch 'server/bug2840' into bug2840

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

@@ -23,6 +23,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.XAxis;
 import org.moxieapps.gwt.highcharts.client.events.ChartClickEvent;
 import org.moxieapps.gwt.highcharts.client.events.ChartClickEventHandler;
 import org.moxieapps.gwt.highcharts.client.events.ChartSelectionEvent;
@@ -1030,4 +1031,8 @@ public class EditMarkPositionPanel extends AbstractRaceChart implements Componen
             return null;
         }
     }
+    
+    public XAxis getXAxis() {
+        return chart.getXAxis();
+    }
 }

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

@@ -2,7 +2,10 @@ package com.sap.sailing.gwt.ui.client.shared.charts;
 
 import java.util.List;
 
+import org.moxieapps.gwt.highcharts.client.Color;
+import org.moxieapps.gwt.highcharts.client.PlotLine;
 import org.moxieapps.gwt.highcharts.client.Point;
+import org.moxieapps.gwt.highcharts.client.PlotLine.DashStyle;
 
 import com.google.gwt.core.client.Callback;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
@@ -38,6 +41,7 @@ public class FixPositionChooser {
     private MenuBar menu;
     private final EditMarkPositionPanel editMarkPositionPanel;
     private final StringMessages stringMessages;
+    private final PlotLine redTimeLine;
     
     /**
      * Use this constructor when there is already a fix with an overlay. 
@@ -81,6 +85,7 @@ public class FixPositionChooser {
         this.coordinateSystem = coordinateSystem;
         this.editMarkPositionPanel = editMarkPositionPanel;
         this.editMarkPositionPanel.showNotification(stringMessages.selectAFixPositionBy());
+        this.redTimeLine = editMarkPositionPanel.getXAxis().createPlotLine().setColor(new Color(255, 0, 0)).setWidth(1.5).setDashStyle(DashStyle.SOLID);
         setupUIOverlay(confirmButtonText);
     }
     
@@ -94,6 +99,8 @@ public class FixPositionChooser {
             fix = new GPSFixDTOWithSpeedWindTackAndLegType(editMarkPositionPanel.getTimepoint(), coordinateSystem.getPosition(startPos), null, new WindDTO(), null, null, false);
             this.moveOverlay = new FixOverlay(map, 0, fix, FixType.BUOY, "#f00", coordinateSystem, stringMessages.dragToChangePosition());
         }
+        redTimeLine.setValue(fix.timepoint.getTime());
+        editMarkPositionPanel.getXAxis().addPlotLines(redTimeLine);
         map.panTo(startPos);
         if (polylinePath != null && newFix) {
             polylinePath.insertAt(polylineFixIndex, map.getCenter());
@@ -138,6 +145,7 @@ public class FixPositionChooser {
     }
     
     private void cleanupChart() {
+        editMarkPositionPanel.getXAxis().removePlotLine(redTimeLine);
         editMarkPositionPanel.updateRedPoint(polylineFixIndex);
         editMarkPositionPanel.resetPointColor(polylineFixIndex);
         editMarkPositionPanel.redrawChart();

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

@@ -93,9 +93,9 @@ public class MarksPanel extends SimplePanel implements Component<AbstractSetting
             }
         };
         addFixColumn.setFieldUpdater(new FieldUpdater<MarkDTO, String>() {
-            final Date timePoint = parent.timer.getTime();
             @Override
             public void update(int index, final MarkDTO mark, String value) {
+                final Date timePoint = parent.timer.getTime();
                 if (parent.hasFixAtTimePoint(mark, timePoint)) {
                     parent.showNotification(stringMessages.pleaseSelectOtherTimepoint(), NotificationType.ERROR);
                 } else {