 Axel Uhl
|
1404c18f67
|
replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO
|
2013-12-09 22:06:29 +01:00 |
|
 Nick Klose
|
3018bd8bfe
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
|
2013-12-09 18:35:16 +01:00 |
|
|
Nick Klose
|
96075f5cc1
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
|
2013-12-09 13:22:09 +01:00 |
|
 fmittag
|
6d543b46b4
|
renamed new attribute displayColor of competitor back to color
|
2013-12-07 16:25:54 +01:00 |
|
|
fmittag
|
5918bb1d14
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
|
2013-12-07 14:22:27 +01:00 |
|
|
Axel Uhl
|
95f04c8e89
|
fixed replication tests for regatta updates so that they use the operation and apply it to master
|
2013-12-06 22:14:48 +01:00 |
|
|
fmittag
|
62b3a9c6ae
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-12-06 19:19:09 +01:00 |
|
|
fmittag
|
d037441787
|
added load/store/editing of the new attribute displayColor for a competitor
|
2013-12-06 18:40:15 +01:00 |
|
 Lukas Niemeier
|
dc25f9ccb5
|
# removed the "any" DeviceConfigurationMatcher
|
2013-12-06 03:04:43 +01:00 |
|
|
Nick Klose
|
7dcd85bf05
|
Fixed another Nautical-Side Test.
|
2013-12-05 16:38:37 +01:00 |
|
|
Lukas Niemeier
|
061936c97e
|
# renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
|
2013-12-04 16:18:33 +01:00 |
|
|
Lukas Niemeier
|
492124fd16
|
# renamed proceduresconfiguration to RegattaConfiguration
|
2013-12-04 02:49:46 +01:00 |
|
|
Lukas Niemeier
|
d4601894dc
|
# use pass-trough interface instead of getCompetitorStore chain
|
2013-12-03 18:38:36 +01:00 |
|
|
Lukas Niemeier
|
04e8671a11
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-11-29 18:24:13 +01:00 |
|
|
Lukas Niemeier
|
453ac2b142
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-11-29 16:42:07 +01:00 |
|
|
Nick Klose
|
64ad880d2e
|
Merge branch 'master' into mark-rounding-inference
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
|
2013-11-28 10:15:29 +01:00 |
|
|
Lukas Niemeier
|
30560c19bf
|
# racing procedure configuration attached to regatta
# some help text in UI
|
2013-11-25 16:46:05 +01:00 |
|
|
Nick Klose
|
4534722d2b
|
Merge branch 'master' into mark-rounding-inference
|
2013-11-20 16:35:25 +01:00 |
|
|
Lukas Niemeier
|
953eaaa668
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
|
2013-11-20 12:25:57 +01:00 |
|
 Frederik Petersen
|
81760e6dec
|
Replaced trackedRegatta with regatta name in getWindTrack calls
also added wind import
|
2013-11-20 12:05:10 +01:00 |
|
|
Lukas Niemeier
|
ad41f2e80c
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
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.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-11-20 11:37:40 +01:00 |
|
|
Frederik Petersen
|
a988003d15
|
Moved central windstore into racingeventservice
also removed addRace and addEvent services from legacy adminapp
|
2013-11-20 09:02:55 +01:00 |
|
|
Axel Uhl
|
3542cf7e67
|
using a GzipOutputStream to compress initial replication; results in a factor of 4 compression, roughly
|
2013-11-19 11:27:57 +01:00 |
|
|
Lukas Niemeier
|
34b852f0c4
|
# changed RaceLogEvent#getTimePoint to return createdAt (was logical timestamp before)
|
2013-11-18 22:05:18 +01:00 |
|
|
Lukas Niemeier
|
be370628d8
|
# removed min/max rounds configuration
|
2013-11-16 18:05:17 +01:00 |
|
|
Lukas Niemeier
|
58efde4c15
|
# default racing procedure and default course designer configurable for regtattas
|
2013-11-16 16:32:30 +01:00 |
|
|
Nick Klose
|
9f3855e621
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
|
2013-11-11 13:59:39 +01:00 |
|
|
Lukas Niemeier
|
dac0fd3494
|
# added SharedDomainFactoryImpl implementing SharedDomainFactory
# DomainFactoryImpl extends SharedDomainFactoryImpl (code reuse)
# Split SharedDomainFactory and CompetitorStore interfaces (no more forwarding)
|
2013-11-11 03:40:09 +01:00 |
|
|
Lukas Niemeier
|
ea69b28ad2
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/CollectionNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
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/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
|
2013-11-11 03:00:31 +01:00 |
|
|
Axel Uhl
|
025f288a3b
|
allow resetting many competitors at once
|
2013-11-07 22:04:42 +01:00 |
|
|
Axel Uhl
|
025ae58573
|
test for replicating the reverting of a competitor to what is provided by a tracking provider
|
2013-11-07 20:42:19 +01:00 |
|
|
Axel Uhl
|
eb2d76ca8c
|
successfully tested in-place update of competitor in replica with explicity update operation
|
2013-11-07 20:04:03 +01:00 |
|
|
Axel Uhl
|
28aa49dbc6
|
use assertNotSame in CompetitorStoreTest; started CompetitorReplicationTest to validate replication of persistent competitor behavior
|
2013-11-07 19:58:19 +01:00 |
|
|
Nick Klose
|
b22961015a
|
Continued refactoring for PassingInstructions
|
2013-11-07 11:55:30 +01:00 |
|
|
Nick Klose
|
b8e2351bbd
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
|
2013-11-06 16:10:41 +01:00 |
|
|
Nick Klose
|
dedc137e7d
|
Started merge of PassingInstructions and RoundingDirections
|
2013-11-05 10:00:52 +01:00 |
|
|
Nick Klose
|
8540a7081b
|
Finished ControlPointWithTwoMarks
|
2013-11-04 14:40:59 +01:00 |
|
|
Lukas Niemeier
|
422d24eaa5
|
Merge branch 'otracelog' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
|
2013-11-04 01:48:14 +01:00 |
|
|
Axel Uhl
|
2be40c66f8
|
Merge branch 'master' into persistentCompetitors
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
|
2013-10-31 18:19:45 +01:00 |
|
 Simon Pamies
|
204a61ee5e
|
Fixed replication master implementation to make sure that master server and replication server can be two different hosts
|
2013-10-31 15:20:41 +01:00 |
|
|
Simon Pamies
|
e4e510a5eb
|
Made replication tests aware of environment variables
|
2013-10-31 14:29:47 +01:00 |
|
|
Lukas Niemeier
|
bb58d78236
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
|
2013-10-30 14:38:14 +01:00 |
|
|
Lukas Niemeier
|
e94dcf286e
|
# added replication tests
|
2013-10-29 22:17:51 +01:00 |
|
|
Axel Uhl
|
4c64c8588d
|
more compiles, but still not all
|
2013-10-29 18:03:37 +01:00 |
|
|
Axel Uhl
|
596b7476f3
|
DOESN'T COMPILE: started major refactoring NauticalSide-->PassingInstructions for Waypoint; please complete
|
2013-10-29 17:58:15 +01:00 |
|
|
Axel Uhl
|
3da17302f8
|
removed DomainFactory.INSTANCE use except from test cases; renamed MongoFactory to PersistenceFactory
|
2013-10-28 17:26:26 +01:00 |
|
|
Lukas Niemeier
|
5230799349
|
# added replication to device configuratiom
|
2013-10-24 20:00:39 +02:00 |
|
 Jens Rommel
|
abd3f0dd44
|
Expanded read-only TrackedRace return type of get*Race() methods to mutable DynamicTrackedRace where appropriate.
According to Axel, the originally intended separation of read-onyl and mutable API via this approach turned out not to be as successful as expected.
|
2013-10-15 12:27:28 +02:00 |
|
|
Axel Uhl
|
043a154008
|
fixed replication test after refactoring Event ID from Serializable to UUID
|
2013-10-02 18:18:22 +02:00 |
|
|
Axel Uhl
|
e504187f7e
|
fixing bug 1537 by also avoiding duplicate replication of course area additions
|
2013-10-02 18:05:06 +02:00 |
|