eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 06:18:12 +00:00
Code Activity

Merge branch 'master' into permission-vertical

Browse Source 
Change-Id: If8263dddd1412bb282fa7504ae56e5cf653eec58
This commit is contained in:
Axel Uhl committed 2018-12-07 09:14:11 +01:00
2 parents 3e1fd4d89e 4eef1fc182
commit 523ebdd36a
3 files changed
+15 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java
+13 -7
View File
@@ -23,14 +23,20 @@ public class BoatClassJsonSerializer implements JsonSerializer<BoatClass> {
JSONObject result = new JSONObject();
result.put(FIELD_NAME, boatClass.getName());
result.put(FIELD_TYPICALLY_STARTS_UPWIND, boatClass.typicallyStartsUpwind());
result.put(FIELD_HULL_LENGTH_IN_METERS, boatClass.getHullLength().getMeters());
result.put(FIELD_HULL_BEAM_IN_METERS, boatClass.getHullBeam().getMeters());
result.put(FIELD_DISPLAY_NAME, boatClass.getDisplayName());
final BoatClassMasterdata masterData = BoatClassMasterdata.resolveBoatClass(boatClass.getDisplayName());
if (boatClass.getHullLength() != null) {
result.put(FIELD_HULL_LENGTH_IN_METERS, boatClass.getHullLength().getMeters());
}
if (boatClass.getHullBeam() != null) {
result.put(FIELD_HULL_BEAM_IN_METERS, boatClass.getHullBeam().getMeters());
}
final JSONArray aliasNames = new JSONArray();
if (masterData != null) {
result.put(FIELD_ICON_URL, "/gwt/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/"+masterData.name().replaceAll("^_", "")+".png");
aliasNames.addAll(Arrays.asList(masterData.getAlternativeNames()));
if (boatClass.getDisplayName() != null) {
result.put(FIELD_DISPLAY_NAME, boatClass.getDisplayName());
final BoatClassMasterdata masterData = BoatClassMasterdata.resolveBoatClass(boatClass.getDisplayName());
if (masterData != null) {
result.put(FIELD_ICON_URL, "/gwt/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/"+masterData.name().replaceAll("^_", "")+".png");
aliasNames.addAll(Arrays.asList(masterData.getAlternativeNames()));
}
}
result.put(FIELD_ALIAS_NAMES, aliasNames);
return result;
java/target/env.sh
+1 -1
View File
@@ -123,7 +123,7 @@ else
JAVA_VERSION_SPECIFIC_ARGS=$JAVA_8_ARGS
fi
echo JAVA_VERSION_SPECIFIC_ARGS are: $JAVA_VERSION_SPECIFIC_ARGS
ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -XX:MaxGCPauseMillis=500"
ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -Drestore.tracked.races=true -XX:MaxGCPauseMillis=500"
# options for use with SAP JVM only:
if "$JAVA_BINARY" -version 2>&1 | grep -q "SAP Java"; then
echo SAP JVM detected
java/target/start
+1 -1
View File
@@ -23,7 +23,7 @@ if [[ ! -d "$JAVA_HOME" ]]; then
fi
# disable AWT requiring X11 and the correct DISPLAY variable setting; failing to do so
# can result in trouble generating QR codes in the back-end
ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Djava.awt.headless=true"
ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Djava.awt.headless=true -Xms$MEMORY"
PLATFORM=`uname`
SED_ARGS="-i"
if [[ $PLATFORM == "Darwin" ]]; then