Axel Uhl
|
412c023d07
|
fixing bug 3134: NPE in GetFinishedRacesAction
|
2015-07-20 08:22:11 +02:00 |
|
Axel Uhl
|
5ecef79310
|
Merge remote-tracking branch 'server/master'
|
2015-07-19 09:16:38 +02:00 |
|
Axel Uhl
|
77620466c6
|
Merge branch 'master' into tw2015
|
2015-07-18 23:18:44 +02:00 |
|
Axel Uhl
|
fa240f2393
|
constraining number of wind fix DTOs computed on the server in one call to 10000
|
2015-07-18 23:18:15 +02:00 |
|
Axel Uhl
|
6b661359f7
|
Merge branch 'master' into tw2015
|
2015-07-18 17:58:30 +02:00 |
|
Axel Uhl
|
995ea8df6d
|
bug3133: the problem was that due to the refactoring of line drawing positions at index 0 and 1 were tried to obtain for both start/finish line
|
2015-07-18 16:45:41 +02:00 |
|
Axel Uhl
|
fa77190656
|
fixed finish line condition
|
2015-07-18 15:58:35 +02:00 |
|
Axel Uhl
|
cf3e8ab51c
|
fixing bug 3134: NPE in GetFinishedRacesAction
|
2015-07-18 15:13:24 +02:00 |
|
Axel Uhl
|
30ad7b10cb
|
Merge branch 'bug3124' into ubilabs--rcapp--master
|
2015-07-18 15:04:50 +02:00 |
|
Axel Uhl
|
95c453c616
|
Merge remote-tracking branch 'server/ubilabs--rcapp--master' into ubilabs--rcapp--master
|
2015-07-18 12:51:52 +02:00 |
|
Axel Uhl
|
1ec486793c
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-18 12:50:32 +02:00 |
|
Axel Uhl
|
256cb78ef1
|
Merge branch 'ubilabs--rcapp--bug-3119' into ubilabs--rcapp--master
|
2015-07-18 12:44:59 +02:00 |
|
Axel Uhl
|
b4497e8f9d
|
Merge branch 'master' into tw2015
|
2015-07-18 11:54:40 +02:00 |
|
Axel Uhl
|
ab41d9f175
|
Merge remote-tracking branch 'server/master'
|
2015-07-18 11:54:29 +02:00 |
|
Axel Uhl
|
726be9b301
|
Merge remote-tracking branch 'server/tw2015' into tw2015
|
2015-07-18 11:53:50 +02:00 |
|
Axel Uhl
|
077178b1f5
|
Merge remote-tracking branch 'server/master' into tw2015
|
2015-07-18 11:47:01 +02:00 |
|
Axel Uhl
|
53f710e93b
|
Merge branch 'master' into tw2015
|
2015-07-18 11:44:05 +02:00 |
|
Axel Uhl
|
cbb9d4e8ae
|
fixing bug 3129 by handling null boat class when producing regatta overview entry
|
2015-07-18 11:42:57 +02:00 |
|
Axel Uhl
|
8ad721095d
|
Merge branch 'master' into tw2015
|
2015-07-18 10:36:43 +02:00 |
|
Axel Uhl
|
87ca2b60fb
|
added serialVersionUID for SimpleRaceLogIdentifier
|
2015-07-18 10:36:25 +02:00 |
|
Axel Uhl
|
e2333b8f1e
|
Merge branch 'master' into tw2015
|
2015-07-18 10:27:27 +02:00 |
|
Axel Uhl
|
78506543c1
|
made SimpleRaceLogIdentifier serializable
|
2015-07-18 10:20:00 +02:00 |
|
Axel Uhl
|
3193a30d32
|
Merge branch 'ubilabs--rcapp--feature--2467-improved-starttimefinder' into tw2015
|
2015-07-18 10:16:44 +02:00 |
|
Axel Uhl
|
5e5608e52f
|
Merge remote-tracking branch 'server/ubilabs--rcapp--feature--2467-improved-starttimefinder' into ubilabs--rcapp--feature--2467-improved-starttimefinder
|
2015-07-18 10:15:18 +02:00 |
|
Axel Uhl
|
0205ff3ab8
|
Merge branch 'ubilabs--rcapp--feature--2467-improved-starttimefinder' into tw2015
|
2015-07-18 10:10:52 +02:00 |
|
Axel Uhl
|
15635dd8f8
|
avoid ArrayIndexOutOfBounds for dependent start time setting when a regatta has only one race
|
2015-07-18 10:09:57 +02:00 |
|
Axel Uhl
|
e3a4967523
|
Merge branch 'bug3124' into tw2015
|
2015-07-17 23:23:12 +02:00 |
|
Axel Uhl
|
5813348521
|
Merge branch 'bug3124' into tw2015
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java
|
2015-07-17 23:23:03 +02:00 |
|
Axel Uhl
|
b0261afc15
|
bug 3124: avoiding endless recursion in case of cyclic start time dependencies by carrying along already constructed RaceStates
keyed by SimpleRaceLogIdentifier
|
2015-07-17 23:09:16 +02:00 |
|
Axel Uhl
|
1a1134dc9e
|
handle PRESCHEDULED in RaceContext
|
2015-07-17 22:36:18 +02:00 |
|
Axel Uhl
|
cb784b9251
|
fixed dependent start time listening and null handling and bootstrap in two passes
|
2015-07-17 22:08:29 +02:00 |
|
Axel Uhl
|
57fc41b020
|
Merge branch 'master' into ubilabs--rcapp--bug-3119
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
|
2015-07-17 20:43:30 +02:00 |
|
EC2 Server
|
76a93a64c9
|
Merge branch 'master' into tw2015
|
2015-07-17 18:21:37 +00:00 |
|
Axel Uhl
|
1e46ea4fae
|
Merge branch 'master' into ubilabs--rcapp--feature--2467-improved-starttimefinder
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
|
2015-07-17 19:44:43 +02:00 |
|
Axel Uhl
|
498838a605
|
Merge remote-tracking branch 'server/master'
|
2015-07-17 18:34:53 +02:00 |
|
Axel Uhl
|
442a10799b
|
Merge branch 'ubilabs--rcapp--bug-3010'
|
2015-07-17 17:20:10 +02:00 |
|
Axel Uhl
|
1d64056abb
|
Merge branch 'bug3122'
|
2015-07-17 17:17:39 +02:00 |
|
Axel Uhl
|
a7eeccc8bc
|
Merge branch 'design2015-races-navi' into tw2015
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
|
2015-07-17 14:59:13 +02:00 |
|
Axel Uhl
|
cd90466cbb
|
Merge branch 'bug3122' into tw2015
|
2015-07-17 13:37:43 +02:00 |
|
Axel Uhl
|
cba6cc39b4
|
Merge branch 'design2015-races-navi' into tw2015
|
2015-07-17 13:37:32 +02:00 |
|
Axel Uhl
|
d18cf1a3f7
|
Merge branch 'design2015' into tw2015
|
2015-07-17 13:35:48 +02:00 |
|
Axel Uhl
|
2b7dfc73e4
|
Merge branch 'master' into tw2015
|
2015-07-17 13:35:12 +02:00 |
|
Axel Uhl
|
02b729245c
|
Merge branch 'master' into ubilabs--rcapp--bug-3010
|
2015-07-17 13:01:55 +02:00 |
|
Axel Uhl
|
97f4ac5659
|
Merge remote-tracking branch 'server/master'
|
2015-07-17 12:56:53 +02:00 |
|
Axel Uhl
|
4e9421110d
|
fixed drawKnob for the case where curValue or min/max are not yet initialized
|
2015-07-17 12:15:03 +02:00 |
|
Axel Uhl
|
f590b71f4c
|
starting to work on bug3122: redraw SliderBar when min/max has been adjusted
|
2015-07-17 11:01:14 +02:00 |
|
Axel Uhl
|
56fed16746
|
removed GWT.debugger()
|
2015-07-17 01:54:21 +02:00 |
|
Axel Uhl
|
41a76b0108
|
added copy constructor to RaceMapSettings and use it in EmbeddedMapAndWIndChartEntryPoint to update settings partially
|
2015-07-17 01:51:08 +02:00 |
|
Axel Uhl
|
a422ad8036
|
added EmbeddedMapAndWindChart entry point to SailingGWT sdm.launch
|
2015-07-17 01:33:41 +02:00 |
|
Axel Uhl
|
d1777fd995
|
Merge branch 'master' into bug3027
|
2015-07-17 01:08:29 +02:00 |
|
Axel Uhl
|
d9d02e9737
|
use American English in "Analyze race" (instead of Analyse race)
|
2015-07-17 01:02:39 +02:00 |
|
Axel Uhl
|
b729ccec6c
|
Merge remote-tracking branch 'server/master'
|
2015-07-17 00:57:15 +02:00 |
|
Axel Uhl
|
e250a376b4
|
reverted SailingGWT.launch to master version after having seen a merge conflict
|
2015-07-17 00:41:37 +02:00 |
|
Axel Uhl
|
afac875f85
|
Merge branch 'tw2015-stage' into tw2015
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
|
2015-07-17 00:39:59 +02:00 |
|
Axel Uhl
|
470fa8c8c8
|
re-added final in variable declaration
|
2015-07-17 00:28:45 +02:00 |
|
Axel Uhl
|
587dc9262c
|
use emptyList() instead of new ArrayList()
|
2015-07-17 00:27:55 +02:00 |
|
Axel Uhl
|
990d05b589
|
fixed StartTimeFinderResult constructor hierarchy and made all fields final
|
2015-07-16 23:53:38 +02:00 |
|
Axel Uhl
|
d8ecc391c6
|
Merge branch 'master' into ubilabs--rcapp--feature--2467-improved-starttimefinder
|
2015-07-16 23:39:23 +02:00 |
|
Axel Uhl
|
dc3c433081
|
upon Activator.stop() properly stop a running replication from master
|
2015-07-16 23:36:16 +02:00 |
|
Axel Uhl
|
789e13298f
|
Merge branch 'bug-3113' into bug3027
|
2015-07-16 13:15:13 +02:00 |
|
Axel Uhl
|
c327260fec
|
multi-line SmallTransparentTextOverlay that scales font size with map size
|
2015-07-16 12:52:08 +02:00 |
|
Axel Uhl
|
42b1d6aaef
|
Merge branch 'master' into bug3027
|
2015-07-16 12:42:58 +02:00 |
|
Axel Uhl
|
4726dba201
|
Merge branch 'master' into bug3027
|
2015-07-16 11:42:30 +02:00 |
|
Axel Uhl
|
d3ed75040a
|
Merge remote-tracking branch 'server/master'
|
2015-07-16 11:28:18 +02:00 |
|
Axel Uhl
|
2cc687d547
|
added ScoreCorrection method to detect score corrections in untracked fleets within a race column
|
2015-07-16 11:26:44 +02:00 |
|
Axel Uhl
|
0b448cf2fd
|
fixed course middle line displays
|
2015-07-16 11:26:05 +02:00 |
|
Axel Uhl
|
01d153755d
|
adjusted EmbeddedMapAndWindChart entry point's style and architecture to the changes merged from design2015
|
2015-07-15 21:57:02 +02:00 |
|
Axel Uhl
|
7959a30e04
|
prepared to use the tooltip text also for a short text bubble in case COURSEGEOMETRY is selected
|
2015-07-15 18:30:16 +02:00 |
|
Axel Uhl
|
1c4a2b0d83
|
show start line / first mark triangle also when COURSEGEOMETRY is selected
|
2015-07-15 18:18:47 +02:00 |
|
Axel Uhl
|
6ac0ffbe8f
|
fixed consolidated display of either all course middle lines or one or none; start/finish line are displayed when COURSEGEOMETRY is selected
|
2015-07-15 18:16:30 +02:00 |
|
Axel Uhl
|
9f8a134474
|
course middle lines are now maintained in a map; start to first mark triangle is drawn with the same showOrRemoveOrUpdateLine method
|
2015-07-15 16:51:11 +02:00 |
|
Axel Uhl
|
a149d8bdfd
|
Merge branch 'master' into bug3027
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
|
2015-07-15 16:26:50 +02:00 |
|
Axel Uhl
|
52cb82ce59
|
added equals/hashCode for GateDTO that considers left and right MarkDTO as well as name and idAsString
|
2015-07-15 16:22:15 +02:00 |
|
Axel Uhl
|
19208aa6f4
|
use Duration.NULL for target time initialization
|
2015-07-15 16:22:06 +02:00 |
|
Axel Uhl
|
997eea8a4f
|
use same code to draw start, finish and course middle lines
|
2015-07-15 10:32:49 +02:00 |
|
Axel Uhl
|
7221adbb76
|
started to harmonize how start/finish line are drawn; will be able to remove specific position fields for start/finish line shortly
|
2015-07-15 09:16:36 +02:00 |
|
Axel Uhl
|
c795514add
|
Merge branch 'master' into bug3027
|
2015-07-14 23:50:39 +02:00 |
|
Axel Uhl
|
e1294bb048
|
Merge branch 'master' into tw2015
|
2015-07-14 23:50:11 +02:00 |
|
Axel Uhl
|
b7e92448a9
|
added a bunch of TODOs about bug3027 in RaceMap
|
2015-07-14 23:49:39 +02:00 |
|
Axel Uhl
|
2eb88f5c4f
|
Merge remote-tracking branch 'server/raceboard-simulation' into raceboard-simulation
|
2015-07-14 23:41:17 +02:00 |
|
Axel Uhl
|
7373c4631c
|
Merge branch 'master' into raceboard-simulation
|
2015-07-14 23:40:13 +02:00 |
|
Axel Uhl
|
3ccc03f43b
|
added course geometry checkbox to settings dialog
|
2015-07-14 23:39:33 +02:00 |
|
Axel Uhl
|
8ef0c9a343
|
refactored drawing of course middle line so it becomes re-usable also for course geometry display
|
2015-07-14 23:35:33 +02:00 |
|
Axel Uhl
|
f96df5c499
|
Merge branch 'master' into bug3027
|
2015-07-14 22:33:56 +02:00 |
|
Axel Uhl
|
9eafaf14d2
|
Merge branch 'master' into tw2015
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
|
2015-07-14 22:32:58 +02:00 |
|
Axel Uhl
|
6e08b25cf1
|
Merge remote-tracking branch 'server/master'
|
2015-07-14 22:32:16 +02:00 |
|
Axel Uhl
|
b19b5d5807
|
embed RaceCourseDTO in CoursePositionsDTO so that the sequence of waypoints becomes clear; shares MarkDTOs for efficiency
|
2015-07-14 17:13:05 +02:00 |
|
Axel Uhl
|
14105f8bf9
|
consolidated code that produces a RaceCourseDTO
|
2015-07-14 16:36:18 +02:00 |
|
Axel Uhl
|
591146d667
|
added missing EmbeddedMapAndWindChart compilation results directory to build.properties
|
2015-07-14 16:13:28 +02:00 |
|
Axel Uhl
|
66af27e6a2
|
slightly refactored creation of RaceCourseDTO; need to take care of MarkDTO position production now
|
2015-07-14 15:21:27 +02:00 |
|
Axel Uhl
|
db80dc9461
|
added script to count unique IPs / Days / User-Agents per referrer from Apache logs
|
2015-07-14 15:07:23 +02:00 |
|
Axel Uhl
|
f1bdd1c792
|
added EmbeddedMapAndWindChart to build.properties
|
2015-07-14 13:26:32 +02:00 |
|
Axel Uhl
|
7c44a3247b
|
Merge branch 'master' into bug3027
|
2015-07-14 12:02:55 +02:00 |
|
Axel Uhl
|
ae083c31da
|
Merge branch 'master' into tw2015
|
2015-07-14 12:00:18 +02:00 |
|
Axel Uhl
|
f6e890ee3e
|
fixing EventDialog, correcting import to use java.util.HashMap instead of Google HashMap
|
2015-07-14 11:56:25 +02:00 |
|
Axel Uhl
|
2f3da91efd
|
fixing bug 3106: maintain ordering of leaderboard groups in event
|
2015-07-14 11:43:19 +02:00 |
|
Axel Uhl
|
12a9656f67
|
added course field to CoursePositionsDTO; may need to change to CourseDTO or similar; preliminary only...
|
2015-07-14 11:42:54 +02:00 |
|
Axel Uhl
|
61d5ec4dda
|
whitespace change only
|
2015-07-14 11:42:18 +02:00 |
|
Axel Uhl
|
9370fb0ff3
|
Merge branch 'master' into bug3027
|
2015-07-14 09:51:00 +02:00 |
|
Axel Uhl
|
f0eed1c539
|
Merge branch 'master' into tw2015
|
2015-07-14 09:50:28 +02:00 |
|