Commit Graph
130 Commits
Author SHA1 Message Date
Axel Uhl eab00350a5 moved race result enabling from AppPreferences to regatta-specific, racing procedure type-specific preference
Change-Id: I3400cd868528388bd741e1798a58c820903ea665
2016-04-05 20:54:46 +02:00
Axel Uhl 461e08a0a8 moved serialized to .android.shared so Buoy Pinging app can see them
Change-Id: I52ebc9fa121b6223575f746bd90a723175b8d491
2016-03-30 13:42:25 +02:00
Steffen Schaefer 4b1d2e1567 Removed legacy JSON (de)serialization for event media 2016-03-02 11:10:49 +01:00
Steffen Schaefer 83c7e4a197 Removed legacy JSON deserialization for EventBase.sailorsInfoWebsiteURL 2016-03-02 08:47:26 +01:00
Steffen Schaefer 054d289fce Removed legacy JSON serialization for sailorsInfoWebsiteURL 2016-03-01 13:56:42 +01:00
Axel Uhl c61a38cdc4 more formatting changes
Change-Id: I77395e834600c312a55203d637abe6eea958d637
2016-02-29 14:59:16 +01:00
Axel Uhl 16fdbdb658 more code formatting
Change-Id: I5a67cda91b67381e7cd6fb0b81bdb558eb48f947
2016-02-29 14:32:46 +01:00
Steffen Schaefer bc69d9a727 Ensuring a consistent method naming 2016-02-24 13:13:57 +01:00
Steffen Schaefer 0572787c8e Added TODOs regarding Locale handling in JSON (de)serialization 2016-02-24 13:13:47 +01:00
Steffen Schaefer e23885f870 Adjusted JSON (de)serializer to handle multiple sailorsInfoWebsiteURLs 2016-02-24 13:13:43 +01:00
Axel Uhl 27fcba4ea6 fixing issue with direct de-serialization from a JSONObject produced not by reading from String but by serialization;
Serialization adds an Integer object to the JSONObject which cannot be cast to a Long. Reading from string
produces a Long. Solution: cast to Number, then use intValue()
2016-01-27 20:10:50 +01:00
Axel Uhl 9087d12118 fetch rank and cast to Long because JSONObject doesn't know Integer
Change-Id: I47c2cc5e32ae8ad38bd93927b90564839a21870a
2016-01-27 10:05:08 +01:00
Axel Uhl f57aed7de6 Merge branch 'master' into bug3420
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java

Change-Id: I7347ab0c849aa43f08eebca569c884b6986bf6d0
2016-01-22 15:39:16 +01:00
Axel Uhl 3f80eaf66b also factored the commonalities of the *serializers* for the RaceLogFinishPositioningEvent types
Change-Id: I58eaf0b8c109c6113b3ced1982b1877885b78f2d
2016-01-19 20:42:45 +01:00
Axel Uhl 3095adc8ee as suggested by bug 3420 comment #2, refactors common parts of RaceLogFinishPositioning deserialization in gateway bundle
Change-Id: I13819430107ef932f5fab433164ec9316f5e78d5
2016-01-19 20:30:33 +01:00
Axel Uhl 053268e0d5 enhanced RaceLogFinishPositioningConfirmedEvent and RaceLogFinishPositioningListChangedEvent by fields for score, rank, comment and finishing time
Change-Id: Ib751beb081a1eecfe462919eaa3ce6ea71e56cd3
2016-01-19 19:57:15 +01:00
Axel Uhl 7216a8cee5 Merge branch 'master' into bug2851 2016-01-13 09:52:31 +01:00
Jan Broß 2a9c674172 Refactorings as Mapping Events are from now on only present on RegattaLog 2015-12-10 19:00:36 +01:00
Jan Broß cf4c7ec95c Removes RaceLogDevicMarkMapping (bug2851) 2015-12-10 18:07:06 +01:00
Jan Broß 7414026cde Removes RaceLogDeviceCompetitorMapping (bug2851) 2015-12-10 18:00:27 +01:00
Jan Broß d456eecfb2 Remove RaceLogCloseOpenEndedDeviceMappingEvent 2015-12-10 15:23:38 +01:00
Jan Broß 0378664357 Removes RaceLogDefineMarkEvent 2015-12-07 14:18:31 +01:00
Jan Broß 6b43e9004c Merge bug3212 in bug2851 2015-12-04 12:39:38 +01:00
Steffen Schaefer fca622efa7 Merge branch 'master' into android-maven-build-bug3190
Conflicts:
	java/com.sap.sailing.domain.common/pom.xml
	java/com.sap.sailing.domain.shared.android/pom.xml
	java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml
	java/com.sap.sse.common/pom.xml
	java/com.sap.sse.datamining.annotations/pom.xml
	java/com.sap.sse.security.common/pom.xml
	java/org.json.simple/pom.xml
	java/pom.xml
	mobile/com.sap.sailing.android.shared/pom.xml
	mobile/com.sap.sailing.racecommittee.app/pom.xml
	mobile/pom.xml
	pom.xml
2015-11-30 15:02:06 +01:00
Steffen Schaefer 3c25092bc5 Consistently using spaces for intendiation in several POMs 2015-11-30 14:55:28 +01:00
Jan Broß 2906902a9a Merge master into bug2851 2015-11-28 15:55:44 +01:00
Steffen Schaefer 5cc6d15184 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-25 08:41:04 +01:00
Steffen Schaefer fc8a893e8c Maven profiles can only be copntrolled by system properties and not
Maven properties of a parent POM. The presence of the "ldi.releaseBuild"
is a good match for the activation conditions of "with-mobile" and
"with-not-android-relevant". It currently seems that in
buildAndUpdataProduct.sh the profiles are correctly activated and
deactivated. So this could also correctly work for local builds.
2015-11-24 14:47:13 +01:00
Steffen Schaefer 7248728674 Changed the activation of "with-mobile" and "with-not-android-relevant"
profiles based on a new property "mobile.build.is.default" so that no
changes are needed for this on the release branch
2015-11-24 14:01:17 +01:00
Steffen Schaefer d8b9014d03 Moved media model and util to com.sap.sse.shared.android project because
this is only shared between backend and android but not usable in GWT UI
2015-11-24 11:40:32 +01:00
Jan Broß 4addae99f1 Use fully qualified classname and ignore deprecation warnings 2015-11-23 14:39:59 +01:00
Jan Broß 07d999cc9e Merge master into bug2851 2015-11-18 18:20:10 +01:00
Steffen Schaefer f63f1c9039 Removed unused maven config that was moved to the parent POM 2015-11-16 08:25:01 +01:00
Steffen Schaefer b021f2d14b Consistently using targetSdkVersion 22 in all AndroidManifest.xml files 2015-11-11 13:34:21 +01:00
Steffen Schaefer 8de15d028e Profile with-mobile isn't active by default for more projects 2015-11-11 11:32:30 +01:00
Steffen Schaefer 29eae8056e Revert "upgraded versions to 1.1.0"
This reverts commit 08ecfb3014.
2015-11-10 17:10:14 +01:00
Steffen Schaefer 308aa245d3 Merge remote-tracking branch 'origin/master' into
android-maven-build-bug3190

Conflicts:
	java/com.sap.sailing.gwt.ui/pom.xml
2015-11-10 10:06:39 +01:00
Fredrik Teschke 9fcf600326 add fix for failing RaceLogStartTimeEvent deserialization 2015-11-09 19:07:18 +01:00
Steffen Schaefer ec138b66c8 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-05 17:11:49 +01:00
Jan Broß f36c072247 Merge branch master in bug2851 2015-11-04 13:36:29 +01:00
Fredrik Teschke 817bb285c7 more housekeeping on RaceLog*Events 2015-11-02 23:09:42 +01:00
Fredrik Teschke f8fbbb35dc remove RaceLogEvent[Restore]Factory and RaceLogEvent* housekeeping
- the factories were not used for any factory purposes, and only resulted in maintenance effort
- unified order of constructor parameters for LogEvent-classes
- standard values for an event-id and createdAt-timestamp are now set once in base classes, instead
  of all over the place
2015-11-02 22:06:42 +01:00
Jan Broß 4fc784a46a Fixes compile error 2015-10-31 15:39:52 +01:00
Jan Broß d32839fcab Implements competitor regsitration behavior described in bug2851 2015-10-31 15:32:12 +01:00
Axel Uhl 08ecfb3014 upgraded versions to 1.1.0 2015-10-23 13:01:48 +02:00
Steffen Schaefer f0f227c3b7 Revert "with-mobile profile isn't active by default anymore so building the webapp without apps is the default"
This reverts commit 90df750312.
2015-10-06 08:50:14 +02:00
Steffen Schaefer 90df750312 with-mobile profile isn't active by default anymore so building the
webapp without apps is the default
2015-10-06 08:37:26 +02:00
Papick Garcia Taboada 60c7462fca Moved mobile build aar configuration into java parent pom 2015-09-29 15:52:05 +02:00
Steffen Schaefer 28c95a5b3f Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-09-23 10:57:57 +02:00
Steffen Schaefer e07f93a226 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-09-22 13:25:01 +02:00