 Armin Zamani
|
4816dd2428
|
added new item in realm.properties
|
2013-03-02 00:23:03 +01:00 |
|
|
Armin Zamani
|
592ddf13f7
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-03-01 22:13:17 +01:00 |
|
|
Armin Zamani
|
273c9fea04
|
Changed usage of Serializable as id for EventDTO in sailingService to
String usage
|
2013-03-01 22:12:52 +01:00 |
|
|
Armin Zamani
|
06c6679964
|
Changed german name of course area to "Regattabahn"
|
2013-03-01 21:22:51 +01:00 |
|
|
Armin Zamani
|
df145e18e1
|
Fixed bug: ScoreCorrection for leaderboard must not be null
|
2013-03-01 21:12:16 +01:00 |
|
|
Armin Zamani
|
5b20286163
|
Named CourseArea id more clear in GWT ui bundle, distinct separation
between courseArea id as string in the GWT ui bundle and id as
serializable
|
2013-03-01 20:49:15 +01:00 |
|
|
Armin Zamani
|
6ddc28c27b
|
GWT does not like the more readable version of launch file :(
|
2013-03-01 20:06:49 +01:00 |
|
|
Armin Zamani
|
aaf35d1cf7
|
Fixed Bug 1248: Null check for event in regatta creation dialog was
missing, when no event is selected anymore
|
2013-03-01 19:49:25 +01:00 |
|
|
Armin Zamani
|
a96e692b5f
|
changed SailingGWT.launch again after merge, removed wrong and
unnecessary additional workspace_bundles key
|
2013-03-01 15:52:25 +01:00 |
|
|
Armin Zamani
|
67375f2a5b
|
Solved some errors after merge
|
2013-03-01 15:47:43 +01:00 |
|
|
Armin Zamani
|
b254437be3
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Course.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/CourseImpl.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/server/SailingServiceImpl.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
|
2013-03-01 15:10:49 +01:00 |
|
|
Armin Zamani
|
06688a5483
|
Changed formatting of list of GWT Components to start in
SailingGWT.launch for better readability and mergeability
|
2013-03-01 14:41:22 +01:00 |
|
|
Armin Zamani
|
d7f9bbbaf9
|
Just formatting: Changed tabs to spaces by formatting hole files (Ctrl +
I in Eclipse) that we might have touched while developing on this branch
|
2013-03-01 14:33:37 +01:00 |
|
|
Armin Zamani
|
05fb3a9549
|
bug fix after merge, test of mongo escaping for raceLogIdentifier
|
2013-02-27 12:50:38 +01:00 |
|
|
Armin Zamani
|
1cf98ae228
|
escaped racelogidentifier when stored in database and requested for
loading of events
|
2013-02-27 11:37:25 +01:00 |
|
|
Armin Zamani
|
ab41dba5a2
|
Merge branch 'master' into racecommittee_integrated
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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java
|
2013-02-27 08:58:26 +01:00 |
|
|
Armin Zamani
|
9d99a37424
|
changed ignore for empty serialization tests, ignored failing
leaderboard renaming test
|
2013-02-26 18:14:16 +01:00 |
|
|
Armin Zamani
|
b34298c6d8
|
replication: added missing connection of Regatta raceColumnlisteners in
RacingEventService to RaceLogRegplicator
|
2013-02-26 18:10:06 +01:00 |
|
|
Armin Zamani
|
8bd25eb03f
|
Refactored mongo test for RaceLogEvent storing and loading
|
2013-02-26 17:47:08 +01:00 |
|
|
Armin Zamani
|
a779640411
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
|
2013-02-26 13:26:25 +01:00 |
|
|
Armin Zamani
|
738d8db75d
|
changed usage of Util helper class for testing purposes
|
2013-02-26 13:13:16 +01:00 |
|
|
Armin Zamani
|
e055c9ee12
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.gwt.ui/pom.xml
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-02-25 00:27:15 +01:00 |
|
|
Armin Zamani
|
7729a311db
|
removed @Ignore for alle TracTrac Tests in domain tests
|
2013-02-25 00:19:24 +01:00 |
|
|
Armin Zamani
|
c7b797fce9
|
Introduced the new column "Course Area" to the Admin Console Regatta
Panel
|
2013-02-25 00:02:34 +01:00 |
|
|
Armin Zamani
|
566916ece4
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
|
2013-02-24 23:19:50 +01:00 |
|
|
Armin Zamani
|
9d72f87f04
|
Implemented CourseArea as another field to be selected in the Admin
Console for Regattas and propagated it in the Regatta infrastructure
|
2013-02-24 23:17:21 +01:00 |
|
|
Armin Zamani
|
c0219f1239
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-24 19:23:27 +01:00 |
|
|
Armin Zamani
|
e7b6c881b0
|
failing test for fleets in flexible leaderboards that are not connected
to tracked races
|
2013-02-24 19:23:13 +01:00 |
|
|
Armin Zamani
|
6758be0094
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-24 19:05:09 +01:00 |
|
|
Armin Zamani
|
537639d5a0
|
organized import
|
2013-02-24 19:03:42 +01:00 |
|
|
Armin Zamani
|
ee093d7c9e
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-23 23:48:38 +01:00 |
|
|
Armin Zamani
|
bd2bbda196
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-23 23:46:54 +01:00 |
|
|
Armin Zamani
|
fe2ca8196d
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
|
2013-02-23 23:46:22 +01:00 |
|
|
Armin Zamani
|
ef620a9a20
|
had commented RaceLogInformation for testing purpose, taken it out
|
2013-02-23 23:44:29 +01:00 |
|
|
Armin Zamani
|
2998aae3e5
|
Removed CourseArea from RegattaLeaderboard, the courseAreaId is now only
a property of flexible leaderboards, for edit flexible leaderboard
dialog the coursearea and event is correctly preselected
|
2013-02-23 23:37:18 +01:00 |
|
|
Armin Zamani
|
8cae8c7895
|
Added a test for persistence of race log events in flexible
leaderboards. the storing and loading for every race log event type is
tested.
|
2013-02-23 01:14:37 +01:00 |
|
|
Armin Zamani
|
1678c6430f
|
Added a test for to check if initial load works with race logs
|
2013-02-22 22:41:56 +01:00 |
|
|
Armin Zamani
|
b1e82d2866
|
Changed concept of holding race logs to make it safe for
replication's initial load
|
2013-02-22 22:03:39 +01:00 |
|
|
Armin Zamani
|
78068bb02e
|
Fixed problem of empty course area field for leaderboards after loading
|
2013-02-22 19:17:57 +01:00 |
|
|
Armin Zamani
|
b8bde88af1
|
fixed some errors that came up after merge
|
2013-02-22 16:29:39 +01:00 |
|
|
Armin Zamani
|
f13a8fc469
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-02-22 15:51:13 +01:00 |
|
|
Armin Zamani
|
c0e39d0348
|
made RaceLogStore in Series and Flexible Leaderboard transient
|
2013-02-22 15:20:25 +01:00 |
|
|
Armin Zamani
|
8168a784a1
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.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/SailingServer (No Proxy).launch
|
2013-02-20 01:32:14 +01:00 |
|
|
Armin Zamani
|
e0aff489c2
|
implemented loading of new race log events
|
2013-02-20 01:14:41 +01:00 |
|
|
Armin Zamani
|
dd8af38f23
|
added persistence for new race log event types passchange,
courseAreachange, etc.
|
2013-02-20 00:15:52 +01:00 |
|
|
Armin Zamani
|
ec9d5779a1
|
Changed RecordRaceLogEvent so that names are passed as strings
|
2013-02-19 19:17:28 +01:00 |
|
|
Armin Zamani
|
730b431912
|
further implementation of racelogstore in the sailing suite
|
2013-02-19 19:05:28 +01:00 |
|
|
Armin Zamani
|
c942008ba8
|
fixed bug caused by latest bug
|
2013-02-18 14:26:17 +01:00 |
|
|
Armin Zamani
|
1b13a992ac
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
|
2013-02-18 13:38:39 +01:00 |
|
|
Armin Zamani
|
a5f80757a1
|
deleted test for RaceLog on tracked race
|
2013-02-18 13:10:49 +01:00 |
|
|
Armin Zamani
|
605e5eac13
|
renamed test class
|
2013-02-18 12:38:29 +01:00 |
|
|
Armin Zamani
|
7682bcdc51
|
fixed test for race log in racingEventService
|
2013-02-18 12:37:54 +01:00 |
|
|
Armin Zamani
|
dd8a0603d1
|
Added RaceLog test for RacingEventService
|
2013-02-18 03:00:08 +01:00 |
|
|
Armin Zamani
|
baf3fa8bc0
|
removed unneccessary tests, since the race log is no longer part of the
tracked race (need to be rewritten somewhere else), added two ignored
dummy methods to two serialization tests so that they do not fail
anymore
|
2013-02-18 02:49:09 +01:00 |
|
|
Armin Zamani
|
1e78be1dae
|
Changed replication behaviour to new implementation
|
2013-02-18 02:19:35 +01:00 |
|
|
Armin Zamani
|
a6d31b08c3
|
implemented caching of raceLogs in raceLogStore
|
2013-02-18 02:13:43 +01:00 |
|
|
Armin Zamani
|
57689d36b9
|
added RaceLogStore to RacingEventService
|
2013-02-18 01:44:11 +01:00 |
|
|
Armin Zamani
|
ddea60f570
|
Removed RaceLogStore from RaceColumn implementations and all subsequent
classes
|
2013-02-18 01:34:14 +01:00 |
|
|
Armin Zamani
|
d2d89de179
|
tried to fulfill a todo, but information is still missing
|
2013-02-11 00:08:11 +01:00 |
|
|
Armin Zamani
|
2835d31357
|
added the record race log event operation
|
2013-02-11 00:03:13 +01:00 |
|
|
Armin Zamani
|
fedd109b35
|
removed the listener method for raceLogEvents in RaceChangeListener,
changed signature for RaceColumn.getRaceLog to get the racelog for
columns in RegattaLeaderboard
|
2013-02-10 22:40:37 +01:00 |
|
|
Armin Zamani
|
8ac062f3f2
|
Introduced RaceLogStore to RaceColumnInSeries
|
2013-02-10 21:42:05 +01:00 |
|
|
Armin Zamani
|
5e964f5f4e
|
removed import by organizing import
|
2013-02-10 02:43:14 +01:00 |
|
|
Armin Zamani
|
bf3544f445
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-10 02:40:54 +01:00 |
|
|
Armin Zamani
|
991e7714fa
|
Implemented the RaceLog calling in the RaceColumn
|
2013-02-10 02:40:39 +01:00 |
|
|
Armin Zamani
|
739c115aaf
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-10 01:57:00 +01:00 |
|
|
Armin Zamani
|
4a4d213d7a
|
RaceLogStore changed to a real store with caching functionality.
Race Column creation methods carry RaceLogStore to RaceColumn
constructor
|
2013-02-10 01:56:40 +01:00 |
|
|
Armin Zamani
|
f9ee5b38fb
|
Strategy change: reverted all additions of a raceLogStore to in
RaceColumn creation calls
|
2013-02-10 00:01:10 +01:00 |
|
|
Armin Zamani
|
a8dafe6a63
|
Next implementation step, added RaceLogStore parameter to
RacingEventService, updated all callees
|
2013-02-09 22:27:06 +01:00 |
|
|
Armin Zamani
|
75959bd0df
|
added src folder with dummy file to shared android project
|
2013-02-09 21:17:28 +01:00 |
|
|
Armin Zamani
|
a8c9449ae2
|
added race log store to AddRaceColumn Command class and fixed the
callees
|
2013-02-09 21:13:26 +01:00 |
|
|
Armin Zamani
|
a20975dfca
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-09 19:56:36 +01:00 |
|
|
Armin Zamani
|
1c49ec0e24
|
Changed persistence for racelog to store using the new
RaceColumnIdentifier instead of Regatta and RaceDefinition
|
2013-02-09 19:55:10 +01:00 |
|
|
Armin Zamani
|
21ad5fce0b
|
removed tes.txt
|
2013-02-09 16:48:20 +01:00 |
|
|
Armin Zamani
|
3cb32347b1
|
new test commit, it seems to work again
|
2013-02-09 16:45:56 +01:00 |
|
|
Armin Zamani
|
2640435432
|
test commit
|
2013-02-09 15:18:55 +01:00 |
|
|
Armin Zamani
|
7d6d72785e
|
removed all RaceLog methods from TrackedRace and TrackedRaceImpl and
DynamicTrackedRace
changed TrackedRaceImpl constructor again, all calling methods are
changed appropriately
|
2013-02-09 01:10:39 +01:00 |
|
|
Armin Zamani
|
43ff1dc7fe
|
Merge branch 'racecommittee_integrated' of ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-08 23:43:53 +01:00 |
|
|
Armin Zamani
|
e0b3d6d5b7
|
added getCourseArea for course area id in RacingEventService interface
|
2013-02-08 13:34:20 +01:00 |
|
|
Armin Zamani
|
da45fb3568
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-02-07 21:55:13 +01:00 |
|
|
Armin Zamani
|
0cb94ad321
|
Implemented the optional reference of leaderboards to a coursearea of an
event
|
2013-02-06 17:47:32 +01:00 |
|
|
Armin Zamani
|
5f75e9cfcf
|
GWT Admin Console: Textbox for Course Areas are disabled when data is
saved
|
2013-02-05 10:32:19 +01:00 |
|
|
Armin Zamani
|
ce3b2e97b2
|
Added the column "Course Area" to the SailingEvent Panel
|
2013-02-04 17:57:00 +01:00 |
|
|
Armin Zamani
|
ea328e0018
|
Added Course Area Input form to Event Dialog. Course Areas are created
for an event, additional course areas can be added to an existing list
of course Areas of an event
|
2013-02-04 01:28:28 +01:00 |
|
|
Armin Zamani
|
26838cc0a2
|
Fixed problems with Sailing Event GWT Panel. The panel is now fully
usable. Create, Update, Rename, Remove Operations work and are
replicated. Replication tests for operations will follow
|
2013-02-02 23:56:58 +01:00 |
|
|
Armin Zamani
|
002427981c
|
Added replication of CourseAreas and according replication test
|
2013-02-02 20:23:19 +01:00 |
|
|
Armin Zamani
|
a2231263f7
|
Sailing Events are fully replicated when created/added, added
replication test for event creation
|
2013-02-02 19:04:24 +01:00 |
|
|
Armin Zamani
|
02b225f307
|
Renamed RaceCommittee to RaceLog
|
2013-02-02 16:34:53 +01:00 |
|
|
Armin Zamani
|
12bf61007a
|
CourseArea now implements WithID
|
2013-02-02 00:24:43 +01:00 |
|
|
Armin Zamani
|
da3ceeb27d
|
Tried to include the SailingEventManagementPanel, at event creation an
exception was thrown
|
2013-02-01 23:37:17 +01:00 |
|
|
Armin Zamani
|
611791d8d5
|
Removed monitoring bundle from SailingServer Launch config
|
2013-02-01 22:45:46 +01:00 |
|
|
Armin Zamani
|
80421e54cc
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-01-30 17:36:29 +01:00 |
|
|
Armin Zamani
|
7342a32aa1
|
Fixed some merge errors
|
2013-01-30 17:01:29 +01:00 |
|
|
Armin Zamani
|
66424926c4
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.freg.resultimport.test/bin/freg_html_export_sample.html
java/com.sap.sailing.gwt.ui/pom.xml
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/server/SailingServiceImpl.java
|
2013-01-30 16:36:08 +01:00 |
|
|
Armin Zamani
|
37bf2fb98c
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-01-29 20:30:26 +01:00 |
|
|
Armin Zamani
|
55f6b353da
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-01-29 20:29:31 +01:00 |
|
|
Armin Zamani
|
43b7820dbc
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
|
2013-01-29 20:28:44 +01:00 |
|
|
Armin Zamani
|
4b07f67e23
|
fixed a merge error
|
2013-01-28 15:46:59 +01:00 |
|
|
Armin Zamani
|
e0ac319d4d
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/LockUtil.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-01-28 15:28:42 +01:00 |
|
|
Armin Zamani
|
1f5dc1637c
|
added RegattaOverview to Sailing GWT launch and pom.xml
|
2013-01-26 00:46:16 +01:00 |
|