From 4db1aef55a0c4a02c8118d59d411a01bcbc2a582 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 27 Apr 2016 16:17:59 +0200 Subject: [PATCH] during regatta structure import use null as Fleet color instead of BLACK Change-Id: I098caf21942be0452054d152d84f3f844a755e19 --- .../sap/sailing/xrr/structureimport/StructureImporter.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java index f132381a169..486b9a5b82f 100755 --- a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java +++ b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java @@ -31,6 +31,7 @@ import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.SeriesImpl; import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.FleetColors; +import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.ranking.OneDesignRankingMetric; import com.sap.sailing.xrr.resultimport.ParserFactory; @@ -161,7 +162,7 @@ public class StructureImporter { GuessFleetOrderingStrategy fleetOrderingStrategy = new GuessFleetOrderingFromFleetName(); String fleetColor = ""; if (fleets.size() <= 1) { - fleetColor = "Default"; + fleetColor = LeaderboardNameConstants.DEFAULT_FLEET_NAME; FleetImpl fleetImpl = new FleetImpl(fleetColor, 0, getColorFromString(fleetColor)); fleetsImpl.add(fleetImpl); } else { @@ -185,9 +186,6 @@ public class StructureImporter { if (result == null) { result = AbstractColor.getColorByLowercaseNameStatic(colorString.toLowerCase()); } - if (result == null) { - result = Color.BLACK; - } return result; }