From 6589894f16ebec06fd8e558f667a1eb2cb4a9816 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 9 Nov 2011 15:34:08 +0100 Subject: [PATCH] renamed TracTrac-specific stuff accordingly --- .../swisstimingadapter/persistence/DomainObjectFactory.java | 2 +- .../persistence/impl/DomainObjectFactoryImpl.java | 2 +- .../domain/swisstimingadapter/test/StoreAndForwardTest.java | 2 +- .../java/com/sap/sailing/gwt/ui/client/SailingService.java | 2 +- .../com/sap/sailing/gwt/ui/client/SailingServiceAsync.java | 2 +- .../sailing/gwt/ui/client/TracTracEventManagementPanel.java | 2 +- .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java | 4 ++-- .../src/com/sap/sailing/server/AdminApp.java | 2 +- .../src/com/sap/sailing/server/RacingEventService.java | 3 ++- .../src/com/sap/sailing/server/RacingEventServiceImpl.java | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/DomainObjectFactory.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/DomainObjectFactory.java index b87d2bd6ccc..1ab7c07381b 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/DomainObjectFactory.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/DomainObjectFactory.java @@ -25,5 +25,5 @@ public interface DomainObjectFactory { * * @return messages in ascending sequence number order; always a valid but perhaps empty list */ - List loadMessage(int firstSequenceNumber); + List loadMessages(int firstSequenceNumber); } diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/DomainObjectFactoryImpl.java index c746114b085..0b04cd7331a 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/DomainObjectFactoryImpl.java @@ -54,7 +54,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { } @Override - public List loadMessage(int firstSequenceNumber) { + public List loadMessages(int firstSequenceNumber) { DBCollection rawMessages = database.getCollection(CollectionNames.RAW_MESSAGES.name()); BasicDBObject query = new BasicDBObject(); if (firstSequenceNumber != -1) { diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/StoreAndForwardTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/StoreAndForwardTest.java index d9630d25358..cd31f794ff1 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/StoreAndForwardTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/StoreAndForwardTest.java @@ -97,7 +97,7 @@ public class StoreAndForwardTest { DBCollection lastMessageCountCollection = db.getCollection(CollectionNames.LAST_MESSAGE_COUNT.name()); Long lastMessageCount = (Long) lastMessageCountCollection.findOne().get(FieldNames.LAST_MESSAGE_COUNT.name()); assertEquals((Long) 1l, lastMessageCount); - List rawMessages = domainObjectFactory.loadMessage(0); + List rawMessages = domainObjectFactory.loadMessages(0); assertEquals(1, rawMessages.size()); assertEquals(rawMessage, rawMessages.get(0).getMessage()); assertEquals(0l, (long) rawMessages.get(0).getSequenceNumber()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java index c2a94bec0d1..fafe69ce534 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java @@ -32,7 +32,7 @@ public interface SailingService extends RemoteService { List listEvents(); - Pair> listRacesInEvent(String eventJsonURL) throws Exception; + Pair> listTracTracRacesInEvent(String eventJsonURL) throws Exception; void track(RaceRecordDAO rr, String liveURI, String storedURI, boolean trackWind, boolean correctWindByDeclination) throws Exception; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java index 4f529554c9b..92b00890ce6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java @@ -33,7 +33,7 @@ public interface SailingServiceAsync { /** * The string returned in the callback's pair is the common event name */ - void listRacesInEvent(String eventJsonURL, AsyncCallback>> callback); + void listTracTracRacesInEvent(String eventJsonURL, AsyncCallback>> callback); /** * @param liveURI may be null or the empty string in which case the server will diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TracTracEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TracTracEventManagementPanel.java index 57c0a1fa1df..40ff01f052d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TracTracEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TracTracEventManagementPanel.java @@ -368,7 +368,7 @@ public class TracTracEventManagementPanel extends FormPanel implements EventDisp final String jsonURL = jsonURLBox.getValue(); final String liveDataURI = liveURIBox.getValue(); final String storedDataURI = storedURIBox.getValue(); - sailingService.listRacesInEvent(jsonURL, new AsyncCallback>>() { + sailingService.listTracTracRacesInEvent(jsonURL, new AsyncCallback>>() { @Override public void onFailure(Throwable caught) { TracTracEventManagementPanel.this.errorReporter.reportError("Error trying to list races: " 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 f3fdf4e12aa..6bca9f53209 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 @@ -321,10 +321,10 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS } @Override - public Pair> listRacesInEvent(String eventJsonURL) throws MalformedURLException, IOException, + public Pair> listTracTracRacesInEvent(String eventJsonURL) throws MalformedURLException, IOException, ParseException, org.json.simple.parser.ParseException, URISyntaxException { com.sap.sailing.util.Util.Pair> raceRecords; - raceRecords = getService().getRaceRecords(new URL(eventJsonURL)); + raceRecords = getService().getTracTracRaceRecords(new URL(eventJsonURL)); List result = new ArrayList(); for (RaceRecord raceRecord : raceRecords.getB()) { result.add(new RaceRecordDAO(raceRecord.getID(), raceRecord.getEventName(), raceRecord.getName(), diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java index 7cf1f499bf6..d3d97c7a320 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/AdminApp.java @@ -191,7 +191,7 @@ public class AdminApp extends Servlet { private void listRacesInEvent(HttpServletRequest req, HttpServletResponse resp) throws IOException, ParseException, org.json.simple.parser.ParseException, URISyntaxException { URL jsonURL = new URL(req.getParameter(PARAM_NAME_EVENT_JSON_URL)); - List raceRecords = getService().getRaceRecords(jsonURL).getB(); + List raceRecords = getService().getTracTracRaceRecords(jsonURL).getB(); JSONArray result = new JSONArray(); for (RaceRecord raceRecord : raceRecords) { JSONObject jsonRaceRecord = new JSONObject(); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java index 45e130b3e34..67912a9b328 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java @@ -135,7 +135,8 @@ public interface RacingEventService { * calls to individually start tracking races of this event, rather than tracking all races in the event which * is hardly ever useful. The returned pair's first component is the event name. */ - Pair> getRaceRecords(URL jsonURL) throws IOException, ParseException, org.json.simple.parser.ParseException, URISyntaxException; + Pair> getTracTracRaceRecords(URL jsonURL) throws IOException, ParseException, + org.json.simple.parser.ParseException, URISyntaxException; boolean isRaceBeingTracked(RaceDefinition r); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java index 2e7a28cf142..13c4cda5870 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventServiceImpl.java @@ -214,7 +214,7 @@ public class RacingEventServiceImpl implements RacingEventService { } @Override - public Pair> getRaceRecords(URL jsonURL) throws IOException, ParseException, org.json.simple.parser.ParseException, URISyntaxException { + public Pair> getTracTracRaceRecords(URL jsonURL) throws IOException, ParseException, org.json.simple.parser.ParseException, URISyntaxException { JSONService jsonService = getDomainFactory().parseJSONURL(jsonURL); return new Pair>(jsonService.getEventName(), jsonService.getRaceRecords()); }