From ce1675155e685705fdb15e1fb5180ed3205401bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 21 Jun 2018 15:16:40 +0200 Subject: [PATCH] bug4632 fixed a wrong mapping for some bravo values, that were displayed, when they should not have been --- .../com/sap/sailing/domain/common/DetailType.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java index 5c727f3a542..fd076c7e87f 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java @@ -310,13 +310,6 @@ public enum DetailType implements Serializable { return allowed; } - public static List getLegExtendedBravoDetailTypes() { - ArrayList allowed = new ArrayList<>(); - allowed.add(DetailType.BRAVOEXTENDED_LEG_CURRENT_DISTANCE_FOILED_IN_METERS); - allowed.add(DetailType.BRAVOEXTENDED_LEG_CURRENT_DURATION_FOILED_IN_SECONDS); - return allowed; - } - public static List getRaceExtendedBravoDetailTypes() { ArrayList allowed = new ArrayList<>(); allowed.add(DetailType.BRAVOEXTENDED_RACE_CURRENT_PORT_DAGGERBOARD_RAKE); @@ -345,6 +338,8 @@ public enum DetailType implements Serializable { allowed.add(DetailType.BRAVO_RACE_HEEL_IN_DEGREES); allowed.add(DetailType.BRAVO_RACE_PITCH_IN_DEGREES); allowed.add(DetailType.BRAVO_RACE_CURRENT_RIDE_HEIGHT_IN_METERS); + allowed.add(DetailType.RACE_CURRENT_DISTANCE_FOILED_IN_METERS); + allowed.add(DetailType.RACE_CURRENT_DURATION_FOILED_IN_SECONDS); return allowed; } @@ -353,6 +348,8 @@ public enum DetailType implements Serializable { allowed.add(DetailType.BRAVO_LEG_CURRENT_HEEL_IN_DEGREES); allowed.add(DetailType.BRAVO_LEG_CURRENT_PITCH_IN_DEGREES); allowed.add(DetailType.BRAVO_LEG_CURRENT_RIDE_HEIGHT_IN_METERS); + allowed.add(DetailType.BRAVOEXTENDED_LEG_CURRENT_DISTANCE_FOILED_IN_METERS); + allowed.add(DetailType.BRAVOEXTENDED_LEG_CURRENT_DURATION_FOILED_IN_SECONDS); return allowed; } @@ -474,7 +471,6 @@ public enum DetailType implements Serializable { ArrayList all = new ArrayList<>(); all.addAll(getLegDetailColumnTypes()); all.addAll(getLegBravoDetailTypes()); - all.addAll(getLegExtendedBravoDetailTypes()); all.addAll(getLegExpeditionDetailColumnTypes()); return all; }