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

Merge branch 'master' of ssh://sapsailing.com/home/trac/git

Browse Source
This commit is contained in:
Alessandro Stoltenberg committed 2018-05-09 09:54:13 +02:00
2 parents 57dc99c336 28759e27e7
commit e579a3979f
3 files changed
+50 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+29 -13
View File
@@ -1541,8 +1541,10 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
} else if (eventClass.equals(RaceLogPassChangeEvent.class.getSimpleName())) {
resultEvent = loadRaceLogPassChangeEvent(createdAt, author, logicalTimePoint, id, passId, competitors);
} else if (eventClass.equals(RaceLogCourseDesignChangedEvent.class.getSimpleName())) {
resultEvent = loadRaceLogCourseDesignChangedEvent(createdAt, author, logicalTimePoint, id, passId, competitors,
dbObject);
final Pair<RaceLogCourseDesignChangedEvent, Optional<DBObject>> resultPair = loadRaceLogCourseDesignChangedEvent(
createdAt, author, logicalTimePoint, id, passId, competitors, dbObject);
resultEvent = resultPair.getA();
dbObjectForUpdate = resultPair.getB();
} else if (eventClass.equals(RaceLogFinishPositioningListChangedEvent.class.getSimpleName())) {
resultEvent = loadRaceLogFinishPositioningListChangedEvent(createdAt, author, logicalTimePoint, id, passId,
competitors, dbObject);
@@ -1815,17 +1817,21 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
return new RaceLogPassChangeEventImpl(createdAt, logicalTimePoint, author, id, passId);
}
private RaceLogCourseDesignChangedEvent loadRaceLogCourseDesignChangedEvent(TimePoint createdAt,
/**
* @return the second pair component has a DBObject in case migration was performed and the updated race log event's
* DBObject representation shall be updated to the DB
*/
private Pair<RaceLogCourseDesignChangedEvent, Optional<DBObject>> loadRaceLogCourseDesignChangedEvent(TimePoint createdAt,
AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable id, Integer passId,
List<Competitor> competitors, DBObject dbObject) {
String courseName = (String) dbObject.get(FieldNames.RACE_LOG_COURSE_DESIGN_NAME.name());
CourseBase courseData = loadCourseData((BasicDBList) dbObject.get(FieldNames.RACE_LOG_COURSE_DESIGN.name()),
Pair<CourseBase, Boolean> courseData = loadCourseData((BasicDBList) dbObject.get(FieldNames.RACE_LOG_COURSE_DESIGN.name()),
courseName);
final String courseDesignerModeName = (String) dbObject.get(FieldNames.RACE_LOG_COURSE_DESIGNER_MODE.name());
final CourseDesignerMode courseDesignerMode = courseDesignerModeName == null ? null
: CourseDesignerMode.valueOf(courseDesignerModeName);
return new RaceLogCourseDesignChangedEventImpl(createdAt, logicalTimePoint, author, id, passId, courseData,
courseDesignerMode);
return new Pair<>(new RaceLogCourseDesignChangedEventImpl(createdAt, logicalTimePoint, author, id, passId, courseData.getA(),
courseDesignerMode), courseData.getB() ? /* migrated */ Optional.of(dbObject) : Optional.empty());
}
private RaceLogEvent loadRaceLogFixedMarkPassingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint,
@@ -2313,9 +2319,12 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
* field is loaded, the value of PASSINGSIDE is used and then migrated to PASSINGINSTRUCTION. If the first or last
* Waypoint has the PassingInstructions Gate, it is transfered to Line.
*
* @return the second component tells if migration was performed; in this case the {@code dbCourseList} passed has
* been edited "in place" to describe the migration that has happened
*/
@SuppressWarnings("deprecation") // Used to migrate from PASSINGSIDE to the new PASSINGINSTRUCTIONS
private CourseBase loadCourseData(BasicDBList dbCourseList, String courseName) {
private Pair<CourseBase, Boolean> loadCourseData(BasicDBList dbCourseList, String courseName) {
boolean migrated = false;
if (courseName == null) {
courseName = "Course";
}
@@ -2338,25 +2347,31 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
}
dbObject.put(FieldNames.WAYPOINT_PASSINGINSTRUCTIONS.name(), waypointPassingInstruction);
dbObject.removeField(FieldNames.WAYPOINT_PASSINGSIDE.name());
migrated = true;
}
}
if (waypointPassingInstruction != null) {
passingInstructions = PassingInstruction.valueOfIgnoringCase(waypointPassingInstruction);
}
ControlPoint controlPoint = loadControlPoint((DBObject) dbObject.get(FieldNames.CONTROLPOINT.name()));
Pair<ControlPoint, Boolean> controlPoint = loadControlPoint((DBObject) dbObject.get(FieldNames.CONTROLPOINT.name()));
migrated = migrated || controlPoint.getB();
if (passingInstructions == null) {
waypoint = new WaypointImpl(controlPoint);
waypoint = new WaypointImpl(controlPoint.getA());
} else {
waypoint = new WaypointImpl(controlPoint, passingInstructions);
waypoint = new WaypointImpl(controlPoint.getA(), passingInstructions);
}
courseData.addWaypoint(i++, waypoint);
}
return courseData;
return new Pair<>(courseData, migrated);
}
private ControlPoint loadControlPoint(DBObject dbObject) {
/**
* @return second component tells whether migration was performed on {@code dbObject} in place
*/
private Pair<ControlPoint, Boolean> loadControlPoint(DBObject dbObject) {
String controlPointClass = (String) dbObject.get(FieldNames.CONTROLPOINT_CLASS.name());
ControlPoint controlPoint = null;
boolean migrated = false;
if (controlPointClass != null) {
if (controlPointClass.equals(Mark.class.getSimpleName())) {
Mark mark = loadMark((DBObject) dbObject.get(FieldNames.CONTROLPOINT_VALUE.name()));
@@ -2366,13 +2381,14 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
(DBObject) dbObject.get(FieldNames.CONTROLPOINT_VALUE.name()));
dbObject.put(FieldNames.CONTROLPOINT_CLASS.name(), ControlPointWithTwoMarks.class.getSimpleName());
controlPoint = cpwtm;
migrated = true;
} else if (controlPointClass.equals(ControlPointWithTwoMarks.class.getSimpleName())) {
ControlPointWithTwoMarks cpwtm = loadControlPointWithTwoMarks(
(DBObject) dbObject.get(FieldNames.CONTROLPOINT_VALUE.name()));
controlPoint = cpwtm;
}
}
return controlPoint;
return new Pair<>(controlPoint, migrated);
}
/**
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
+20 -23
View File
@@ -656,44 +656,41 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
@Override
public void fillLeaderboards(Iterable<StrippedLeaderboardDTO> leaderboards) {
availableLeaderboards.clear();
leaderboardsProvider.getList().clear();
if (leaderboards != null) {
Util.addAll(leaderboards, availableLeaderboards);
}
leaderboardsFilterablePanel.updateAll(availableLeaderboards);
final LeaderboardGroupDTO selectedGroup = getSelectedGroup();
if(selectedGroup != null) {
leaderboardsProvider.getList().addAll(availableLeaderboards);
leaderboardsProvider.getList().removeAll(selectedGroup.leaderboards);
leaderboardsFilterablePanel.updateAll(leaderboardsProvider.getList());
refreshableLeaderboardsSelectionModel.clear();
final Set<StrippedLeaderboardDTO> selectedLeaderboards = refreshableLeaderboardsSelectionModel.getSelectedSet();
for (StrippedLeaderboardDTO leaderboard : selectedLeaderboards) {
refreshableLeaderboardsSelectionModel.setSelected(leaderboard, true);
}
}
}
/**
* If no leaderboard group is selected or more than one is selected, this method is a no-op because the
* leaderboard list displayed is defined to the be list of all leaderboards available, excluding those
* leaderboards that are already assigned to <em>the</em> selected leaderboard group. In other words,
* the leaderboard list is only well-defined in case a single leaderboard group is selected.
* If no leaderboard group is selected or more than one is selected, this method is a no-op because the leaderboard
* list displayed is defined to the be list of all leaderboards available, excluding those leaderboards that are
* already assigned to <em>the</em> selected leaderboard group. In other words, the leaderboard list is only
* well-defined in case a single leaderboard group is selected.
*/
private void refreshLeaderboardsList() {
final LeaderboardGroupDTO selectedGroup = getSelectedGroup();
final Set<StrippedLeaderboardDTO> selectedLeaderboards = refreshableLeaderboardsSelectionModel.getSelectedSet();
if (isSingleGroupSelected && selectedGroup != null) {
if (isSingleGroupSelected && getSelectedGroup() != null) {
sailingService.getLeaderboards(new MarkedAsyncCallback<List<StrippedLeaderboardDTO>>(
new AsyncCallback<List<StrippedLeaderboardDTO>>() {
@Override
public void onFailure(Throwable t) {
errorReporter.reportError("Error trying to obtain list of leaderboards: " + t.getMessage());
}
@Override
public void onSuccess(List<StrippedLeaderboardDTO> leaderboards) {
availableLeaderboards.clear();
if (leaderboards != null) {
availableLeaderboards.addAll(leaderboards);
}
leaderboardsProvider.getList().clear();
leaderboardsProvider.getList().addAll(availableLeaderboards);
leaderboardsProvider.getList().removeAll(selectedGroup.leaderboards);
leaderboardsFilterablePanel.getTextBox().setText("");
leaderboardsFilterablePanel.updateAll(availableLeaderboards);
refreshableLeaderboardsSelectionModel.clear();
for (StrippedLeaderboardDTO leaderboard : selectedLeaderboards) {
refreshableLeaderboardsSelectionModel.setSelected(leaderboard, true);
}
fillLeaderboards(leaderboards);
}
}));
}
@@ -903,7 +900,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
}
updateGroup(selectedGroup);
//Refilters the leaderboards list (hides the moved leaderboards if they don't fit to the filter) and resorts the list
leaderboardsFilterablePanel.updateAll(availableLeaderboards);
leaderboardsFilterablePanel.updateAll(leaderboardsProvider.getList());
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
+1 -1
View File
@@ -529,7 +529,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart<AbstractSettings> i
public void resetPointColor(int index) {
Point[] points = markSeries.getPoints();
if (points.length > index) {
if (points.length > index && selectedMark != null) {
points[index].setMarker(new Marker().setFillColor(selectedMark.color==null?null:selectedMark.color.getAsHtml()));
setSeriesPoints(markSeries, points, /* manageZoom */ true);
}