Commit Graph
2633 Commits
Author SHA1 Message Date
Kai Börnert 9cdb26baca use i18n for allInOneImporterServlet 2018-04-16 14:20:36 +02:00
Axel Uhl 3969c46c57 post-merge cleanup for getCompetitorAndBoatStore rename
Change-Id: Iad59673054de81946b75ba1069562ac3c1cab52e
2018-04-13 15:57:57 +02:00
Axel Uhl 22b4ec6535 Merge branch 'master' into bug4509
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
2018-04-13 15:55:28 +02:00
Axel Uhl 514d132314 bug4511: now returns the SwissTiming competitor's boat instead of an unused one
Change-Id: Ib17131bed6f1813d303854391396fe528e6f18f5
2018-04-13 09:36:33 +02:00
Axel Uhl b4f1c8fb10 more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Axel Uhl 662fd99fad Merge branch 'master' into bug4509
Change-Id: I68eacba973b9c1246aaf9b769f69bc7e96e93f2b
2018-04-12 14:23:56 +02:00
Axel Uhl 4c319f5f6c renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Axel Uhl 231e83bc2c Merge branch 'master' into bug4509
Change-Id: I23ff6e0b645ab626284fc95b172243878e022806
2018-04-12 13:41:37 +02:00
Axel Uhl 1cf923a027 use DynamicCompetitor and DynamicBoat where necessary
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Steffen Schaefer 5a0cc67cf9 Merge branch 'master' into bug4492 2018-04-11 15:03:42 +02:00
Axel Uhl 07105f65d8 let CompetitorWithBoatRefJsonDeserializer inherit from CompetitorJsonDeserializer
Change-Id: I177b2c1a5a96bb9e9313e86d3535ecd4cc70cce7
2018-04-11 14:19:43 +02:00
Steffen Schaefer 16ada7f8a6 Bug 4492: Adjusted StatisticsTest to correctly work with asynchronous
event handling
2018-04-11 10:15:10 +02:00
Axel Uhl 360f72a6a7 Merge branch 'master' into bug2822_boatcolors 2018-03-24 08:49:11 +01:00
Axel Uhl bd90f921dd added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule 2018-03-24 01:45:37 +01:00
Axel Uhl e812b1ad60 Merge branch 'master' into bug2822_boatcolors
Change-Id: I19333a21e5d79726b1409eb319798f55b49faf79
2018-03-22 14:45:41 +01:00
Axel Uhl 8ae47560ad Merge branch 'bug4488' into bug4489
Change-Id: I5cca9e8cca118d118660c294775551c93377ce76
2018-03-21 18:13:02 +01:00
Steffen Schaefer 0601becf81 Bug 4489: Initial implementation to ensure replication state for out of
thread event processing in TrackedRegattaImpl
2018-03-21 16:50:37 +01:00
Axel Uhl 75226b5a0a bug 4478: introduced MasterDataImportClassLoaderService in expeditionconnector.persistence to fix serialization problems
Change-Id: I9604cfbf5a7256ae54aa223b7ae5c1e42b2b0f8d
2018-03-21 15:01:42 +01:00
Axel Uhl ff55fe4caf Merge branch 'master' into bug2822_boatcolors
Change-Id: Iae20e0de3530f33ccf0729fd81d5ec4260a6fe16
2018-03-20 14:04:11 +01:00
Axel Uhl 7a7dfbc586 bug 4487: pass buoyZoneRadiusInHullLengths through as Double, avoiding NPE during auto-unboxing
Change-Id: If36f099c18f12d43bc1fb83b778f502508c3fcfa
2018-03-20 14:02:33 +01:00
Axel Uhl 3013c4fc3a used more Iterable instead of Collection/List where possible
Change-Id: I3266cda397da6050b985a30fa3876ce2d039fc35
2018-03-19 22:15:01 +01:00
Axel Uhl fe638dff7e added boat/no-boat case distinction for (potentially redundantly) registering competitors with store upon initial load
Change-Id: I4eaaad279f7911eee440695581c807154fb923ac
2018-03-19 22:13:10 +01:00
Axel Uhl e750f974be use HashSet instead of ArrayList in getStandaloneBoats() for performance
Change-Id: Ie6648a8f81ea9534bfe411cd2902ed1c082ce5ec
2018-03-19 18:22:19 +01:00
Axel Uhl 98cd6c4f1c added exception logging in abstract TracTrac receiver's run() method
Change-Id: I091d8d5c7d8537337b453c616532be993c005563
2018-03-19 17:39:20 +01:00
Axel Uhl 96c28addd5 added monitoring and mp4parser bundles to Sailing Server (Proxy).launch configuration
Change-Id: Id784a118276f276b60f844317b8415162f1e1625
2018-03-16 17:53:54 +01:00
Frank Mittag d4b1fe2a1b added synchronization for the case that the same competitor could be migrated twice triggered by two different tracked races from the same or even different regattas (in case of league events) 2018-03-13 11:50:10 +01:00
EC2 Server 97c3b410be Merge branch 'master' into bug2822_boatcolors 2018-03-09 15:50:52 +00:00
Frank Mittag 51d83cf50f improved debug log output for some migration messages 2018-03-09 11:11:45 +01:00
service.tip.git 3a5a608743 [INTERNAL] Translation delivery: commit by SLS
Change-Id: I3533d669c72961433d192c0921542cbf8fb6e7de
2018-03-07 20:53:10 +00:00
Steffen Schaefer 379d598456 Merge branch 'bug2822_boatcolors' into bug4416
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractRegattaLogSensorDataAddMappingsDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ItemToMapToDeviceSelectionPanel.java
2018-03-06 17:54:50 +01:00
Frank Mittag 5de4d8367b fixed prefiltering of competitors for regattas with changing boats for the CompetitorRegistrationDialog 2018-03-06 16:40:14 +01:00
Steffen Schaefer 2862850fad Merge branch 'bug2822_boatcolors_merged_with_eol_changes' into bug4416 2018-02-28 08:15:38 +01:00
Frank Mittag 162392a435 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2018-02-27 15:17:45 +01:00
Steffen Schaefer b618bc5393 Bug 4416: Implemented determination of competitors by boat when loading
fixes
2018-02-26 15:39:48 +01:00
Axel Uhl d058a1c0c2 Merge remote-tracking branch 'server/bug4380' into bug4380
Change-Id: I75ccc90f1eb48a2d363904b9da8c2cda796fa858
2018-02-22 15:22:28 +01:00
Steffen Schaefer f8ee0b8863 Bug 4380: The RaceColumnListener used to wait for a sliced race to be
attached to a RaceColumn is now marked as transient
2018-02-21 15:32:31 +01:00
Steffen Schaefer b698bb1fcb Bug 4380: Changed race slicing and expedition all in one import to not
use polling when waiting for the TrackedRace
2018-02-21 13:49:27 +01:00
Frank Mittag d2b3fc62c0 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes 2018-02-21 10:48:43 +01:00
Benjamin Barth 600de99d34 Merge branch 'master' into bug1301 2018-02-15 11:20:48 +01:00
Steffen Schaefer 1d3a808b3d Bug 4442: Removed unnecessary Jetty bundles 2018-02-06 16:03:09 +01:00
Steffen Schaefer 4ff7214bfb Bug 4442: Updated several *.launch files to reflect the changes of
bundles to start due to the Jetty upgrade to version 9.4.8
2018-02-06 15:40:45 +01:00
Axel Uhl ca77474eb1 Merge branch 'master' into bug1301
Change-Id: I1311e542789360d429171d725fd4eb76d93b926e
2018-01-25 23:54:50 +01:00
Axel Uhl 5073ea75d7 Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: I61c922f7a1d7ece025ace4cd6277ccce3640d055
2018-01-16 11:24:13 +01:00
Axel Uhl 43cc0d4306 Merge branch 'maneuver_refactoring'
Change-Id: I6200a6adf7675869151b8319e155342db751f39a
2018-01-14 22:04:23 +01:00
Axel Uhl bf7ce8379c created a failing test case for bug 4414
Change-Id: I3704c291498f98dccbb37554c8e7385f12c27afd
2018-01-13 21:42:48 +01:00
Vladislav Chumak 51f695d0cc Extended Restful API for ManeuverWithEstimationData retrievement 2018-01-12 03:07:06 +01:00
Vladislav Chumak cb866714a8 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2018-01-09 15:16:11 +01:00
Axel Uhl a0f03b3bf3 integrate WindFinder link in info window; adjusted launch configs; avoid duplicate wind fixes
Change-Id: I93bf2944efab280b8a900c1c66a5c418ba8060c8
2018-01-05 18:16:00 +01:00
Axel Uhl ec33535112 added WindFinder spot collection ID to event admin UI
Change-Id: I53b5067501c498dc138354bf929df9fce3640cae
2018-01-05 11:20:36 +01:00
Axel Uhl 6a31b5fb76 added wind finder reviewed spot collections IDs to Event;
including persistence and DTO, but not yet Admin UI

Change-Id: I1433ca1f183872fc02c72adc986bfe19c86198c3
2018-01-04 18:07:34 +01:00