eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-18 18:20:58 +00:00
Code Activity

merge fix

Browse Source
This commit is contained in:
Lukas Niemeier committed 2013-11-20 19:20:43 +01:00
1 parent 953eaaa668
commit 7d63298739
3 files changed
+18 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
+16 -1
View File
@@ -9,6 +9,8 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.common.CourseDesignerMode;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
import com.sap.sailing.domain.masterdataimport.RaceColumnMasterData;
import com.sap.sailing.domain.masterdataimport.RegattaMasterData;
import com.sap.sailing.domain.masterdataimport.SeriesMasterData;
@@ -38,7 +40,20 @@ public class RegattaMasterDataJsonDeserializer implements JsonDeserializer<Regat
boolean isPersistent = (Boolean) object.get(RegattaMasterDataJsonSerializer.FIELD_IS_PERSISTENT);
Iterable<SeriesMasterData> series = deserializeSeries((JSONArray) object.get(RegattaMasterDataJsonSerializer.FIELD_SERIES));
Iterable<String> raceIdsAsStrings = deserializeRaceIds((JSONArray) object.get(RegattaMasterDataJsonSerializer.FIELD_REGATTA_RACE_IDS));
return new RegattaMasterData(id, baseName, defaultCourseAreaId, boatClassName, scoringSchemeType, series, isPersistent, regattaName, raceIdsAsStrings);
RacingProcedureType procedureType = null;
String defaultRacingProcedureTypeValue = (String) object.get(RegattaMasterDataJsonSerializer.FIELD_DEFAULT_RACING_PROCEDURE_TYPE);
if (defaultRacingProcedureTypeValue != null) {
procedureType = RacingProcedureType.valueOf(defaultRacingProcedureTypeValue);
}
CourseDesignerMode designerMode = null;
String defaultCourseDesignerModeValue = (String) object.get(RegattaMasterDataJsonSerializer.FIELD_DEFAULT_COURSE_DESIGNER_MODE);
if (defaultCourseDesignerModeValue != null) {
designerMode = CourseDesignerMode.valueOf(defaultCourseDesignerModeValue);
}
return new RegattaMasterData(id, baseName, defaultCourseAreaId, boatClassName, scoringSchemeType,
series, isPersistent, regattaName, raceIdsAsStrings, procedureType, designerMode);
}
private Iterable<String> deserializeRaceIds(JSONArray jsonArray) {