eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-20 19:20:04 +00:00
Code Activity

bug3552: refactored Mark.color from String to Color

Browse Source 
Change-Id: Iddcc26de68dd5c1ecd3fdcbb61e59810e879ae37
This commit is contained in:
Axel Uhl committed 2017-04-11 11:20:46 +02:00
1 parent 8f201503fb
commit b11dca244e
36 files changed
+148 -122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/coursedata/impl/MarkDeserializer.java
+4 -1
View File
@@ -11,6 +11,8 @@ import com.sap.sailing.server.gateway.deserialization.JsonDeserializationExcepti
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.coursedata.impl.MarkJsonSerializer;
import com.sap.sse.common.Color;
import com.sap.sse.common.impl.AbstractColor;
/**
* Deserializer for marks.
@@ -26,7 +28,8 @@ public class MarkDeserializer implements JsonDeserializer<Mark> {
@Override
public Mark deserialize(JSONObject object) throws JsonDeserializationException {
Serializable id = Helpers.tryUuidConversion((Serializable) object.get(MarkJsonSerializer.FIELD_ID));
String color = (String) object.get(MarkJsonSerializer.FIELD_COLOR);
String colorAsString = (String) object.get(MarkJsonSerializer.FIELD_COLOR);
Color color = colorAsString == null ? null : AbstractColor.getCssColor(colorAsString);
String pattern = (String) object.get(MarkJsonSerializer.FIELD_PATTERN);
String shape = (String) object.get(MarkJsonSerializer.FIELD_SHAPE);
MarkType type = MarkType.valueOf((String) object.get(MarkJsonSerializer.FIELD_TYPE));
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/MarkJsonSerializer.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class MarkJsonSerializer extends BaseControlPointJsonSerializer implement
result.put(FIELD_ID, mark.getId().toString());
if (mark.getColor() != null) {
result.put(FIELD_COLOR, mark.getColor());
result.put(FIELD_COLOR, mark.getColor().getAsHtml());
}
if (mark.getPattern() != null) {
result.put(FIELD_PATTERN, mark.getPattern());