From 323a261f0eaae30ff1e8844e4d446264c3ae1edd Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 11 Apr 2017 22:08:21 +0200 Subject: [PATCH] made mark color stuff null safe Change-Id: I6cbeec966e9ff09136d07311a119a5a1d1fbb1c6 --- .../sailing/gwt/ui/adminconsole/MarkEditDialog.java | 2 +- .../client/shared/charts/EditMarkPositionPanel.java | 8 +++++--- .../sap/sse/common/impl/test/AbstractColorTest.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MarkEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MarkEditDialog.java index ab2721a67c0..324019e621b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MarkEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MarkEditDialog.java @@ -56,7 +56,7 @@ public class MarkEditDialog extends DataEntryDialog { this.name = createTextBox(markToEdit.getName()); this.shape = createAndSelectListBox(Shape.values(), markToEdit.shape, true); this.type = createAndSelectListBox(MarkType.values(), markToEdit.type == null ? null : markToEdit.type.name(), false); - color[0] = createTextBox(markToEdit.color.getAsHtml()); + color[0] = createTextBox(markToEdit.color==null?null:markToEdit.color.getAsHtml()); this.color = color[0]; this.pattern = createAndSelectListBox(Pattern.values(), markToEdit.pattern, true); } 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 0028c7b8c08..a6ee71ac50a 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 @@ -528,7 +528,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart i public void resetPointColor(int index) { Point[] points = markSeries.getPoints(); if (points.length > index) { - points[index].setMarker(new Marker().setFillColor(selectedMark.color.getAsHtml())); + points[index].setMarker(new Marker().setFillColor(selectedMark.color==null?null:selectedMark.color.getAsHtml())); setSeriesPoints(markSeries, points); } } @@ -548,7 +548,8 @@ public class EditMarkPositionPanel extends AbstractRaceChart i SortedMap fixOverlayMap = marks.get(mark); for (final GPSFixDTO fix : track) { - final FixOverlay overlay = new FixOverlay(map, FIX_OVERLAY_Z_ORDER, fix, FixType.BUOY, mark.color.getAsHtml(), raceMap.getCoordinateSystem(), stringMessages.dragToChangePosition()); + final FixOverlay overlay = new FixOverlay(map, FIX_OVERLAY_Z_ORDER, fix, FixType.BUOY, + mark.color==null?null:mark.color.getAsHtml(), raceMap.getCoordinateSystem(), stringMessages.dragToChangePosition()); fixOverlayMap.put(fix, overlay); overlay.setVisible(false); overlayClickHandlers.add(new OverlayClickHandler(mark, fix, overlay).register()); @@ -609,7 +610,8 @@ public class EditMarkPositionPanel extends AbstractRaceChart i @Override public void onSuccess(Void result) { - FixOverlay overlay = new FixOverlay(map, FIX_OVERLAY_Z_ORDER, fix, FixType.BUOY, mark.color.getAsHtml(), + FixOverlay overlay = new FixOverlay(map, FIX_OVERLAY_Z_ORDER, fix, FixType.BUOY, + mark.color==null?null:mark.color.getAsHtml(), raceMap.getCoordinateSystem(), stringMessages.dragToChangePosition()); overlayClickHandlers.add(new OverlayClickHandler(mark, fix, overlay).register()); marks.get(mark).put(fix, overlay); diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java index 98a905f5120..c6ac1cd4e1d 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java @@ -15,6 +15,18 @@ import junit.framework.Assert; public class AbstractColorTest { + @Test + public void testShortRGBColor() { + Color color = AbstractColor.getCssColor("#00"); + Assert.assertEquals("#000000", color.getAsHtml()); + color = AbstractColor.getCssColor("#00F"); + Assert.assertEquals("#00F000", color.getAsHtml()); + color = AbstractColor.getCssColor("00"); + Assert.assertEquals("#000000", color.getAsHtml()); + color = AbstractColor.getCssColor("00F"); + Assert.assertEquals("#00F000", color.getAsHtml()); + } + @Test public void testRGBColor() throws Exception { Color color = AbstractColor.getCssColor("rgb(255,255,255)");