mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-22 20:13:52 +00:00
Merge branch 'master' into translation
Conflicts: java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties Change-Id: I473b1d08739e18a794cfe8b72f7b2f813f3e8078
This commit is contained in:
commit
d16e46d02f
59 files changed
+921
-223
No files matched your search
@@ -12,6 +12,8 @@
|
||||
<booleanAttribute key="default_auto_start" value="true"/>
|
||||
<intAttribute key="default_start_level" value="4"/>
|
||||
<booleanAttribute key="includeOptional" value="true"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathContainer path=&quot;com.google.gwt.eclipse.core.GWT_CONTAINER&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
|
||||
|
||||
+6
@@ -1630,6 +1630,12 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
|
||||
// see raceTimesChanged(TimePoint, TimePoint, TimePoint).
|
||||
}
|
||||
|
||||
@Override
|
||||
public void finishedTimeChanged(TimePoint oldFinishedTime, TimePoint newFinishedTime) {
|
||||
// no action required; the update signaled by this call is implicit; the race log
|
||||
// updates that led to this change are replicated separately
|
||||
}
|
||||
|
||||
@Override
|
||||
public void waypointAdded(int zeroBasedIndex, Waypoint waypointThatGotAdded) {
|
||||
// no-op; the course change is replicated by the separate CourseChangeReplicator
|
||||
|
||||
+5
@@ -106,6 +106,11 @@ public class DummyTrackedRace extends TrackedRaceWithWindEssentials {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimePoint getFinishedTime() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TimePoint getEndOfRace() {
|
||||
return null;
|
||||
|
||||
+3
-3
@@ -291,18 +291,18 @@ public class ImportMasterDataOperation extends
|
||||
RaceLogIdentifier identifier = raceColumn.getRaceLogIdentifier(fleet);
|
||||
RaceLog currentPersistedLog = mongoRaceLogStore.getRaceLog(identifier, true);
|
||||
if (currentPersistedLog.isEmpty()) {
|
||||
addAllmportedEvents(mongoObjectFactory, mongoRaceLogStore, log, identifier);
|
||||
addAllImportedEvents(mongoObjectFactory, mongoRaceLogStore, log, identifier);
|
||||
} else if (override) {
|
||||
// Clear existing race log
|
||||
mongoRaceLogStore.removeRaceLog(identifier);
|
||||
addAllmportedEvents(mongoObjectFactory, mongoRaceLogStore, log, identifier);
|
||||
addAllImportedEvents(mongoObjectFactory, mongoRaceLogStore, log, identifier);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void addAllmportedEvents(MongoObjectFactory mongoObjectFactory, RaceLogStore mongoRaceLogStore,
|
||||
private void addAllImportedEvents(MongoObjectFactory mongoObjectFactory, RaceLogStore mongoRaceLogStore,
|
||||
RaceLog log, RaceLogIdentifier identifier) {
|
||||
RaceLogEventVisitor storeVisitor = MongoRaceLogStoreFactory.INSTANCE
|
||||
.getMongoRaceLogStoreVisitor(identifier, mongoObjectFactory);
|
||||
|
||||
+6
@@ -176,6 +176,12 @@ public class SimulationServiceImpl implements SimulationService {
|
||||
// TODO: update leg 1
|
||||
}
|
||||
|
||||
@Override
|
||||
public void finishedTimeChanged(TimePoint oldFinishedTime, TimePoint newFinishedTime) {
|
||||
// relevant for simulation? for last leg?
|
||||
// TODO: update last leg?
|
||||
}
|
||||
|
||||
@Override
|
||||
public void windSourcesToExcludeChanged(Iterable<? extends WindSource> windSourcesToExclude) {
|
||||
// relevant for simulation: update all legs when wind changes overall
|
||||
|
||||
Reference in new issue
Block a user