eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 03:13:49 +00:00
Code Activity

moved custom field serializer for CountryCodeImpl to the correct package; added CountryCode to dummy methods params and return for GWT RPC whitelisting

Browse Source 
Change-Id: Ie83f4905cf2437e7006857e46efb66252661a752
This commit is contained in:
Axel Uhl committed 2016-12-16 04:54:29 +01:00
1 parent 8d11a87fd4
commit d731bcaa14
6 files changed
+26 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/CompetitorDescriptor_CustomFieldSerializer.java
+2 -2
View File
@@ -32,7 +32,7 @@ public class CompetitorDescriptor_CustomFieldSerializer extends CustomFieldSeria
streamWriter.writeString(instance.getTeamName());
streamWriter.writeString(instance.getBoatName());
streamWriter.writeObject(instance.getCountryCode());
streamWriter.writeDouble(instance.getTimeOnTimeFactor());
streamWriter.writeObject(instance.getTimeOnTimeFactor());
streamWriter.writeObject(instance.getTimeOnDistanceAllowancePerNauticalMile());
}
@@ -55,7 +55,7 @@ public class CompetitorDescriptor_CustomFieldSerializer extends CustomFieldSeria
streamReader.readString(), streamReader.readString(), streamReader.readString(),
streamReader.readString(), streamReader.readString(), streamReader.readString(),
streamReader.readString(), (CountryCode) streamReader.readObject(),
persons, streamReader.readDouble(), (Duration) streamReader.readObject());
persons, (Double) streamReader.readObject(), (Duration) streamReader.readObject());
}
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sse/common/CountryCodeImpl_CustomFieldSerializer.java → java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sse/common/impl/CountryCodeImpl_CustomFieldSerializer.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.google.gwt.user.client.rpc.core.com.sap.sse.common;
package com.google.gwt.user.client.rpc.core.com.sap.sse.common.impl;
import com.google.gwt.user.client.rpc.CustomFieldSerializer;
import com.google.gwt.user.client.rpc.SerializationException;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorImportProviderSelectionDialog.java
+3 -3
View File
@@ -189,10 +189,10 @@ public class CompetitorImportProviderSelectionDialog extends DataEntryDialog<Com
final Iterable<CompetitorDescriptor>[] competitorDescriptors = (Iterable<CompetitorDescriptor>[]) new Iterable<?>[1];
@SuppressWarnings("unchecked")
final Iterable<CompetitorDTO>[] competitors = (Iterable<CompetitorDTO>[]) new Iterable<?>[1];
final ParallelExecutionCallback<Iterable<CompetitorDescriptor>> getCompetitorDescriptorsCallback =
new ParallelExecutionCallback<Iterable<CompetitorDescriptor>>() {
final ParallelExecutionCallback<List<CompetitorDescriptor>> getCompetitorDescriptorsCallback =
new ParallelExecutionCallback<List<CompetitorDescriptor>>() {
@Override
public void onSuccess(Iterable<CompetitorDescriptor> myCompetitorDescriptors) {
public void onSuccess(List<CompetitorDescriptor> myCompetitorDescriptors) {
competitorDescriptors[0] = myCompetitorDescriptors;
super.onSuccess(myCompetitorDescriptors);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
+5 -1
View File
@@ -35,6 +35,7 @@ import com.sap.sailing.domain.common.dto.BoatDTO;
import com.sap.sailing.domain.common.dto.CompetitorDTO;
import com.sap.sailing.domain.common.dto.FleetDTO;
import com.sap.sailing.domain.common.dto.IncrementalOrFullLeaderboardDTO;
import com.sap.sailing.domain.common.dto.PersonDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
import com.sap.sailing.domain.common.dto.RaceColumnInSeriesDTO;
import com.sap.sailing.domain.common.dto.RaceDTO;
@@ -96,6 +97,7 @@ import com.sap.sailing.gwt.ui.shared.TypedDeviceMappingDTO;
import com.sap.sailing.gwt.ui.shared.VenueDTO;
import com.sap.sailing.gwt.ui.shared.WindDTO;
import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO;
import com.sap.sse.common.CountryCode;
import com.sap.sse.common.Duration;
import com.sap.sse.common.NoCorrespondingServiceRegisteredException;
import com.sap.sse.common.TimePoint;
@@ -348,7 +350,7 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
CompetitorProviderDTO getCompetitorProviderDTOByName(String providerName) throws Exception;
Iterable<CompetitorDescriptor> getCompetitorDescriptors(String competitorProviderName, String eventName,
List<CompetitorDescriptor> getCompetitorDescriptors(String competitorProviderName, String eventName,
String regattaName) throws Exception;
WindInfoForRaceDTO getWindSourcesInfo(RegattaAndRaceIdentifier raceIdentifier);
@@ -677,4 +679,6 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
void editMarkFix(String leaderboardName, String raceColumnName, String fleetName, String markIdAsString, GPSFixDTO oldFix, Position newPosition) throws NotRevokableException;
Map<Triple<String, String, String>, Pair<TimePointSpecificationFoundInLog, TimePointSpecificationFoundInLog>> getTrackingTimes(Collection<Triple<String, String, String>> raceColumnsAndFleets);
Pair<PersonDTO, CountryCode> makePersonDTOSerializableAndDeserializableDummy(PersonDTO dummy, CountryCode ccDummy);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
+6 -1
View File
@@ -30,6 +30,7 @@ import com.sap.sailing.domain.common.dto.BoatDTO;
import com.sap.sailing.domain.common.dto.CompetitorDTO;
import com.sap.sailing.domain.common.dto.FleetDTO;
import com.sap.sailing.domain.common.dto.IncrementalOrFullLeaderboardDTO;
import com.sap.sailing.domain.common.dto.PersonDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
import com.sap.sailing.domain.common.dto.RaceColumnInSeriesDTO;
import com.sap.sailing.domain.common.dto.RaceDTO;
@@ -86,6 +87,7 @@ import com.sap.sailing.gwt.ui.shared.TypedDeviceMappingDTO;
import com.sap.sailing.gwt.ui.shared.VenueDTO;
import com.sap.sailing.gwt.ui.shared.WindDTO;
import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO;
import com.sap.sse.common.CountryCode;
import com.sap.sse.common.Duration;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
@@ -469,7 +471,7 @@ public interface SailingServiceAsync extends ServerInfoRetriever, FileStorageMan
void getCompetitorProviderDTOByName(String providerName, AsyncCallback<CompetitorProviderDTO> callback);
void getCompetitorDescriptors(String competitorProviderName, String eventName, String regattaName, AsyncCallback<Iterable<CompetitorDescriptor>> callback);
void getCompetitorDescriptors(String competitorProviderName, String eventName, String regattaName, AsyncCallback<List<CompetitorDescriptor>> callback);
void getWindSourcesInfo(RegattaAndRaceIdentifier raceIdentifier, AsyncCallback<WindInfoForRaceDTO> callback);
@@ -823,4 +825,7 @@ public interface SailingServiceAsync extends ServerInfoRetriever, FileStorageMan
void getTrackingTimes(Collection<Triple<String, String, String>> raceColumnsAndFleets,
AsyncCallback<Map<Triple<String, String, String>, Pair<TimePointSpecificationFoundInLog, TimePointSpecificationFoundInLog>>> asyncCallback);
void makePersonDTOSerializableAndDeserializableDummy(PersonDTO dummy, CountryCode ccDummy,
AsyncCallback<Pair<PersonDTO, CountryCode>> callback);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+9 -3
View File
@@ -194,6 +194,7 @@ import com.sap.sailing.domain.common.dto.FullLeaderboardDTO;
import com.sap.sailing.domain.common.dto.IncrementalLeaderboardDTO;
import com.sap.sailing.domain.common.dto.IncrementalOrFullLeaderboardDTO;
import com.sap.sailing.domain.common.dto.LeaderboardDTO;
import com.sap.sailing.domain.common.dto.PersonDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTOFactory;
import com.sap.sailing.domain.common.dto.RaceColumnInSeriesDTO;
@@ -725,15 +726,20 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
}
@Override
public Iterable<CompetitorDescriptor> getCompetitorDescriptors(String competitorProviderName, String eventName,
public List<CompetitorDescriptor> getCompetitorDescriptors(String competitorProviderName, String eventName,
String regattaName) throws Exception {
for (CompetitorProvider cp : getAllCompetitorProviders()) {
if (cp.getName().equals(competitorProviderName)) {
return cp.getCompetitorDescriptors(eventName, regattaName);
final List<CompetitorDescriptor> result = new ArrayList<>();
Util.addAll(cp.getCompetitorDescriptors(eventName, regattaName), result);
return result;
}
}
return Collections.emptySet();
return Collections.emptyList();
}
@Override
public Pair<PersonDTO, CountryCode> makePersonDTOSerializableAndDeserializableDummy(PersonDTO dummy, CountryCode ccDummy) { return null; }
/**
* If <code>date</code> is <code>null</code>, the {@link LiveLeaderboardUpdater} for the