Merge branch 'bug2572' into android_apps

2026-11-01 08:40:52 +00:00 · 2015-01-14 17:02:18 +01:00
commit c580c10f89
@@ -18,4 +18,13 @@ build
 java/com.sap.sailing.simulator/bin/com/sap/sailing/simulator/Simulator.gwt.xml
 /mobile/com.sap.sailing.racecommittee.app/res/values/keys.xml
 java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
-java/com.sap.sailing.gwt.ui/SailingGWT.launch
+java/com.sap.sailing.gwt.ui/SailingGWT.launch
+
+## Android Studio and Intellij and Android in general
+gen/
+.idea/
+*.ipr
+*.iws
+*.iml
+out/
+.gradle
@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+
+    version = "1.0-SNAPSHOT"
+}
@@ -80,7 +80,7 @@ testing=1
 clean="clean"
 offline=0
 proxy=0
-android=1
+android=0
 reporting=0
 suppress_confirmation=0
 extra=''
@@ -93,7 +93,7 @@ if [ $# -eq 0 ]; then
    echo "-g Disable GWT compile, no gwt files will be generated, old ones will be preserved."
    echo "-b Build GWT permutation only for one browser and English language."
    echo "-t Disable tests"
-    echo "-a Disable mobile projects (RaceCommittee App, e.g., in case no AndroidSDK is installed)"
+    echo "-a Enable mobile projects (RaceCommittee App, e.g., in case no AndroidSDK is installed)"
    echo "-r Enable generating surefire test reports"
    echo "-o Enable offline mode (does not work for tycho surefire plugin)"
    echo "-c Disable cleaning (use only if you are sure that no java file has changed)"
@@ -153,7 +153,7 @@ do
        o) offline=1;;
        c) clean="";;
        p) proxy=1;;
-        a) android=0;;
+        a) android=1;;
        r) reporting=1;;
        m) MAVEN_SETTINGS=$OPTARG;;
        n) OSGI_BUNDLE_NAME=$OPTARG;;
@@ -0,0 +1,7 @@
+apply plugin: "java"
+
+sourceSets {
+    main {
+        java.srcDirs = ["src"]
+    }
+}
@@ -0,0 +1,13 @@
+apply plugin: "java"
+
+sourceSets {
+    main {
+        java.srcDirs = ["src"]
+    }
+}
+
+dependencies {
+    /* local dependencies */
+    compile project(":java:com.sap.sse.common")
+    compile project(":java:com.sap.sse.datamining.shared")
+}
@@ -11,9 +11,10 @@ Require-Bundle: com.sap.sse.mongodb,
 com.mongodb.driver;bundle-version="2.6.2",
 com.sap.sailing.domain.common,
 com.sap.sailing.domain.shared.android,
- com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
+ com.sap.sailing.server.gateway.serialization,
 com.sap.sse.common,
- com.sap.sse
+ com.sap.sse,
+ com.sap.sailing.server.gateway.serialization.shared.android
 Export-Package: com.sap.sailing.domain.persistence,
 com.sap.sailing.domain.persistence.impl;
  x-friends:="com.sap.sailing.domain.persistence.test,
@@ -16,5 +16,6 @@ Require-Bundle: com.sap.sailing.domain.shared.android,
 org.mockito.mockito-core;bundle-version="1.9.5",
 org.hamcrest;bundle-version="1.1.0",
 org.junit4;bundle-version="4.8.2",
- com.sap.sse.common
+ com.sap.sse.common,
+ com.sap.sailing.server.gateway.serialization.shared.android
 Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
@@ -16,7 +16,8 @@ Require-Bundle: com.sap.sailing.domain,
 com.mongodb.driver,
 com.sap.sse.common,
 com.sap.sse.replication,
- com.sap.sse
+ com.sap.sse,
+ com.sap.sailing.server.gateway.serialization.shared.android
 Import-Package: com.mongodb,
 javax.servlet;version="2.6.0",
 org.json.simple,
@@ -0,0 +1,13 @@
+apply plugin: "java"
+
+sourceSets {
+    main {
+        java.srcDirs = ["src"]
+    }
+}
+
+dependencies {
+    /* local dependencies */
+    compile project(":java:com.sap.sailing.domain.common")
+    compile project(":java:com.sap.sse.common")
+}
@@ -18,6 +18,7 @@ Require-Bundle: com.sap.sailing.domain,
 org.junit4;bundle-version="4.8.2",
 org.json.simple;bundle-version="1.1.0",
 com.sap.sse.common,
- com.sap.sse.replication
+ com.sap.sse.replication,
+ com.sap.sse
 Export-Package: com.sap.sailing.domain.test,
 com.sap.sailing.domain.test.mock
@@ -10,8 +10,9 @@ Require-Bundle: com.sap.sailing.domain,
 com.googlecode.java-diff-utils;bundle-version="1.3.0",
 com.sap.sailing.domain.common,
 com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
- com.sap.sse, 
- com.sap.sse.common
+ com.sap.sse,
+ com.sap.sse.common,
+ com.sap.sailing.server.gateway.serialization.shared.android
 Export-Package: com.sap.sailing.domain.tractracadapter,
 com.sap.sailing.domain.tractracadapter.impl;
  x-friends:="com.sap.sailing.domain.test,
@@ -36,5 +36,4 @@ Require-Bundle: com.googlecode.java-diff-utils;bundle-version="1.3.0",
 com.sap.sailing.geocoding,
 com.sap.sse.datamining.shared;bundle-version="1.0.0",
 com.sap.sse.common,
- com.sap.sse,
- com.sap.sse.replication
+ com.sap.sse
@@ -0,0 +1,16 @@
+apply plugin: "java"
+
+sourceSets {
+    main {
+        java.srcDirs = ["src"]
+    }
+}
+
+dependencies {
+    /* local dependencies */
+    compile project(":java:com.googlecode.java-diff-utils")
+    compile project(":java:com.sap.sailing.domain.common")
+    compile project(":java:com.sap.sailing.domain.shared.android")
+    compile project(":java:com.sap.sailing.geocoding")
+    compile project(":java:com.sap.sse.replication")
+}
@@ -23,7 +23,7 @@ import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
 import com.sap.sse.common.IsManagedByCache;
 import com.sap.sse.common.TimePoint;
-import com.sap.sse.replication.impl.ObjectInputStreamResolvingAgainstCache;
+import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;

 public interface DomainFactory extends SharedDomainFactory {
    /**
@@ -60,7 +60,7 @@ import com.sap.sailing.geocoding.ReverseGeocoder;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
-import com.sap.sse.replication.impl.ObjectInputStreamResolvingAgainstCache;
+import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;

 public class DomainFactoryImpl extends SharedDomainFactoryImpl implements DomainFactory {
    private static Logger logger = Logger.getLogger(DomainFactoryImpl.class.getName());
@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;

 import com.sap.sailing.domain.base.DomainFactory;
-import com.sap.sse.replication.impl.ObjectInputStreamResolvingAgainstCache;
+import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;

 public class ObjectInputStreamResolvingAgainstDomainFactoryImpl extends ObjectInputStreamResolvingAgainstCache<DomainFactory> {
    ObjectInputStreamResolvingAgainstDomainFactoryImpl(InputStream in, DomainFactory domainFactory) throws IOException {
@@ -16,7 +16,7 @@ public class BaseRegattaLikeImpl implements IsRegattaLike {
    private final RegattaLikeIdentifier identifier;
    private transient Set<RegattaLikeListener> listeners = new HashSet<>();
    
-    public BaseRegattaLikeImpl(RegattaLikeIdentifier identifier, RegattaLogStore store) {
+    public BaseRegattaLikeImpl(final RegattaLikeIdentifier identifier, RegattaLogStore store) {
        regattaLog = store.getRegattaLog(identifier, /*ignoreCache*/ true);
        this.identifier = identifier;
        
@@ -381,4 +381,18 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
         version="0.0.0"
         unpack="false"/>

+   <plugin
+         id="com.sap.sailing.server.gateway.serialization.shared.android"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sap.sailing.server.gateway.serialization"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
@@ -0,0 +1,14 @@
+apply plugin: "java"
+
+sourceSets {
+    main {
+        java.srcDirs = ["src"]
+    }
+}
+
+dependencies {
+    compile "com.googlecode.json-simple:json-simple:1.1.1"
+
+    /* local dependencies */
+    compile project(":java:com.sap.sailing.domain.common")
+}
@@ -81,12 +81,14 @@ public class PolarDataServiceImpl implements PolarDataService {
        //return polarDataMiner.estimateTrueWindSpeedAndAngleCandidates(boatClass, speedOverGround, legType, tack);
    }

-    private void solveAndAddResults(Set<SpeedWithBearingWithConfidence<Void>> result, CubicEquation upWindEquation, int angle) {
-        double[] windSpeedCandidates = upWindEquation.solve();
+    private void solveAndAddResults(Set<SpeedWithBearingWithConfidence<Void>> result, CubicEquation equation, int angle) {
+        double[] windSpeedCandidates = equation.solve();
        for (int i = 0; i < windSpeedCandidates.length; i++) {
            double windSpeedCandidateInKnots = windSpeedCandidates[i] > 0 ? windSpeedCandidates[i] : 0;
-            result.add(new SpeedWithBearingWithConfidenceImpl<Void>(new KnotSpeedWithBearingImpl(
-                    windSpeedCandidateInKnots, new DegreeBearingImpl(angle)), 0.00001, null));
+            if (windSpeedCandidateInKnots < 40) {
+                result.add(new SpeedWithBearingWithConfidenceImpl<Void>(new KnotSpeedWithBearingImpl(
+                        windSpeedCandidateInKnots, new DegreeBearingImpl(angle)), 0.00001, null));
+            }
        }
    }

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sailing.server.gateway.serialization.shared.android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Android
+Bundle-SymbolicName: com.sap.sailing.server.gateway.serialization.shared.android
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: com.sap.sailing.domain.common,
+ com.sap.sailing.domain.shared.android,
+ org.json.simple;bundle-version="1.1.0",
+ com.sap.sse.common
+Export-Package: com.sap.sailing.server.gateway.deserialization,
+ com.sap.sailing.server.gateway.deserialization.coursedata.impl,
+ com.sap.sailing.server.gateway.deserialization.impl,
+ com.sap.sailing.server.gateway.deserialization.racegroup.impl,
+ com.sap.sailing.server.gateway.deserialization.racelog.impl,
+ com.sap.sailing.server.gateway.serialization,
+ com.sap.sailing.server.gateway.serialization.coursedata.impl,
+ com.sap.sailing.server.gateway.serialization.impl,
+ com.sap.sailing.server.gateway.serialization.racegroup.impl,
+ com.sap.sailing.server.gateway.serialization.racelog.impl,
+ com.sap.sailing.server.gateway.serialization.racelog.tracking,
+ com.sap.sailing.server.gateway.serialization.racelog.tracking.impl
+Bundle-ActivationPolicy: lazy
@@ -0,0 +1,16 @@
+apply plugin: "java"
+
+sourceSets {
+    main {
+        java.srcDirs = ["src"]
+    }
+}
+
+dependencies {
+    compile "com.googlecode.json-simple:json-simple:1.1.1"
+
+    /* local dependencies */
+    compile project(":java:com.sap.sailing.domain.common")
+    compile project(":java:com.sap.sailing.domain.shared.android")
+    compile project(":java:com.sap.sse.common")
+}
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sailing.server.gateway.serialization.shared.android</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+		<plugin>
+			<groupId>org.eclipse.tycho</groupId>
+			<artifactId>tycho-compiler-plugin</artifactId>
+			<version>${tycho-version}</version>
+			<configuration>
+				<source>1.6</source>
+				<target>1.6</target>
+			</configuration>
+		</plugin>
+	</plugins>
+  </build>
+</project>