Steffen Schäfer
a83bdf1bde
Merge branch 'master' into bug4100
2017-05-16 11:06:01 +02:00
Steffen Schaefer
9123771f34
normalized line endings
2017-05-16 09:42:02 +02:00
Steffen Schaefer
0405bde777
Implemented serialization of value collections as diff
2017-05-15 14:46:41 +02:00
Steffen Schaefer
0fa0e3cb6a
Merge branch 'master' into bug3529
2017-02-06 11:58:09 +01:00
Steffen Schaefer
1633275af0
Added more convenience methods to LockUtil for cases where you need to
...
return a value while being under a lock
2017-01-31 10:10:37 +01:00
Kai Boernert
3daa58a1e3
Added new way of persisting that modifies the json directly, keeping parts of non existant components
...
Merge branch 'bug3961' of ssh://trac@sapsailing.com/home/trac/git into bug3961
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
2017-01-26 14:52:39 +01:00
Steffen Schaefer
6b78371fe3
Extended serializable settings framework by adding SettingsMap to be
...
able to make Component/Perspective framework work with serializable
settings
2016-09-20 17:42:14 +02:00
Raimund Wege
513a3de260
Merged master into ubilabs--ios--develop
2016-09-08 14:49:29 +02:00
Steffen Schaefer
8406ac762b
Bug 3875: Using a lock object for accessing knownRegattaLogs in
...
RegattaLogDeviceMappings instead of using synchronized
2016-08-15 16:53:42 +02:00
Steffen Schaefer
33e6ec018c
Exporting the SettingsToJsonSerializer from com.sap.sse.shared.android
...
to make it accessible in other bundles
2016-07-01 12:01:23 +02:00
Steffen Schaefer
6a81ebd0d9
SettingsToJsonSerializer can now directly (de)serialize from/to Strings
...
Changed the test accordingly
2016-07-01 12:00:27 +02:00
Steffen Schaefer
38affe46a7
Introduced a specific superclass for generic serializable settings and
...
moved all related classes to a specific subpackage
2016-06-30 14:23:18 +02:00
Benjamin Barth
480544df7a
Merge remote-tracking branch 'origin/master' into bug2775
2016-06-09 16:32:49 +02:00
Benjamin Barth
f99161408d
Rollback UrlHelper query string encoding behavior concerning whitespaces
2016-05-19 11:25:08 +02:00
Benjamin Barth
4375f025b3
Adjusted UrlHelper query string encoding behavior concerning whitespaces
2016-05-19 10:31:31 +02:00
Axel Uhl
8bc9b3222d
cleaned up the escaping of URL parameters for assembling the links sent in e-mails for smartphone tracking sign-up
...
Change-Id: I4d101e0e7e116c4c08f04f52eda8e782242910ed
2016-04-27 10:46:01 +02:00
Steffen Schaefer
5bc2a5ed9d
bug 2775: Added some JavaDocs to the central classes of the Settings
...
framework
2016-03-16 17:51:58 +01:00
Steffen Schaefer
efd134dbd9
bug 2775: Introduced Set based settings
2016-03-16 09:36:59 +01:00
Steffen Schaefer
c651316031
Moved SettingsToJsonSerializer to com.sap.sse.shared.android and added
...
com.sap.sse.shared.android.test
2016-03-15 15:02:07 +01:00
Steffen Schaefer
142505760d
bug 2775: Added org.json.simple dependency to com.sap.sse.shared.android
...
to make an implementation of the JSON serializer possible here
2016-03-15 15:00:38 +01:00
Axel Uhl
63e6374aa8
enhanced Javadoc for CopyOnWriteHashMap
...
Change-Id: I8a075c58ce580712e50e675685b7bc292d51021e
2016-02-29 14:03:53 +01:00
Steffen Schaefer
a7309ca2b5
The inner HashMap of CopyOnWriteHashMap is now marked as volatile to
...
prevent nasty side effects
2016-02-25 09:03:13 +01:00
Steffen Schaefer
0d971f3681
Added explanatory comments to some implementations of CopyOnWriteHashMap
2016-02-25 08:37:05 +01:00
Steffen Schaefer
af15020354
The methods keySet, values and entrySet of CopyOnWriteHashMap now return
...
unmodifiable collections to prevent changes without proper handling of
concurrency
2016-02-25 08:32:36 +01:00
Steffen Schaefer
a8fe283a84
Implemented equals/hashCode for CopyOnWriteHashMap
2016-02-25 08:27:45 +01:00
Steffen Schaefer
f72112f157
Implemented Serialization for CopyOnWriteHashMap
2016-02-25 08:27:12 +01:00
Steffen Schaefer
abe9e71b93
The lock name of CopyOnWriteHashMap is now customizable
2016-02-24 17:53:03 +01:00
Steffen Schaefer
bae75ee2bd
Implemented CopyOnWriteHashMap
2016-02-24 17:30:45 +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
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
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
f795cf17a1
Building AARs for additional projects
2015-09-28 14:13:22 +02:00
Axel Uhl
087be7f366
moved approximateNow into a new class ApproximateTime in shared.android where we can use Timer and TimerTask which are not GWT-compatible
2015-07-28 00:02:30 +02:00
Axel Uhl
78ff26a17e
introduced MillisecondsTimePoint.approximateNow() and used where now() is too expensive; re-typed now() to TimePoint
2015-07-27 22:48:09 +02:00
Axel Uhl
13e74e102f
fixed timestamp initialization in LockUtil
2015-07-26 03:27:28 +02:00
Axel Uhl
dd92dbff2b
improved time keeping in LockUtil, generating time stamps only every second in a timer, avoiding MillisecondTimePoint.now()
2015-07-26 03:17:03 +02:00
Axel Uhl
75b04d8048
Merge branch 'master' into ubilabs--tracking_app--develop
2015-03-30 22:09:02 +02:00
Axel Uhl
49ccae6d12
fix source/target compiler version to 1.7 for com.sap.sse.shared.android to avoid compiler issues during app build
2015-03-18 13:24:35 +01:00
Axel Uhl
330a889dd4
Merge branch 'master' into ubilabs--tracking_app--develop
2015-03-04 16:46:28 +01:00
Fredrik Teschke
9c375a3ae4
Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
...
Conflicts:
.gitignore
java/com.sap.sailing.server/SailingServer (No Proxy).launch
mobile/com.sap.sailing.android.shared/.classpath
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
2015-02-13 11:16:50 +01:00
Fredrik Teschke
4cb7b535c8
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Axel Uhl
98d5235b47
upgraded all Mongo-using bundles to 2.13.0 driver
2015-02-12 16:00:15 +01:00