eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 06:18:12 +00:00
Code Activity

made mark color stuff null safe

Browse Source 
Change-Id: I6cbeec966e9ff09136d07311a119a5a1d1fbb1c6
This commit is contained in:
Axel Uhl committed 2017-04-11 22:08:21 +02:00
1 parent f6762d274d
commit 323a261f0e
3 files changed
+18 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MarkEditDialog.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class MarkEditDialog extends DataEntryDialog<MarkDTO> {
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);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
+5 -3
View File
@@ -528,7 +528,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart<AbstractSettings> 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<AbstractSettings> i
SortedMap<GPSFixDTO, FixOverlay> 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<AbstractSettings> 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);
java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java
+12
View File
@@ -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)");