eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 19:33:52 +00:00
Code Activity

Merge branch 'master' into racecommittee_integrated

Browse Source 
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.freg.resultimport.test/bin/freg_html_export_sample.html
	java/com.sap.sailing.gwt.ui/pom.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
This commit is contained in:
Armin Zamani committed 2013-01-30 16:36:08 +01:00
2 parents 37bf2fb98c 94a962306e
commit 66424926c4
109 files changed
+12432 -6928
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayParserImpl.java
+5
View File
@@ -70,10 +70,13 @@ public class SwissTimingReplayParserImpl implements SwissTimingReplayParser {
@Override
public void readData(InputStream urlInputStream, SwissTimingReplayListener replayListener) throws IOException,
UnknownMessageIdentificationCode, UnexpectedStartByte, PayloadMismatch, PrematureEndOfData {
replayListener.progress(0.0);
long initiallyAvailable = urlInputStream.available();
DataInputStream data = new DataInputStream(urlInputStream);
byte[] startByteBuffer = new byte[1];
int readSuccess = data.read(startByteBuffer);
while (readSuccess != -1) {
replayListener.progress((double) (initiallyAvailable-urlInputStream.available())/(double) initiallyAvailable);
byte startByte = startByteBuffer[0];
if (startByte != STX) {
throw new UnexpectedStartByte(startByte);
@@ -235,6 +238,7 @@ public class SwissTimingReplayParserImpl implements SwissTimingReplayParser {
if (payloadSize != 0) {
throw new PayloadMismatch(payloadSize);
}
replayListener.progress((double) (initiallyAvailable-urlInputStream.available())/(double) initiallyAvailable);
}
byte endByte = data.readByte();
if (endByte == EOT) {
@@ -246,6 +250,7 @@ public class SwissTimingReplayParserImpl implements SwissTimingReplayParser {
}
readSuccess = data.read(startByteBuffer);
}
replayListener.progress(1.0);
}
private static int read3ByteInt(DataInputStream data) throws IOException {
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
+9 -1
View File
@@ -373,7 +373,15 @@ public class SwissTimingReplayToDomainAdapter extends SwissTimingReplayAdapter {
@Override
public void progress(double progress) {
DynamicTrackedRace trackedRace = trackedRacePerRaceID.get(currentRaceID);
trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.LOADING, progress));
if (trackedRace != null) {
final TrackedRaceStatusEnum newStatus;
if (progress == 1.0) {
newStatus = TrackedRaceStatusEnum.FINISHED;
} else {
newStatus = TrackedRaceStatusEnum.LOADING;
}
trackedRace.setStatus(new TrackedRaceStatusImpl(newStatus, progress));
}
}
@Override