Merge branch 'master' into bug1562

2026-10-16 09:11:02 +00:00 · 2015-01-15 17:51:41 +01:00
commit ee2424957d
@@ -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,
@@ -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,
@@ -22,8 +22,8 @@ import com.sap.sailing.domain.tracking.MarkPassing;
 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.ObjectInputStreamResolvingAgainstCache;
 import com.sap.sse.common.TimePoint;
+import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;

 public interface DomainFactory extends SharedDomainFactory {
    /**
@@ -57,10 +57,10 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
 import com.sap.sailing.domain.tracking.impl.MarkPassingImpl;
 import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl;
 import com.sap.sailing.geocoding.ReverseGeocoder;
-import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+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.common.ObjectInputStreamResolvingAgainstCache;
+import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;

 public class ObjectInputStreamResolvingAgainstDomainFactoryImpl extends ObjectInputStreamResolvingAgainstCache<DomainFactory> {
    ObjectInputStreamResolvingAgainstDomainFactoryImpl(InputStream in, DomainFactory domainFactory) throws IOException {
@@ -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>
@@ -67,7 +67,9 @@ public class StartActivity extends AbstractActivity {
            }
        }
        Collections.sort(featuredEvents, new FeaturedEventsComparator());
-        featuredEvents = featuredEvents.subList(0, MAX_STAGE_EVENTS);
+        if(featuredEvents.size() > MAX_STAGE_EVENTS) {
+            featuredEvents = featuredEvents.subList(0, MAX_STAGE_EVENTS);
+        }
        view.setFeaturedEvents(featuredEvents);
        Collections.sort(recentEventsOfLast12Month, new Comparator<EventBaseDTO>() {
            @Override
@@ -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,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>
@@ -0,0 +1,21 @@
+package com.sap.sailing.server.gateway.serialization.impl;
+
+/**
+ * So far only holds the constants required to assemble a JSON object properly. The challenge for this serializer is
+ * that it shall run on Android where so far we don't have GPSFixMoving or any of its implementing classes as they are
+ * part of <code>com.sap.sailing.comain</code> which is not available on Android. So the Android apps that want to
+ * target <code>FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer</code> need to assemble a compatible JSON string by
+ * themselves, using the constants from here.
+ * 
+ * @author Axel Uhl (D043530)
+ *
+ */
+public class FlatSmartphoneUuidAndGPSFixMovingJsonSerializer {
+    public static final String DEVICE_UUID = "deviceUuid";
+    public static final String FIXES = "fixes";
+    public static final String LON_DEG = "longitude";
+    public static final String LAT_DEG = "latitude";
+    public static final String TIME_MILLIS = "timestamp";
+    public static final String SPEED_M_PER_S = "speed";
+    public static final String BEARING_DEG = "course";
+}