From 088e72acd03a4e8d3d15f0b2a5f8ff344fea0d12 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 23 Mar 2016 11:51:59 +0100
Subject: [PATCH] switched to GWT RPC implementation of MarkPositionService;
 made necessary types RPC serializable

Change-Id: I56faf1f43b7798f67c2cc6159e3f0f819f15201a
---
 .../shared/charts/EditMarkPositionPanel.java      |  3 ++-
 .../client/shared/charts/MarkPositionService.java | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
index 90b0894cc5b..01ac8b060d5 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
@@ -126,7 +126,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart implements Componen
     
     private FixPositionChooser currentFixPositionChooser;
     private List<OverlayClickHandler> overlayClickHandlers;
-    private final MarkPositionService markPositionService = new MarkPositionServiceMock();
+    private final MarkPositionService markPositionService;
     
     private final RaceIdentifierToLeaderboardRaceColumnAndFleetMapper raceIdentifierToLeaderboardRaceColumnAndFleetMapper;
 
@@ -135,6 +135,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart implements Componen
             SailingServiceAsync sailingService, Timer timer, TimeRangeWithZoomProvider timeRangeWithZoomProvider,
             AsyncActionsExecutor asyncActionsExecutor, ErrorReporter errorReporter) {
         super(sailingService, selectedRaceIdentifier, timer, timeRangeWithZoomProvider, stringMessages, asyncActionsExecutor, errorReporter);
+        this.markPositionService = new MarkPositionServiceForSailingService(sailingService);
         this.raceIdentifierToLeaderboardRaceColumnAndFleetMapper = new RaceIdentifierToLeaderboardRaceColumnAndFleetMapper();
         this.raceMap = raceMap;
         this.leaderboardPanel = leaderboardPanel;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MarkPositionService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MarkPositionService.java
index 80d54ca184e..517b66f7dac 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MarkPositionService.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MarkPositionService.java
@@ -1,16 +1,19 @@
 package com.sap.sailing.gwt.ui.client.shared.charts;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.rpc.IsSerializable;
 import com.sap.sailing.domain.common.Position;
 import com.sap.sailing.gwt.ui.client.shared.charts.RaceIdentifierToLeaderboardRaceColumnAndFleetMapper.LeaderboardNameRaceColumnNameAndFleetName;
 import com.sap.sailing.gwt.ui.shared.GPSFixDTO;
 import com.sap.sailing.gwt.ui.shared.MarkDTO;
 
 public interface MarkPositionService {
-    public static class MarkTrackDTO {
-        private final MarkDTO mark;
-        private final Iterable<GPSFixDTO> fixes;
-        private final boolean thinnedOut;
+    public static class MarkTrackDTO implements IsSerializable {
+        private MarkDTO mark;
+        private Iterable<GPSFixDTO> fixes;
+        private boolean thinnedOut;
+        
+        MarkTrackDTO() {} // for GWT serialization
         
         public MarkTrackDTO(MarkDTO mark, Iterable<GPSFixDTO> fixes, boolean thinnedOut) {
             this.mark = mark;
@@ -31,9 +34,11 @@ public interface MarkPositionService {
         }
     }
     
-    public static class MarkTracksDTO {
+    public static class MarkTracksDTO implements IsSerializable {
         private Iterable<MarkTrackDTO> tracks;
         
+        MarkTracksDTO() {} // for GWT serialization
+        
         public MarkTracksDTO(Iterable<MarkTrackDTO> tracks) {
             this.tracks = tracks;
         }