From 8919e656360066da8a17e4ebb0034d0acdf5d11d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 11 Nov 2011 11:43:37 +0100 Subject: [PATCH] added code formatter --- java/CodeFormatter.xml | 291 ++++++++++++++++++ .../RaceSpecificMessageLoader.java | 3 + .../impl/SailMasterConnectorImpl.java | 2 + .../impl/SwissTimingRaceTrackerImpl.java | 11 +- .../sailing/domain/tracking/RaceTracker.java | 6 +- .../gwt/ui/server/SailingServiceImpl.java | 1 + 6 files changed, 305 insertions(+), 9 deletions(-) create mode 100755 java/CodeFormatter.xml diff --git a/java/CodeFormatter.xml b/java/CodeFormatter.xml new file mode 100755 index 00000000000..f86fae4e42a --- /dev/null +++ b/java/CodeFormatter.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/RaceSpecificMessageLoader.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/RaceSpecificMessageLoader.java index 53314b8c72c..efe4c516e03 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/RaceSpecificMessageLoader.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/RaceSpecificMessageLoader.java @@ -17,4 +17,7 @@ public interface RaceSpecificMessageLoader { * has to be a valid, non-null and perhaps empty list. */ List loadRaceMessages(String raceID); + + // TODO augment to support loading of list of known Race objects (ID/description/optional start time) + // something like Collection getRaces(); } diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java index c9ee72ffc0b..5ee4bed355e 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java @@ -454,6 +454,8 @@ public class SailMasterConnectorImpl extends SailMasterTransceiverImpl implement @Override public Iterable getRaces() throws UnknownHostException, IOException, InterruptedException { + // TODO in case we have a non-null RaceSpecificMessageLoader then ask it to deliver all races it knows + // otherwise we're probably in a single SailMaster connection SailMasterMessage response = sendRequestAndGetResponse(MessageType.RAC); assertResponseType(MessageType.RAC, response); List result = parseAvailableRacesMessage(response); diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java index 277db0afa6e..52761336909 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java @@ -2,6 +2,7 @@ package com.sap.sailing.domain.swisstimingadapter.impl; import java.io.IOException; import java.net.MalformedURLException; +import java.util.Collections; import java.util.Set; import com.sap.sailing.domain.base.Event; @@ -17,12 +18,13 @@ import com.sap.sailing.util.Util.Triple; public class SwissTimingRaceTrackerImpl implements SwissTimingRaceTracker { private final SailMasterConnector connector; -// private final Set races; + private final RaceDefinition race; protected SwissTimingRaceTrackerImpl(String raceID, String hostname, int port, SwissTimingFactory factory, RaceSpecificMessageLoader messageLoader) throws InterruptedException { connector = factory.createSailMasterConnector(hostname, port, messageLoader); -// races = new HashSet(); + // TODO fix race after having created it + race = null; } @Override @@ -32,10 +34,7 @@ public class SwissTimingRaceTrackerImpl implements SwissTimingRaceTracker { @Override public Set getRaces() { -// races = connector.getRaces(); - - // TODO Auto-generated method stub - return null; + return Collections.singleton(race); } @Override diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java index 474a1cebf1d..6eafd9bd5d6 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java @@ -18,9 +18,9 @@ public interface RaceTracker { com.sap.sailing.domain.base.Event getEvent(); /** - * Non-blocking call that returns null if the {@link RaceDefinition} for the TracTrac Event - * hasn't been created yet, e.g., because the course definition hasn't been received yet or the listener - * for receiving course information hasn't been registered (yet). + * Returns the races currently being tracked by this tracked. Non-blocking call that returns null if + * the {@link RaceDefinition} for a TracTrac Event hasn't been created yet, e.g., because the course definition + * hasn't been received yet or the listener for receiving course information hasn't been registered (yet). */ Set getRaces(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 4554f2243c9..1164657e7ea 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -1026,6 +1026,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS public List listSwissTimingRaces(String hostname, int port) throws UnknownHostException, IOException, InterruptedException, ParseException { List result = new ArrayList(); + // FIXME can't rely on the connector being able to send a request; perhaps need to extract from SwissTiming persistence SailMasterConnector swissTimingConnector = swissTimingFactory.createSailMasterConnector(hostname, port, swissTimingDomainObjectFactory); for (Race race : swissTimingConnector.getRaces()) { TimePoint startTime = swissTimingConnector.getStartTime(race.getRaceID());