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

Bug5085: fix wrong order of left and right markconfiguration

Browse Source
This commit is contained in:
Thomas Wiese committed 2019-10-14 11:34:07 +02:00
1 parent 92b359e533
commit ca8cae4aaf
3 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/MarkPairWithConfigurationImpl.java
+2 -2
View File
@@ -12,11 +12,11 @@ public class MarkPairWithConfigurationImpl extends NamedImpl implements MarkPair
private final String shortName;
public MarkPairWithConfigurationImpl(String name, MarkConfiguration right, MarkConfiguration left,
public MarkPairWithConfigurationImpl(String name, MarkConfiguration left, MarkConfiguration right,
String shortName) {
super(name);
this.right = right;
this.left = left;
this.right = right;
this.shortName = shortName;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java
+1 -1
View File
@@ -205,7 +205,7 @@ public class CourseConfigurationBuilder {
throw new IllegalArgumentException();
}
final MarkPairWithConfiguration markPair = markPairCache
.computeIfAbsent(new MarkPairWithConfigurationImpl(name, rightMark, leftMark, shortNameForMarkPair), mp -> mp);
.computeIfAbsent(new MarkPairWithConfigurationImpl(name, leftMark, rightMark, shortNameForMarkPair), mp -> mp);
waypoints.add(new WaypointWithMarkConfigurationImpl(markPair, passingInstruction));
}
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/CourseAndMarkConfigurationFactoryImpl.java
+2 -2
View File
@@ -529,7 +529,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi
final MarkPairTemplate markPairTemplate = (MarkPairTemplate) controlPointTemplate;
final MarkConfiguration left = markTemplatesToMarkConfigurations.get(markPairTemplate.getLeft());
final MarkConfiguration right = markTemplatesToMarkConfigurations.get(markPairTemplate.getRight());
resultingControlPoint = new MarkPairWithConfigurationImpl(markPairTemplate.getName(), right, left,
resultingControlPoint = new MarkPairWithConfigurationImpl(markPairTemplate.getName(), left, right,
markPairTemplate.getShortName());
}
resultingWaypoints.add(new WaypointWithMarkConfigurationImpl(resultingControlPoint,
@@ -667,7 +667,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi
.get(markPairTemplate.getLeft());
final MarkConfiguration right = regattaMarkConfigurations.regattaConfigurationsByMark
.get(markPairTemplate.getRight());
resultingControlPoint = new MarkPairWithConfigurationImpl(markPairTemplate.getName(), right, left,
resultingControlPoint = new MarkPairWithConfigurationImpl(markPairTemplate.getName(), left, right,
markPairTemplate.getShortName());
}
resultingWaypoints.add(new WaypointWithMarkConfigurationImpl(resultingControlPoint,