eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-28 08:26:44 +00:00
Code Activity

added missing dependency to gwt.ui.test project; use WindSource[] instead of Collection<WindSource> in API

Browse Source
This commit is contained in:
Axel Uhl
2011-12-29 11:44:15 +01:00
parent 420e940b1c
commit 9db25beeba
4 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -12,7 +12,8 @@ Require-Bundle: com.sap.sailing.gwt.ui,
com.sap.sailing.server, com.sap.sailing.server,
com.google.gwt.osgi;bundle-version="2.4.0", com.google.gwt.osgi;bundle-version="2.4.0",
org.junit4, org.junit4,
com.sap.sailing.server.api com.sap.sailing.server.api,
com.sap.sailing.domain.common
Bundle-ClassPath: . Bundle-ClassPath: .
Import-Package: org.osgi.framework, Import-Package: org.osgi.framework,
org.osgi.util.tracker;version="1.5.0" org.osgi.util.tracker;version="1.5.0"
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
+2 -1
View File
@@ -7,6 +7,7 @@ import java.util.Map;
import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
import com.sap.sailing.domain.common.WindSource;
import com.sap.sailing.gwt.ui.shared.CompetitorDAO; import com.sap.sailing.gwt.ui.shared.CompetitorDAO;
import com.sap.sailing.gwt.ui.shared.CompetitorInRaceDAO; import com.sap.sailing.gwt.ui.shared.CompetitorInRaceDAO;
import com.sap.sailing.gwt.ui.shared.CompetitorsAndTimePointsDAO; import com.sap.sailing.gwt.ui.shared.CompetitorsAndTimePointsDAO;
@@ -50,7 +51,7 @@ public interface SailingService extends RemoteService {
void removeAndUntrackedRace(EventAndRaceIdentifier eventAndRaceidentifier) throws Exception; void removeAndUntrackedRace(EventAndRaceIdentifier eventAndRaceidentifier) throws Exception;
WindInfoForRaceDAO getWindInfo(RaceIdentifier raceIdentifier, Date from, Date to, Collection<String> windSources); WindInfoForRaceDAO getWindInfo(RaceIdentifier raceIdentifier, Date from, Date to, WindSource[] windSources);
void setWind(RaceIdentifier raceIdentifier, WindDAO wind); void setWind(RaceIdentifier raceIdentifier, WindDAO wind);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
+2 -12
View File
@@ -9,7 +9,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Course;
import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSource;
import com.sap.sailing.domain.leaderboard.RaceInLeaderboard; import com.sap.sailing.domain.leaderboard.RaceInLeaderboard;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.gwt.ui.shared.CompetitorDAO; import com.sap.sailing.gwt.ui.shared.CompetitorDAO;
import com.sap.sailing.gwt.ui.shared.CompetitorInRaceDAO; import com.sap.sailing.gwt.ui.shared.CompetitorInRaceDAO;
import com.sap.sailing.gwt.ui.shared.CompetitorsAndTimePointsDAO; import com.sap.sailing.gwt.ui.shared.CompetitorsAndTimePointsDAO;
@@ -70,18 +69,9 @@ public interface SailingServiceAsync {
void removeAndUntrackedRace(EventAndRaceIdentifier eventAndRaceidentifier, AsyncCallback<Void> callback); void removeAndUntrackedRace(EventAndRaceIdentifier eventAndRaceidentifier, AsyncCallback<Void> callback);
/** /**
* Retrieves wind information for the race identified by <code>raceIdentifier</code>. * @param windSources if <code>null</code>, information about all available wind sources will be provided
*
* @param from
* if <code>null</code>, the race start time will be used instead
* @param to
* if <code>null</code>, the {@link TrackedRace#getTimePointOfNewestEvent() time of the newest event} is
* used instead.
* @param windWources
* if <code>null</code>, all available wind sources will be queries; otherwise, only those whose
* {@link WindSource} name is contained in this collection
*/ */
void getWindInfo(RaceIdentifier raceIdentifier, Date from, Date to, Collection<String> windSources, void getWindInfo(RaceIdentifier raceIdentifier, Date from, Date to, WindSource[] windSources,
AsyncCallback<WindInfoForRaceDAO> callback); AsyncCallback<WindInfoForRaceDAO> callback);
/** /**
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+15 -17
View File
@@ -507,7 +507,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
} }
@Override @Override
public WindInfoForRaceDAO getWindInfo(RaceIdentifier raceIdentifier, Date fromDate, Date toDate, Collection<String> windSources) { public WindInfoForRaceDAO getWindInfo(RaceIdentifier raceIdentifier, Date fromDate, Date toDate, WindSource[] windSources) {
WindInfoForRaceDAO result = null; WindInfoForRaceDAO result = null;
TrackedRace trackedRace = getTrackedRace(raceIdentifier); TrackedRace trackedRace = getTrackedRace(raceIdentifier);
if (trackedRace != null) { if (trackedRace != null) {
@@ -519,24 +519,22 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
Map<WindSource, WindTrackInfoDAO> windTrackInfoDAOs = new HashMap<WindSource, WindTrackInfoDAO>(); Map<WindSource, WindTrackInfoDAO> windTrackInfoDAOs = new HashMap<WindSource, WindTrackInfoDAO>();
result.windTrackInfoByWindSource = windTrackInfoDAOs; result.windTrackInfoByWindSource = windTrackInfoDAOs;
if (from != null && to != null) { if (from != null && to != null) {
for (WindSource windSource : WindSource.values()) { for (WindSource windSource : (windSources == null ? WindSource.values() : windSources)) {
if (windSources == null || windSources.contains(windSource.name())) { WindTrackInfoDAO windTrackInfoDAO = new WindTrackInfoDAO();
WindTrackInfoDAO windTrackInfoDAO = new WindTrackInfoDAO(); windTrackInfoDAO.windFixes = new ArrayList<WindDAO>();
windTrackInfoDAO.windFixes = new ArrayList<WindDAO>(); WindTrack windTrack = trackedRace.getWindTrack(windSource);
WindTrack windTrack = trackedRace.getWindTrack(windSource); windTrackInfoDAO.dampeningIntervalInMilliseconds = windTrack
windTrackInfoDAO.dampeningIntervalInMilliseconds = windTrack .getMillisecondsOverWhichToAverageWind();
.getMillisecondsOverWhichToAverageWind(); Iterator<Wind> windIter = windTrack.getFixesIterator(from, /* inclusive */true);
Iterator<Wind> windIter = windTrack.getFixesIterator(from, /* inclusive */true); while (windIter.hasNext()) {
while (windIter.hasNext()) { Wind wind = windIter.next();
Wind wind = windIter.next(); if (wind.getTimePoint().compareTo(to) > 0) {
if (wind.getTimePoint().compareTo(to) > 0) { break;
break;
}
WindDAO windDAO = createWindDAO(wind, windTrack);
windTrackInfoDAO.windFixes.add(windDAO);
} }
windTrackInfoDAOs.put(windSource, windTrackInfoDAO); WindDAO windDAO = createWindDAO(wind, windTrack);
windTrackInfoDAO.windFixes.add(windDAO);
} }
windTrackInfoDAOs.put(windSource, windTrackInfoDAO);
} }
} }
} }