From 798587858f1db6ef4e2e9b42ff745d08039d89cb Mon Sep 17 00:00:00 2001
From: Vladislav Chumak <v.chumak@sap.com>
Date: Tue, 27 Mar 2018 20:59:08 +0200
Subject: [PATCH] Removed maneuver duration from RaceMap pop-up

---
 .../sailing/gwt/ui/client/shared/racemap/RaceMap.java |  3 ---
 .../sap/sailing/gwt/ui/server/SailingServiceImpl.java |  2 +-
 .../com/sap/sailing/gwt/ui/shared/ManeuverDTO.java    | 11 ++---------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
index 52bf53f2b54..6f9a0bfa0e7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
@@ -2194,9 +2194,6 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
             vPanel.add(createInfoWindowLabelAndValue(stringMessages.lowestSpeed(),
                     NumberFormat.getDecimalFormat().format(maneuver.lowestSpeedInKnots) + " "
                             + stringMessages.knotsUnit()));
-            vPanel.add(createInfoWindowLabelAndValue(stringMessages.durationPlain(),
-                    NumberFormat.getDecimalFormat().format(maneuver.maneuverDurationInSeconds) + " "
-                            + stringMessages.secondsUnit()));
         }
         if (maneuver.maneuverLossInMeters != null) {
             vPanel.add(createInfoWindowLabelAndValue(stringMessages.maneuverLoss(),
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index 5f59500facb..a675395d470 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -3424,7 +3424,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
                     maneuver.getMaxTurningRateInDegreesPerSecond(), maneuver.getAvgTurningRateInDegreesPerSecond(),
                     maneuver.getLowestSpeed().getKnots(),
                     maneuver.isMarkPassing() ? maneuver.getMarkPassing().getTimePoint().asDate() : null,
-                    maneuver.isMarkPassing() ? maneuver.getToSide() : null, maneuver.getDuration().asSeconds());
+                    maneuver.isMarkPassing() ? maneuver.getToSide() : null);
             result.add(maneuverDTO);
         }
         return result;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ManeuverDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ManeuverDTO.java
index 5c03fef739e..e6887dec42a 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ManeuverDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ManeuverDTO.java
@@ -39,8 +39,6 @@ public class ManeuverDTO implements IsSerializable {
 
     public NauticalSide markPassingSide;
 
-    public double maneuverDurationInSeconds;
-
     public ManeuverDTO() {
     }
 
@@ -48,7 +46,7 @@ public class ManeuverDTO implements IsSerializable {
             SpeedWithBearingDTO speedWithBearingBefore, SpeedWithBearingDTO speedWithBearingAfter,
             double directionChangeInDegrees, Double maneuverLossInMeters, double maxTurningRateInDegreesPerSecond,
             double avgTurningRateInDegreesPerSecond, double lowestSpeedInKnots, Date markPassingTimePoint,
-            NauticalSide markPassingSide, double maneuverDurationInSeconds) {
+            NauticalSide markPassingSide) {
         super();
         this.type = type;
         this.newTack = newTack;
@@ -63,7 +61,6 @@ public class ManeuverDTO implements IsSerializable {
         this.lowestSpeedInKnots = lowestSpeedInKnots;
         this.markPassingTimePoint = markPassingTimePoint;
         this.markPassingSide = markPassingSide;
-        this.maneuverDurationInSeconds = maneuverDurationInSeconds;
     }
 
     public String toString(StringMessages stringMessages) {
@@ -89,9 +86,6 @@ public class ManeuverDTO implements IsSerializable {
                 + stringMessages.degreesPerSecondUnit();
         String lowestSpeed = stringMessages.lowestSpeed() + ": "
                 + NumberFormat.getDecimalFormat().format(this.lowestSpeedInKnots) + " " + stringMessages.knotsUnit();
-        String maneuverDuration = stringMessages.durationPlain() + ": "
-                + NumberFormat.getDecimalFormat().format(this.maneuverDurationInSeconds) + " "
-                + stringMessages.secondsUnit();
         String maneuverLoss = this.maneuverLossInMeters == null ? ""
                 : ("; " + stringMessages.maneuverLoss() + ": "
                         + NumberFormat.getDecimalFormat().format(this.maneuverLossInMeters) + " "
@@ -103,8 +97,7 @@ public class ManeuverDTO implements IsSerializable {
                                         : stringMessages.starboardSide(),
                         DateTimeFormat.getFormat(PredefinedFormat.TIME_FULL).format(this.markPassingTimePoint));
         String maneuverTitle = timeAndManeuver + "; " + directionChange + "; " + speedChange + "; " + maxTurningRate
-                + "; " + avgTurningRate + "; " + lowestSpeed + "; " + maneuverDuration + "; " + maneuverLoss + "; "
-                + markPassing;
+                + "; " + avgTurningRate + "; " + lowestSpeed + maneuverLoss + markPassing;
         return maneuverTitle;
     }
 }