Commit Graph
22459 Commits
Author SHA1 Message Date
Bennet Brunsen 0556ab76e5 Merge branch 'ubilabs--tracking_app--develop' into ubilabs--buoy_positioning_app--develop 2015-03-31 10:15:16 +02:00
Bennet Brunsen f7a0e0e330 Removes deprecation warnings
Added suppress warnings for Camera API and ActionBar API. Only way to
disable all warnings was to set suppress warning at class level. This
was necessary because of deprecated imports.
2015-03-31 10:11:57 +02:00
Axel Uhl 75b04d8048 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-30 22:09:02 +02:00
Axel Uhl 3994cbe838 Merge branch 'master' into ubilabs--buoy_positioning_app--develop 2015-03-30 22:03:11 +02:00
Axel Uhl a75a4cdef3 made local variable final to express it will never change 2015-03-30 21:55:02 +02:00
Axel Uhl 980f18914f make sure that if we have a replicator to wait for then we hold on to it in case it gets nulled out in between 2015-03-30 21:43:28 +02:00
Axel Uhl e75b2e1985 it's important to always return the same classloader; otherwise, the classes and hence the objects won't be compatible / equal 2015-03-30 20:56:11 +02:00
Axel Uhl 9c5978ba4f notify waiters if ReplicationReceiver is stopped for any reason, setting stopped to true; example: consumer closed exception 2015-03-30 20:51:12 +02:00
Axel Uhl 824f975ba8 renamed isQueueEmpty to isQueueEmptyOrStopped; don't set thread context class loader in ReplicationReceiver: it's set in the replicable itself 2015-03-30 20:28:36 +02:00
Axel Uhl 26a286f243 re-establishing the effects of c74a3092661236b13ff0b667e1f08cc3fac11d22; need to serve the replication service's monitor properly as queue drains 2015-03-30 18:28:31 +02:00
Axel Uhl 943d66a2c5 Merge branch 'master' into bug2743 2015-03-30 18:28:16 +02:00
Axel Uhl 273152b0b0 temporarily taking back the pre-mature attempt to wait for replication queues to drain during test execution (c74a309266) 2015-03-30 18:27:04 +02:00
Axel Uhl 236a878910 Merge branch 'master' into bug2743 2015-03-30 18:23:54 +02:00
Axel Uhl c09ed42567 Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_pinging_app--develop 2015-03-30 18:00:31 +02:00
Bennet Brunsen 2ac1731a97 Bugfix: Fixes crash after checkin with qr code 2015-03-30 17:56:36 +02:00
Axel Uhl e3796056e0 Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_pinging_app--develop 2015-03-30 17:52:04 +02:00
Axel Uhl 75423e4c84 downgraded org.json.simple to JavaSE-1.7 so Android projects can use it 2015-03-30 17:51:16 +02:00
Axel Uhl cbe36db8cc downgraded org.json.simple to JavaSE-1.7 so Android projects can use it 2015-03-30 17:38:57 +02:00
Axel Uhl 90a843420b Merge branch 'master' into ubilabs--buoy_positioning_app--develop 2015-03-30 17:26:45 +02:00
Axel Uhl 44def3c6c6 Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_positioning_app--develop
Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java
2015-03-30 17:26:38 +02:00
Axel Uhl e8c6164f96 avoid NPE in TrackedRaceImpl.getLineMarksAndPositions in case the leg determining the direction in which to pass waypoint is not successfully obtained 2015-03-30 17:22:38 +02:00
Axel Uhl bc232925f1 use boolean instead of Boolean in getPolarResults 2015-03-30 16:41:11 +02:00
Bennet Brunsen e614649281 Merge branch 'ubilabs--buoy_positioning_app--Bugfix--Bug_2739' into ubilabs--buoy_positioning_app--develop 2015-03-30 16:38:31 +02:00
Axel Uhl d5ade5742d fixing NPE in case polars for non-existing race are requested 2015-03-30 16:38:21 +02:00
Axel Uhl 5f30a0b6cb removed obsolete com.sap.sse.gateway reference from sailing feature.xml 2015-03-30 16:33:12 +02:00
Bennet Brunsen 56dc465217 Implements missing accuracy signal 2015-03-30 16:30:44 +02:00
Axel Uhl c74a309266 fixed bundle name for mongo driver in com.sap.sailing.feature's feature.xml 2015-03-30 16:30:38 +02:00
Axel Uhl ae53d23cc1 adjusted versions in feature.xml, particularly of mongodb.driver and gwt.osgi 2015-03-30 16:24:21 +02:00
Bennet Brunsen cf89a9fcd0 Bugfix: Hides ping button in Position Activity. Always gives updates to current position. 2015-03-30 16:05:53 +02:00
Peter Siegmund 5fc3f26572 Gradle: preBuild taks generates git.xml in res - usable with getString(R.string.git_hash) 2015-03-30 16:04:17 +02:00
Peter Siegmund 2ccf46c762 Gradle: preBuild taks generates git.xml in res - usable with getString(R.string.git_hash) 2015-03-30 16:03:31 +02:00
Bennet Brunsen ce9d6401b4 Bugfix: Fixes display of marks belonging to other regatta. 2015-03-30 15:09:29 +02:00
Bennet Brunsen 66da47c56e Merge branch 'ubilabs--buoy_positioning_app--feature--remove_hockey_sdk' into ubilabs--buoy_positioning_app--develop 2015-03-30 14:25:02 +02:00
Bennet Brunsen c8a0a26ecb Removes Hockey SDK 2015-03-30 14:24:03 +02:00
Axel Uhl 21bb26ca71 Merge branch 'master' into bug2743 2015-03-30 14:02:08 +02:00
Axel Uhl 19a70efd34 Merge remote-tracking branch 'server/master' 2015-03-30 13:20:11 +02:00
Axel Uhl b5ea074217 fixing deserialization for new raceStates weak hash map in TrackedRaceImpl 2015-03-30 13:16:38 +02:00
Alexander Ries 25c6fb0052 Merge remote-tracking branch 'origin/master' into ribdashboard 2015-03-30 13:02:59 +02:00
Alexander Ries 4034db48cc removed possible null pointer in ribdashboardservice when loading competitors from leaderboard 2015-03-30 13:00:42 +02:00
Axel Uhl 9001649b99 fixed waiting on Replicator's queue to become empty; this avoids the AlreadyClosedExceptions, it seems, but the testWindSourcesToExcludeReplication test still fails locally 2015-03-30 11:50:48 +02:00
Bennet Brunsen b208317b9f Merge branch 'ubilabs--buoy_positioning_app--feature--use_message_sending_service_for_pings' into ubilabs--buoy_positioning_app--develop 2015-03-30 11:40:03 +02:00
Bennet Brunsen d3e677e9bf Bugfix: Fixes german translation for latitude and longitude 2015-03-30 11:33:10 +02:00
Bennet Brunsen 498ae8e898 Implements use of message sending service for pings.
Replaced network helper with message sending service in PingHelper
class. Added message service start and destroy in regatta activity.
2015-03-30 11:25:25 +02:00
Axel Uhl b823ed058b Merge branch 'master' into bug2743 2015-03-30 10:45:24 +02:00
Axel Uhl b8ef26800f improved replication test logging; improved Javadoc for RaceTracker.stop(...) 2015-03-30 10:44:08 +02:00
Axel Uhl aa0ed9e815 partly reverting commit 21d5d33f78 to see what is causing the issue in Hudson 2015-03-30 10:10:07 +02:00
Axel Uhl 4f18c1c366 use any free server port for replication servlet in test mode 2015-03-30 02:09:38 +02:00
Axel Uhl 7b3f8722be extended the wait time for replication test even more; locally it was green for 2s wait time... 2015-03-29 21:22:06 +02:00
Axel Uhl 3e689182a6 increased timeouts for previously failing replication tests; green now locally 2015-03-29 19:50:31 +02:00
Axel Uhl 023731f84f fixing bug regarding replication of tracked race live delay: the change of a fixed delay wasn't properly notified to listeners, therefore not replicated 2015-03-29 18:30:03 +02:00