From aa2f1e0bdf1d5552572f16e14fb8243e9a346fc3 Mon Sep 17 00:00:00 2001 From: Lukas Niemeier Date: Sat, 25 May 2013 17:29:55 +0200 Subject: [PATCH] refs bug 1354 # Made 'defaultCourseArea' on Regatta changeable. --- .../sailing/domain/test/mock/MockedTrackedRace.java | 5 +++++ .../src/com/sap/sailing/domain/base/Regatta.java | 10 ++++++++++ .../com/sap/sailing/domain/base/impl/RegattaImpl.java | 9 ++++++++- .../com/sap/sailing/gwt/ui/test/MockedTrackedRace.java | 6 ++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java index a7049635b4b..7d389802cc3 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java @@ -400,6 +400,11 @@ public class MockedTrackedRace implements DynamicTrackedRace { // TODO Auto-generated method stub return null; } + + @Override + public void setDefaultCourseArea(CourseArea newCourseArea) { + // TODO Auto-generated method stub + } }; } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java index 514272b52c9..72923863dfe 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java @@ -18,7 +18,17 @@ import com.sap.sailing.domain.tracking.TrackedRegatta; public interface Regatta extends Named, WithID { ScoringScheme getScoringScheme(); + /** + * Gets the course area for all races of this {@link Regatta}. + * @return the {@link CourseArea} object. + */ CourseArea getDefaultCourseArea(); + + /** + * Sets the course area for all races of this {@link Regatta}. + * @param newCourseArea {@link CourseArea} to be set. + */ + void setDefaultCourseArea(CourseArea newCourseArea); /** * A regatta consists of one or more series. diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java index fb36aebf0dd..df221eea0de 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java @@ -48,7 +48,9 @@ public class RegattaImpl extends NamedImpl implements Regatta, RaceColumnListene private final ScoringScheme scoringScheme; private final Serializable id; private transient RaceLogStore raceLogStore; - private final CourseArea courseArea; + + // Can be changed... + private CourseArea courseArea; /** * Regattas may be constructed as implicit default regattas in which case they won't need to be stored @@ -335,4 +337,9 @@ public class RegattaImpl extends NamedImpl implements Regatta, RaceColumnListene return courseArea; } + @Override + public void setDefaultCourseArea(CourseArea newCourseArea) { + this.courseArea = newCourseArea; + } + } diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java index e01e649a794..dd36d37814d 100644 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java @@ -400,6 +400,12 @@ public class MockedTrackedRace implements DynamicTrackedRace { // TODO Auto-generated method stub return null; } + + @Override + public void setDefaultCourseArea(CourseArea newCourseArea) { + // TODO Auto-generated method stub + + } }; }