diff --git a/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy, No Tunnel).launch b/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy, No Tunnel).launch
new file mode 100755
index 00000000000..2e0e4a17a88
--- /dev/null
+++ b/java/com.sap.sailing.domain.test/SailingDomainTest (Proxy, No Tunnel).launch
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java
index 691ea4917fb..52571656172 100755
--- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java
+++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java
@@ -2,18 +2,57 @@ package com.sap.sailing.domain.tractracadapter;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.logging.Logger;
+
+import com.sap.sailing.domain.base.TimePoint;
+import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
+import com.sap.sailing.util.DateParser;
+import com.sap.sailing.util.InvalidDateException;
public class RaceRecord {
+ private static final Logger logger = Logger.getLogger(RaceRecord.class.getName());
+
private final String name;
private final String replayURL;
private final String ID;
private final URL paramURL;
+ private final TimePoint trackingstarttime;
+ private final TimePoint trackingendtime;
+ private final TimePoint racestarttime;
- public RaceRecord(URL jsonURL, String name, String replayURL, String ID) throws MalformedURLException {
+ public RaceRecord(URL jsonURL, String name, String replayURL, String ID, String trackingstarttime,
+ String trackingendtime, String racestarttime) throws MalformedURLException {
super();
this.name = name;
this.replayURL = replayURL;
this.ID = ID;
+ TimePoint tp = null;
+ if (trackingstarttime != null) {
+ try {
+ tp = new MillisecondsTimePoint(DateParser.parse(trackingstarttime).getTime());
+ } catch (InvalidDateException e) {
+ logger.warning("Unable to parse trackingstarttime of race "+name+": "+trackingstarttime+". Leaving null.");
+ }
+ }
+ this.trackingstarttime = tp;
+ tp = null;
+ if (trackingendtime != null) {
+ try {
+ tp = new MillisecondsTimePoint(DateParser.parse(trackingendtime).getTime());
+ } catch (InvalidDateException e) {
+ logger.warning("Unable to parse trackingendtime of race "+name+": "+trackingendtime+". Leaving null.");
+ }
+ }
+ this.trackingendtime = tp;
+ tp = null;
+ if (racestarttime != null) {
+ try {
+ tp = new MillisecondsTimePoint(DateParser.parse(racestarttime).getTime());
+ } catch (InvalidDateException e) {
+ logger.warning("Unable to parse racestarttime of race "+name+": "+racestarttime+". Leaving null.");
+ }
+ }
+ this.racestarttime = tp;
String jsonURLAsString = jsonURL.toString();
int indexOfLastSlash = jsonURLAsString.lastIndexOf('/');
@@ -38,6 +77,18 @@ public class RaceRecord {
public URL getParamURL() {
return paramURL;
}
+
+ public TimePoint getTrackingStartTime() {
+ return trackingstarttime;
+ }
+
+ public TimePoint getTrackingEndTime() {
+ return trackingendtime;
+ }
+
+ public TimePoint getRaceStartTime() {
+ return racestarttime;
+ }
}
diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/JSONServiceImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/JSONServiceImpl.java
index 763a518bd69..97834119f32 100755
--- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/JSONServiceImpl.java
+++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/JSONServiceImpl.java
@@ -27,7 +27,10 @@ public class JSONServiceImpl implements JSONService {
for (Object raceEntry : (JSONArray) jsonObject.get("races")) {
JSONObject jsonRaceEntry = (JSONObject) raceEntry;
RaceRecord raceRecord = new RaceRecord(jsonURL, (String) jsonRaceEntry.get("name"),
- (String) jsonRaceEntry.get("url"), (String) jsonRaceEntry.get("id"));
+ (String) jsonRaceEntry.get("url"), (String) jsonRaceEntry.get("id"),
+ (String) jsonRaceEntry.get("tracking_starttime"),
+ (String) jsonRaceEntry.get("tracking_endtime"),
+ (String) jsonRaceEntry.get("race_starttime"));
raceRecords.add(raceRecord);
}
}
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/util/DateParser.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/DateParser.java
similarity index 99%
rename from java/com.sap.sailing.server/src/com/sap/sailing/server/util/DateParser.java
rename to java/com.sap.sailing.domain/src/com/sap/sailing/util/DateParser.java
index bf779588efc..2639a60fd92 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/util/DateParser.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/DateParser.java
@@ -2,7 +2,7 @@
// $Id: DateParser.java,v 1.5 2005/05/14 15:53:00 dbarashev Exp $
// (c) COPYRIGHT MIT, INRIA and Keio, 2000.
// Please first read the full copyright statement in file COPYRIGHT.html
-package com.sap.sailing.server.util;
+package com.sap.sailing.util;
import java.util.Calendar;
import java.util.Date;
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/util/InvalidDateException.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/InvalidDateException.java
similarity index 84%
rename from java/com.sap.sailing.server/src/com/sap/sailing/server/util/InvalidDateException.java
rename to java/com.sap.sailing.domain/src/com/sap/sailing/util/InvalidDateException.java
index d125a574ac3..f194fe0a49b 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/util/InvalidDateException.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/InvalidDateException.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.server.util;
+package com.sap.sailing.util;
public class InvalidDateException extends Exception {
private static final long serialVersionUID = 1144913537358071746L;
diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index 3bcfde36e1e..2cfcf073438 100755
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -7,6 +7,13 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-RegisterBuddy: com.google.gwt.osgi
Require-Bundle: javax.servlet;bundle-version="2.5.0",
- com.google.gwt.osgi;bundle-version="2.3.0"
+ com.google.gwt.osgi;bundle-version="2.3.0",
+ com.sap.sailing.domain,
+ com.sap.sailing.server,
+ org.eclipse.osgi,
+ com.sap.sailing.domain.tractracadapter,
+ org.json.simple;bundle-version="1.1.0"
Bundle-ClassPath: war/WEB-INF/classes/,
.
+Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
+Bundle-ActivationPolicy: lazy
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java
index 13bb8a27f26..4a784af2c40 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/EventManagementPanel.java
@@ -1,14 +1,22 @@
package com.sap.sailing.gwt.ui.client;
-import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.cell.client.Cell;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.cellview.client.CellList;
+import com.google.gwt.user.cellview.client.CellTable;
+import com.google.gwt.user.cellview.client.Column;
+import com.google.gwt.user.cellview.client.ColumnSortEvent.Handler;
+import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
+import com.google.gwt.user.cellview.client.TextColumn;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.FormPanel;
@@ -20,7 +28,10 @@ import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.view.client.ListDataProvider;
+import com.google.gwt.view.client.MultiSelectionModel;
import com.sap.sailing.gwt.ui.shared.EventDAO;
+import com.sap.sailing.gwt.ui.shared.RaceRecordDAO;
/**
* Allows the user to start and stop tracking of events, regattas and races using the TracTrac connector.
@@ -36,7 +47,7 @@ import com.sap.sailing.gwt.ui.shared.EventDAO;
*
*/
public class EventManagementPanel extends FormPanel {
- private CellList eventsList;
+ private final ListDataProvider eventsList;
private final SailingServiceAsync sailingService;
private final ErrorReporter errorReporter;
private final IntegerBox storedPortIntegerbox;
@@ -46,9 +57,10 @@ public class EventManagementPanel extends FormPanel {
private final IntegerBox livePortIntegerbox;
private final TextBox hostnameTextbox;
private final TextBox eventNameTextbox;
+ private final ListDataProvider raceList;
- public EventManagementPanel(SailingServiceAsync sailingService, ErrorReporter errorReporter) {
+ public EventManagementPanel(final SailingServiceAsync sailingService, ErrorReporter errorReporter) {
this.sailingService = sailingService;
this.errorReporter = errorReporter;
StringConstants stringConstants = GWT.create(StringConstants.class);
@@ -56,11 +68,11 @@ public class EventManagementPanel extends FormPanel {
this.setWidget(verticalPanel);
verticalPanel.setSize("100%", "100%");
- Grid grid = new Grid(7, 2);
+ Grid grid = new Grid(8, 2);
verticalPanel.add(grid);
verticalPanel.setCellWidth(grid, "100%");
- Label lblPredefined = new Label("Tracked Before");
+ Label lblPredefined = new Label(stringConstants.trackedBefore());
grid.setWidget(0, 0, lblPredefined);
ListBox comboBox = new ListBox();
@@ -68,9 +80,15 @@ public class EventManagementPanel extends FormPanel {
comboBox.addItem(stringConstants.kielWeel2011());
comboBox.addItem(stringConstants.stgAccount());
- Button btnAdd = new Button("Track Again");
- grid.setWidget(1, 1, btnAdd);
- btnAdd.setWidth("100%");
+ Button btnListRaces = new Button(stringConstants.listRaces());
+ grid.setWidget(1, 1, btnListRaces);
+ btnListRaces.setWidth("100%");
+ btnListRaces.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ fillRaces(sailingService);
+ }
+ });
Label lblTrackNewEvent = new Label("Track New Event");
grid.setWidget(2, 0, lblTrackNewEvent);
@@ -164,6 +182,32 @@ public class EventManagementPanel extends FormPanel {
Label lblEventsConnectedTo = new Label("Events Currently Tracked");
grid.setWidget(5, 0, lblEventsConnectedTo);
+
+ TextColumn raceNameColumn = new TextColumn() {
+ @Override
+ public String getValue(RaceRecordDAO object) {
+ return object.name;
+ }
+ };
+ TextColumn raceStartTrackingColumn = new TextColumn() {
+ @Override
+ public String getValue(RaceRecordDAO object) {
+ return object.trackingStartTime.toString();
+ }
+ };
+ raceNameColumn.setSortable(true);
+ raceStartTrackingColumn.setSortable(true);
+ CellTable raceTable = new CellTable(/* pageSize */ 100);
+ raceTable.addColumn(raceNameColumn, "Name");
+ raceTable.addColumn(raceStartTrackingColumn, "Tracking Started");
+ grid.setWidget(6, 0, raceTable);
+ grid.getCellFormatter().setHeight(6, 0, "100%");
+ raceTable.setWidth("100%");
+ raceTable.setSelectionModel(new MultiSelectionModel() {});
+ raceList = new ListDataProvider();
+ raceList.addDataDisplay(raceTable);
+ Handler columnSortHandler = getRaceTableColumnSortHandler(raceList.getList(), raceNameColumn, raceStartTrackingColumn);
+ raceTable.addColumnSortHandler(columnSortHandler);
Cell eventCell = new AbstractCell() {
@Override
@@ -171,14 +215,27 @@ public class EventManagementPanel extends FormPanel {
sb.appendEscaped(value.name);
}
};
- eventsList = new CellList(eventCell);
- grid.setWidget(6, 0, eventsList);
+ final CellList eventsCellList = new CellList(eventCell);
+ grid.setWidget(7, 0, eventsCellList);
grid.getCellFormatter().setHeight(6, 0, "100%");
- eventsList.setWidth("100%");
- eventsList.setVisibleRange(0, 5);
+ eventsCellList.setWidth("100%");
+ eventsCellList.setVisibleRange(0, 5);
+ eventsCellList.setSelectionModel(new MultiSelectionModel() {});
+ eventsList = new ListDataProvider();
+ eventsList.addDataDisplay(eventsCellList);
Button btnRemove = new Button("Remove");
- grid.setWidget(6, 1, btnRemove);
+ btnRemove.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent click) {
+ for (EventDAO event : eventsCellList.getVisibleItems()) {
+ if (eventsCellList.getSelectionModel().isSelected(event)) {
+ GWT.log("Event "+event.name+" was selected and would be removed");
+ }
+ }
+ }
+ });
+ grid.setWidget(7, 1, btnRemove);
btnRemove.setWidth("100%");
grid.getCellFormatter().setVerticalAlignment(6, 1, HasVerticalAlignment.ALIGN_TOP);
grid.getCellFormatter().setVerticalAlignment(6, 0, HasVerticalAlignment.ALIGN_TOP);
@@ -189,6 +246,25 @@ public class EventManagementPanel extends FormPanel {
updateStoredURI();
updateJsonUrl();
}
+
+ private ListHandler getRaceTableColumnSortHandler(List raceRecords,
+ Column nameColumn, Column trackingStartColumn) {
+ ListHandler result = new ListHandler(raceRecords);
+ result.setComparator(nameColumn, new Comparator() {
+ @Override
+ public int compare(RaceRecordDAO o1, RaceRecordDAO o2) {
+ return o1.name.compareTo(o2.name);
+ }
+ });
+ result.setComparator(trackingStartColumn, new Comparator() {
+ @Override
+ public int compare(RaceRecordDAO o1, RaceRecordDAO o2) {
+ return o1.trackingStartTime == null ? -1 : o2.trackingStartTime == null ? 1 : o1.trackingStartTime
+ .compareTo(o2.trackingStartTime);
+ }
+ });
+ return result;
+ }
private void updatePortStoredData() {
storedPortIntegerbox.setValue(livePortIntegerbox.getValue()+1);
@@ -207,11 +283,11 @@ public class EventManagementPanel extends FormPanel {
}
private void fillEvents() {
- sailingService.listEvents(new AsyncCallback() {
+ sailingService.listEvents(new AsyncCallback>() {
@Override
- public void onSuccess(EventDAO[] result) {
- eventsList.setRowCount(result.length);
- eventsList.setRowData(Arrays.asList(result));
+ public void onSuccess(List result) {
+ eventsList.getList().clear();
+ eventsList.getList().addAll(result);
}
@Override
@@ -221,4 +297,19 @@ public class EventManagementPanel extends FormPanel {
});
}
+ private void fillRaces(final SailingServiceAsync sailingService) {
+ sailingService.listRacesInEvent(jsonURLBox.getValue(), new AsyncCallback>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ EventManagementPanel.this.errorReporter.reportError("Error trying to list races: "+caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(List result) {
+ raceList.getList().clear();
+ raceList.getList().addAll(result);
+ }
+ });
+ }
+
}
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingService.java
index 930346ca868..515029dcba9 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingService.java
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingService.java
@@ -1,13 +1,18 @@
package com.sap.sailing.gwt.ui.client;
+import java.util.List;
+
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
import com.sap.sailing.gwt.ui.shared.EventDAO;
+import com.sap.sailing.gwt.ui.shared.RaceRecordDAO;
/**
* The client side stub for the RPC service.
*/
@RemoteServiceRelativePath("sailing")
public interface SailingService extends RemoteService {
- EventDAO[] listEvents();
+ List listEvents();
+
+ List listRacesInEvent(String eventJsonURL) throws Exception;
}
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
index f82e73a292d..6d86ee9f378 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
@@ -1,11 +1,16 @@
package com.sap.sailing.gwt.ui.client;
+import java.util.List;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.ui.shared.EventDAO;
+import com.sap.sailing.gwt.ui.shared.RaceRecordDAO;
/**
* The async counterpart of {@link SailingService}
*/
public interface SailingServiceAsync {
- void listEvents(AsyncCallback callback);
+ void listEvents(AsyncCallback> callback);
+
+ void listRacesInEvent(String eventJsonURL, AsyncCallback> callback);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.java
index ab6a923c0c4..4191164b63c 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.java
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.java
@@ -7,4 +7,6 @@ public interface StringConstants extends Constants {
String kielWeel2011();
String stgAccount();
String tracTracEvents();
+ String trackedBefore();
+ String listRaces();
}
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.properties b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.properties
index 07ca7151006..01cd1e0d9bb 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.properties
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/client/StringConstants.properties
@@ -1,4 +1,6 @@
helloWorld=Hello World
kielWeel2011=Kiel Week 2011
stgAccount=STG Account
-tracTracEvents=TracTrac Events
\ No newline at end of file
+tracTracEvents=TracTrac Events
+trackedBefore=Tracked Before
+listRaces=List Races
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/Activator.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/Activator.java
new file mode 100755
index 00000000000..0f01985ec19
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/Activator.java
@@ -0,0 +1,22 @@
+package com.sap.sailing.gwt.ui.server;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+ private static BundleContext context;
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ Activator.context = context;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ }
+
+ public static BundleContext getDefault() {
+ return context;
+ }
+
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index ff874aaa868..7934ba1ea31 100755
--- a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -1,12 +1,24 @@
package com.sap.sailing.gwt.ui.server;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
+
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+import com.sap.sailing.domain.tractracadapter.RaceRecord;
import com.sap.sailing.gwt.ui.client.SailingService;
import com.sap.sailing.gwt.ui.shared.EventDAO;
+import com.sap.sailing.gwt.ui.shared.RaceRecordDAO;
import com.sap.sailing.gwt.ui.shared.RegattaDAO;
+import com.sap.sailing.server.RacingEventService;
/**
* The server side implementation of the RPC service.
@@ -14,8 +26,33 @@ import com.sap.sailing.gwt.ui.shared.RegattaDAO;
public class SailingServiceImpl extends RemoteServiceServlet implements SailingService {
private static final long serialVersionUID = 9031688830194537489L;
- public EventDAO[] listEvents() throws IllegalArgumentException {
+ private RacingEventService service;
+
+ public SailingServiceImpl() {
+ BundleContext context = Activator.getDefault();
+ ServiceTracker racingEventServiceTracker = new ServiceTracker(
+ context, RacingEventService.class.getName(), null);
+ racingEventServiceTracker.open();
+ // grab the service
+ service = (RacingEventService) racingEventServiceTracker.getService();
+ }
+
+ public List listEvents() throws IllegalArgumentException {
List regattas = Collections.emptyList();
- return new EventDAO[] { new EventDAO("Kiel Week", /* regattas */ regattas), new EventDAO("STG Training", /* regattas */ regattas) };
+ return Arrays.asList(new EventDAO[] { new EventDAO("Kiel Week", /* regattas */ regattas), new EventDAO("STG Training", /* regattas */ regattas) });
+ }
+
+ @Override
+ public List listRacesInEvent(String eventJsonURL) throws MalformedURLException, IOException,
+ ParseException, org.json.simple.parser.ParseException {
+ List raceRecords;
+ raceRecords = service.getRaceRecords(new URL(eventJsonURL));
+ List result = new ArrayList();
+ for (RaceRecord raceRecord : raceRecords) {
+ result.add(new RaceRecordDAO(raceRecord.getID(), raceRecord.getName(), raceRecord.getParamURL().toString(),
+ raceRecord.getReplayURL(), raceRecord.getTrackingStartTime().asDate(), raceRecord.getTrackingEndTime().asDate(),
+ raceRecord.getRaceStartTime().asDate()));
+ }
+ return result;
}
}
diff --git a/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/shared/RaceRecordDAO.java b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/shared/RaceRecordDAO.java
new file mode 100755
index 00000000000..8b6943f2943
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/com/sap/sailing/gwt/ui/shared/RaceRecordDAO.java
@@ -0,0 +1,30 @@
+package com.sap.sailing.gwt.ui.shared;
+
+import java.util.Date;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+public class RaceRecordDAO implements IsSerializable {
+ public String name;
+ public String replayURL;
+ public String paramURL;
+ public String ID;
+ public Date trackingStartTime;
+ public Date trackingEndTime;
+ public Date raceStartTime;
+
+ public RaceRecordDAO() {}
+
+ public RaceRecordDAO(String id, String name, String paramURL, String replayURL,
+ Date trackingStartTime, Date trackingEndTime, Date raceStartTime) {
+ super();
+ this.name = name;
+ this.replayURL = replayURL;
+ this.paramURL = paramURL;
+ ID = id;
+ this.trackingStartTime = trackingStartTime;
+ this.trackingEndTime = trackingEndTime;
+ this.raceStartTime = raceStartTime;
+ }
+
+}
diff --git a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/E09FB7252D4D6806941E788A62EB3355.txt b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/6F62C4A6425543C11DF390F4F06A6F27.txt
similarity index 55%
rename from java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/E09FB7252D4D6806941E788A62EB3355.txt
rename to java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/6F62C4A6425543C11DF390F4F06A6F27.txt
index 4ec4b6a892a..bd77646f6f0 100755
--- a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/E09FB7252D4D6806941E788A62EB3355.txt
+++ b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/6F62C4A6425543C11DF390F4F06A6F27.txt
@@ -1,2 +1,2 @@
serviceClass: com.sap.sailing.gwt.ui.client.SailingService
-path: E7E1607CD2D2A7E48EB560515432C46A.gwt.rpc
+path: DBCC056FF892F23A06A63BF879D7D9AE.gwt.rpc
diff --git a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/8A570C82306070CF419C2021A746784A.txt b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/8A570C82306070CF419C2021A746784A.txt
new file mode 100755
index 00000000000..2bfe6891461
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/rpcPolicyManifest/manifests/8A570C82306070CF419C2021A746784A.txt
@@ -0,0 +1,2 @@
+serviceClass: com.sap.sailing.gwt.ui.client.SailingService
+path: 883FF1AAEF122FE219AA3FCB3EE85ED1.gwt.rpc
diff --git a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/symbolMaps/FD4800AD9A74C7E88953B7B2649037C3.symbolMap b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/symbolMaps/1A6A2A715641010D6142AEFDE948737A.symbolMap
similarity index 73%
rename from java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/symbolMaps/FD4800AD9A74C7E88953B7B2649037C3.symbolMap
rename to java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/symbolMaps/1A6A2A715641010D6142AEFDE948737A.symbolMap
index 36c5ce4315a..bdfc8a1dfb5 100755
--- a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/symbolMaps/FD4800AD9A74C7E88953B7B2649037C3.symbolMap
+++ b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com.sap.sailing.gwt.ui.AdminConsole/symbolMaps/1A6A2A715641010D6142AEFDE948737A.symbolMap
@@ -1,32 +1,32 @@
-# { 0 }
-# { 'user.agent' : 'safari' }
+# { 2 }
+# { 'user.agent' : 'opera' }
# jsName, jsniIdent, className, memberName, sourceUri, sourceLine