during regatta structure import use null as Fleet color instead of BLACK

Change-Id: I098caf21942be0452054d152d84f3f844a755e19
This commit is contained in:
Axel Uhl committed 2016-04-27 16:17:59 +02:00
1 parent 5ce44a3f11
commit 4db1aef55a
1 file changed
+2 -4
@@ -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;
}