eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-21 03:30:12 +00:00
Code Activity

use IControlPoint.getId() for marks where defined

Browse Source 
Change-Id: I3b3a7416d1dee0f6b0a25aa49bf7d1346810fbce
This commit is contained in:
Axel Uhl committed 2017-04-06 18:30:00 +02:00
1 parent 60cf89aefe
commit 545ba2d0f5
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.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracControlPoint.java
+4
View File
@@ -25,4 +25,8 @@ public interface TracTracControlPoint extends NamedWithID {
String getShortName();
boolean getHasTwoPoints();
UUID getFirstMarkId();
UUID getSecondMarkId();
}
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ControlPointAdapter.java
+10
View File
@@ -49,4 +49,14 @@ public class ControlPointAdapter extends AbstractWithID implements TracTracContr
public boolean getHasTwoPoints() {
return controlPoint.isMultiple();
}
@Override
public UUID getFirstMarkId() {
return controlPoint.getControlPoints().get(0).getId();
}
@Override
public UUID getSecondMarkId() {
return controlPoint.getControlPoints().get(0).getId();
}
}
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MetadataParserImpl.java
+4 -4
View File
@@ -144,8 +144,8 @@ public class MetadataParserImpl implements MetadataParser {
String shape2 = controlPointMetadata.get("P2.Shape");
String pattern1 = controlPointMetadata.get("P1.Pattern");
String pattern2 = controlPointMetadata.get("P2.Pattern");
String mark1UUID = controlPointMetadata.get("P1.UUID");
String mark2UUID = controlPointMetadata.get("P2.UUID");
UUID mark1UUID = controlPoint.getFirstMarkId();
UUID mark2UUID = controlPoint.getSecondMarkId();
String name1 = controlPointMetadata.get("P1.Name");
if (name1 == null) {
name1 = controlPointName + " (1)";
@@ -154,9 +154,9 @@ public class MetadataParserImpl implements MetadataParser {
if (name2 == null) {
name2 = controlPointName + " (2)";
}
final Serializable id1 = mark1UUID == null ? controlPoint.getId().toString()+" (1)" : UUID.fromString(mark1UUID);
final Serializable id1 = mark1UUID == null ? controlPoint.getId().toString()+" (1)" : mark1UUID;
ControlPointMetaData mark1Metadata = new ControlPointMetaDataImpl(name1, type1, color1, shape1, pattern1, id1);
final Serializable id2 = mark2UUID == null ? controlPoint.getId().toString()+" (2)" : UUID.fromString(mark2UUID);
final Serializable id2 = mark2UUID == null ? controlPoint.getId().toString()+" (2)" : mark2UUID;
ControlPointMetaData mark2Metadata = new ControlPointMetaDataImpl(name2, type2, color2, shape2, pattern2, id2);
result = Arrays.asList(new ControlPointMetaData[] { mark1Metadata, mark2Metadata });
} else {