eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 09:41:00 +00:00
Code Activity

Merge branch 'master' into racecommittee_integrated

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.gwt.ui/build.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
This commit is contained in:
Armin Zamani committed 2013-01-21 21:36:36 +01:00
2 parents 261ea70f79 08429d5a92
commit 67fa3c01dc
167 files changed
+11943 -5971
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF
+1 -2
View File
@@ -10,5 +10,4 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.udpconnector,
com.googlecode.java-diff-utils;bundle-version="1.3.0",
com.sap.sailing.domain.common
Export-Package: com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.swisstimingadapter.impl;x-friends:="com.sap.sailing.domain.swisstimingadapter.test"
Export-Package: com.sap.sailing.domain.swisstimingadapter
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class SailMasterConnectorImpl extends SailMasterTransceiverImpl implement
public SailMasterConnectorImpl(String host, int port, RaceSpecificMessageLoader messageLoader, boolean canSendRequests) throws InterruptedException {
super();
this.messageLoader = messageLoader;
dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ");
dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
idsOfTrackedRaces = new HashSet<String>();
this.host = host;
this.port = port;