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

Merge branch 'bug1845'

Browse Source
This commit is contained in:
Axel Uhl committed 2014-03-12 14:45:53 +01:00
2 parents c50970fe76 ccff8becb0
commit c34c7094b9
3 files changed
-13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
-4
View File
@@ -59,7 +59,6 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
import com.sap.sailing.domain.tracking.TrackerManager;
import com.sap.sailing.domain.tracking.WindStore;
import com.sap.sailing.server.masterdata.DataImportLockWithProgress;
import com.sap.sailing.server.operationaltransformation.ImportMasterDataOperation;
/**
* An OSGi service that can be used to track boat races using a TracTrac connector that pushes
@@ -528,7 +527,4 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
void setDataImportDeleteProgressFromMapTimerWithReplication(UUID importOperationId);
void setDataImportDeleteProgressFromMapTimerWithoutReplication(UUID importOperationId);
void replicateDataImportOperation(ImportMasterDataOperation op);
}
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
-7
View File
@@ -134,7 +134,6 @@ import com.sap.sailing.server.operationaltransformation.CreateOrUpdateDataImport
import com.sap.sailing.server.operationaltransformation.CreateOrUpdateDeviceConfiguration;
import com.sap.sailing.server.operationaltransformation.CreateTrackedRace;
import com.sap.sailing.server.operationaltransformation.DataImportFailed;
import com.sap.sailing.server.operationaltransformation.ImportMasterDataOperation;
import com.sap.sailing.server.operationaltransformation.RecordCompetitorGPSFix;
import com.sap.sailing.server.operationaltransformation.RecordMarkGPSFix;
import com.sap.sailing.server.operationaltransformation.RecordWindFix;
@@ -2298,10 +2297,4 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport
public void setDataImportDeleteProgressFromMapTimerWithoutReplication(UUID importOperationId) {
dataImportLock.setDeleteFromMapTimer(importOperationId);
}
@Override
public void replicateDataImportOperation(ImportMasterDataOperation op) {
replicate(op);
}
}
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/MasterDataImporter.java
-2
View File
@@ -64,9 +64,7 @@ public class MasterDataImporter {
creationCount,
baseDomainFactory);
creationCount = racingEventService.apply(op);
racingEventService.replicateDataImportOperation(op);
racingEventService.mediaTracksImported(topLevelMasterData.getAllMediaTracks(), override);
return creationCount;
}