Merge branch 'ubilabs--rcapp--master' into ubilabs--tracking_app--develop

2026-10-25 05:23:51 +00:00 · 2015-06-11 10:07:09 +02:00
commit 78955f3ac2
@@ -33,3 +33,4 @@ out/
 local.properties
 git.xml
 build.info
+mobile/github-advrecyclerview_lib/bin
@@ -2,7 +2,7 @@

 buildscript {
    repositories {
-        mavenCentral()
+        jcenter()
    }

    dependencies {
@@ -12,9 +12,11 @@ buildscript {

 allprojects {
    repositories {
-        mavenCentral()
+        jcenter()
    }
+
    version = "1.0.0-SNAPSHOT"
+
    tasks.withType(JavaCompile) { 
 	    sourceCompatibility = "1.7"
 	    targetCompatibility = "1.7"
@@ -633,7 +633,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
        extra="$extra -Dtracking-app-version=$TRACKING_APP_VERSION"

        NOW=$(date +"%s")
-        BUILD_TOOLS=22.0.0
+        BUILD_TOOLS=22.0.1
        TARGET_API=22
        TEST_API=18
        ANDROID_ABI=armeabi-v7a
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
@@ -43,5 +43,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-superDevMode -incremental -war &quot;${project_loc:com.sap.sailing.dashboards.gwt}&quot; -startupUrl /dashboards/RibDashboard.html -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9998 com.sap.sailing.dashboards.gwt.RibDashboard"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.dashboards.gwt"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xmx2048m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2048m"/>
 </launchConfiguration>
@@ -12,8 +12,10 @@ public enum Flags {
    GOLF,
    HOTEL,
    INDIA,
+    INDIA_ZULU, // the flag combination of I+Z flown at the same time
    NOVEMBER,
    PAPA,
+    UNIFORM,
    XRAY,
    ZULU,
    FIRSTSUBSTITUTE,
@@ -11,7 +11,7 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType;

 public class RRS26StartModeFlagFinder extends RaceLogAnalyzer<Flags> {

-    private final static List<Flags> defaultStartModeFlags = Arrays.asList(Flags.PAPA, Flags.ZULU, Flags.BLACK, Flags.INDIA);
+    private final static List<Flags> defaultStartModeFlags = Arrays.asList(Flags.PAPA, Flags.ZULU, Flags.BLACK, Flags.INDIA, Flags.UNIFORM, Flags.INDIA_ZULU);
    
    private final RacingProcedureTypeAnalyzer procedureAnalyzer;
    private final List<Flags> startModeFlags;
@@ -81,10 +81,8 @@ public class RaceStateChangedListeners extends HashSet<RaceStateChangedListener>

    @Override
    public void onWindFixChanged(ReadonlyRaceState state) {
-        // TODO Auto-generated method stub
-        
+        for (RaceStateChangedListener listener : this) {
+            listener.onWindFixChanged(state);
+        }
    }
-    
-    
-
 }
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
 entryPointModules=
 filesCopiedToWebInfLib=gwt-servlet.jar
-gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDQgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC51aS5BZG1pbkNvbnNvbGU8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc2FpbGluZy5nd3QudWkuTGVhZGVyYm9hcmQ8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc2FpbGluZy5nd3QudWkuTGVhZGVyYm9hcmRFZGl0aW5nPC9lbnRyeS1wb2ludC1tb2R1bGU+PGVudHJ5LXBvaW50LW1vZHVsZT5jb20uc2FwLnNhaWxpbmcuZ3d0LnVpLlJhY2VCb2FyZDwvZW50cnktcG9pbnQtbW9kdWxlPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC51aS5TcGVjdGF0b3I8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc2FpbGluZy5nd3QudWkuRGF0YU1pbmluZzwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
+gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDQgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC5yZWdhdHRhb3ZlcnZpZXcuUmVnYXR0YU92ZXJ2aWV3PC9lbnRyeS1wb2ludC1tb2R1bGU+PC9nd3QtY29tcGlsZS1zZXR0aW5ncz4\=
@@ -54,7 +54,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosuperDevMode -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/Home.html com.sap.sailing.gwt.ui.Search -startupUrl /gwt/Home.html com.sap.sailing.gwt.Home -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/PolarSheets.html com.sap.sailing.gwt.ui.PolarSheets -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.regattaoverview.RegattaOverview -startupUrl /gwt/DataMining.html com.sap.sailing.gwt.ui.DataMining -startupUrl /gwt/Simulator.html com.sap.sailing.gwt.ui.Simulator com.sap.sailing.gwt.ui.VideoPopup"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosuperDevMode -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/Home.html com.sap.sailing.gwt.ui.Search -startupUrl /gwt/Home.html com.sap.sailing.gwt.Home -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/PolarSheets.html com.sap.sailing.gwt.ui.PolarSheets -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.ui.RegattaOverview -startupUrl /gwt/DataMining.html com.sap.sailing.gwt.ui.DataMining -startupUrl /gwt/Simulator.html com.sap.sailing.gwt.ui.Simulator com.sap.sailing.gwt.ui.VideoPopup"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2048m -XX:MaxPermSize=512m -Xdebug -Xrunjdwp:transport=dt_socket,address=7999,server=y"/>
 </launchConfiguration>
@@ -32,8 +32,10 @@ public class FlagImageResolver {
        flagImageMap.put(Flags.GOLF, resources.flagGolf());
        flagImageMap.put(Flags.HOTEL, resources.flagHotel());
        flagImageMap.put(Flags.INDIA, resources.flagIndia());
+        flagImageMap.put(Flags.INDIA_ZULU, resources.flagIndiaZulu());
        flagImageMap.put(Flags.NOVEMBER, resources.flagNovember());
        flagImageMap.put(Flags.PAPA, resources.flagPapa());
+        flagImageMap.put(Flags.UNIFORM, resources.flagUniform());
        flagImageMap.put(Flags.XRAY, resources.flagXray());
        flagImageMap.put(Flags.ZULU, resources.flagZulu());
    }
@@ -14,13 +14,13 @@ public class FlagsMeaningExplanator {
            return stringMessages.papaDisplayed();
        } else if (upperFlag.equals(Flags.BLACK) && displayed) {
            return stringMessages.blackDisplayed();
-        } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA)) && displayed) {
+        } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA) || upperFlag.equals(Flags.INDIA_ZULU) || upperFlag.equals(Flags.UNIFORM)) && displayed) {
            return stringMessages.zuluIndiaDisplayed();
        } else if (upperFlag.equals(Flags.PAPA) && !displayed) {
            return stringMessages.papaRemoved();
        } else if (upperFlag.equals(Flags.BLACK) && !displayed) {
            return stringMessages.blackRemoved();
-        } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA)) && !displayed) {
+        } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA) || upperFlag.equals(Flags.INDIA_ZULU) || upperFlag.equals(Flags.UNIFORM)) && !displayed) {
            return stringMessages.zuluIndiaRemoved();
        } else if (upperFlag.equals(Flags.CLASS) && !displayed) {
            return stringMessages.classFlagRemoved();
@@ -43,12 +43,18 @@ interface RegattaRaceStatesFlagsResources extends ClientBundle {
    @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india.png")
    ImageResource flagIndia();
    
+    @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india_zulu.png")
+    ImageResource flagIndiaZulu();
+    
    @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/november.png")
    ImageResource flagNovember();
    
    @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/papa.png")
    ImageResource flagPapa();
    
+    @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/uniform.png")
+    ImageResource flagUniform();
+    
    @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/whiskey.png")
    ImageResource flagWhiskey();
    
@@ -387,21 +387,17 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
    @Override
    protected RegattaConfigurationDTO getResult() {
        DeviceConfigurationDTO.RegattaConfigurationDTO result = new DeviceConfigurationDTO.RegattaConfigurationDTO();
-
        int index = racingProcedureListBox.getSelectedIndex();
        if (index >= 0) {
            RacingProcedureType type = RacingProcedureType.valueOf(racingProcedureListBox.getValue(index));
            result.defaultRacingProcedureType = type == RacingProcedureType.UNKNOWN ? null : type;
        }
-
        result.defaultRacingProcedureType = getSelectedRacingProcedure();
-
        index = designerModeEntryListBox.getSelectedIndex();
        if (index >= 0) {
            CourseDesignerMode mode = CourseDesignerMode.valueOf(designerModeEntryListBox.getValue(index));
            result.defaultCourseDesignerMode = mode == CourseDesignerMode.UNKNOWN ? null : mode;
        }
-
        if (rrs26EnabledBox.getValue()) {
            result.rrs26Configuration = new DeviceConfigurationDTO.RegattaConfigurationDTO.RRS26ConfigurationDTO();
            getRacingProcedureConfigurationResults(result.rrs26Configuration, rrs26ClassFlagListBox, rrs26RecallBox);
@@ -4,7 +4,6 @@ import java.io.Serializable;

 import com.sap.sailing.domain.common.Position;

-
 public class WindLatticeDTO implements Serializable {

 	/**
@@ -4,7 +4,6 @@ import java.io.Serializable;

 import com.sap.sailing.domain.common.Position;

-
 public class WindLatticeGenParamsDTO implements Serializable {

 	/**
@@ -3,9 +3,10 @@ package com.sap.sailing.gwt.ui.shared.dispatch;
 import java.util.Date;
 import java.util.Locale;

+import com.google.gwt.core.shared.GwtIncompatible;
 import com.sap.sailing.server.RacingEventService;

-
+@GwtIncompatible
 public class DispatchContextImpl implements DispatchContext {
    private final RacingEventService racingEventService;
    private final Date currentClientTime;
@@ -1,10 +1,12 @@
 package com.sap.sailing.gwt.ui.shared.dispatch.event;

+import com.google.gwt.core.shared.GwtIncompatible;
 import com.sap.sailing.gwt.ui.shared.dispatch.event.RacesActionUtil.RaceCallback;
 import com.sap.sailing.gwt.ui.shared.race.RaceMetadataDTO.RaceTrackingState;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;

+@GwtIncompatible
 public class NextRaceFinder implements RaceCallback {
    
    private final TimePoint now = MillisecondsTimePoint.now();
@@ -95,7 +95,5 @@
 	<source path='regattaoverview' />
 	<source path='ui/leaderboard'/>

-	
  	<entry-point class='com.sap.sailing.gwt.home.client.HomeEntryPoint' />
-	
 </module>
@@ -23,6 +23,7 @@ import com.sap.sse.common.Util.Pair;
 */
 public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer implements
        JsonDeserializer<Pair<UUID, List<GPSFixMoving>>> {
+    public static final String ACCURACY = "accuracy";

    @Override
    public Pair<UUID, List<GPSFixMoving>> deserialize(JSONObject object) throws JsonDeserializationException {
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'

 android {
-    buildToolsVersion "22.0.0"
+    buildToolsVersion "22.0.1"
    compileSdkVersion 22

    defaultConfig {
@@ -35,7 +35,7 @@ android {

 dependencies {
    /* support libraries */
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:appcompat-v7:22.1.1'

    /* local dependencies */
    compile project(':java:com.sap.sailing.domain.common')
@@ -45,7 +45,7 @@ dependencies {
    compile project(':java:org.json.simple')

    /* Google Play Services */
-    compile "com.google.android.gms:play-services-location:6.5.87"
+    compile "com.google.android.gms:play-services-location:7.3.0"
    /* all local jar-libs */
    compile fileTree(dir: "libs", include: ["*.jar"])
 }
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <!-- Reason: Eclipse users don't get the override -->
+    <issue id="GradleOverrides">
+        <ignore path="AndroidManifest.xml" />
+    </issue>
+
 </lint>
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

 # Project target.
-target=Google Inc.:Google APIs:21
+target=Google Inc.:Google APIs:22
 android.library=true

 android.library.reference.1=../google-android-support-v7-appcompat_lib