fixed bug with missing Serializer/Deserializer for the regatta configuration of the new SWC start procedure.

Renamed SWCConfiguration to SWCStartConfiguration and the impl classes accordingly.

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/ReadonlyRacingProcedureFactory.java

@@ -49,7 +49,7 @@ public class ReadonlyRacingProcedureFactory implements RacingProcedureFactory {
         case RRS26:
             return new RRS26RacingProcedureImpl(raceLog, author, loadedConfiguration.getRRS26Configuration(), raceLogResolver);
         case SWC:
-            return new SWCRacingProcedureImpl(raceLog, author, loadedConfiguration.getSWCConfiguration(), raceLogResolver);
+            return new SWCRacingProcedureImpl(raceLog, author, loadedConfiguration.getSWCStartConfiguration(), raceLogResolver);
         case BASIC:
             return new BasicRacingProcedureImpl(raceLog, author, loadedConfiguration.getBasicConfiguration(), raceLogResolver);
         case LEAGUE:

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/SWCRacingProcedure.java

@@ -1,11 +1,11 @@
 package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
 
-import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
+import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
 import com.sap.sailing.domain.common.racelog.Flags;
 
 public interface SWCRacingProcedure extends ConfigurableStartModeFlagRacingProcedure {
 
     public final static Flags DefaultStartMode = Flags.UNIFORM;
     
-    SWCConfiguration getConfiguration();
+    SWCStartConfiguration getConfiguration();
 }

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/SWCRacingProcedureImpl.java

@@ -18,7 +18,7 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProce
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.FulfillmentFunction;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.NoMorePrerequisite;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.SWCRacingProcedure;
-import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
+import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
 import com.sap.sailing.domain.common.racelog.FlagPole;
 import com.sap.sailing.domain.common.racelog.Flags;
 import com.sap.sailing.domain.common.racelog.RacingProcedureType;
@@ -35,7 +35,7 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
     private boolean startmodeFlagHasBeenSet;
 
     public SWCRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author, 
-             SWCConfiguration configuration, RaceLogResolver raceLogResolver) {
+             SWCStartConfiguration configuration, RaceLogResolver raceLogResolver) {
         super(raceLog, author, configuration, raceLogResolver);
         
         RacingProcedureTypeAnalyzer procedureAnalyzer = new RacingProcedureTypeAnalyzer(raceLog);
@@ -187,8 +187,8 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
     }
     
     @Override
-    public SWCConfiguration getConfiguration() {
-        return (SWCConfiguration) super.getConfiguration();
+    public SWCStartConfiguration getConfiguration() {
+        return (SWCStartConfiguration) super.getConfiguration();
     }
 
 }

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/RegattaConfiguration.java

@@ -7,7 +7,7 @@ import com.sap.sailing.domain.base.configuration.procedures.ESSConfiguration;
 import com.sap.sailing.domain.base.configuration.procedures.GateStartConfiguration;
 import com.sap.sailing.domain.base.configuration.procedures.LeagueConfiguration;
 import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
-import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
+import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
 import com.sap.sailing.domain.common.CourseDesignerMode;
 import com.sap.sailing.domain.common.racelog.RacingProcedureType;
 
@@ -37,7 +37,7 @@ public interface RegattaConfiguration extends Serializable, Cloneable {
      * Gets the configuration for SWC races.
      * @return <code>null</code> if there is no configuration.
      */
-    SWCConfiguration getSWCConfiguration();
+    SWCStartConfiguration getSWCStartConfiguration();
 
     /**
      * Gets the configuration for Gate Start races.

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/EmptyRegattaConfiguration.java

@@ -18,7 +18,7 @@ public class EmptyRegattaConfiguration extends RegattaConfigurationImpl implemen
         setDefaultRacingProcedureType(RacingProcedureType.UNKNOWN);
         setDefaultCourseDesignerMode(CourseDesignerMode.UNKNOWN);
         setRRS26Configuration(new RRS26ConfigurationImpl());
-        setSWCConfiguration(new SWCConfigurationImpl());
+        setSWCStartConfiguration(new SWCStartConfigurationImpl());
         setGateStartConfiguration(new GateStartConfigurationImpl());
         setESSConfiguration(new ESSConfigurationImpl());
         setBasicConfiguration(new RacingProcedureConfigurationImpl());

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/RegattaConfigurationImpl.java

@@ -6,7 +6,7 @@ import com.sap.sailing.domain.base.configuration.procedures.ESSConfiguration;
 import com.sap.sailing.domain.base.configuration.procedures.GateStartConfiguration;
 import com.sap.sailing.domain.base.configuration.procedures.LeagueConfiguration;
 import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
-import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
+import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
 import com.sap.sailing.domain.common.CourseDesignerMode;
 import com.sap.sailing.domain.common.racelog.RacingProcedureType;
 
@@ -18,7 +18,7 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
     private CourseDesignerMode defaultCourseDesignerMode;
     
     private RRS26Configuration rrs26Configuration;
-    private SWCConfiguration swcConfiguration;
+    private SWCStartConfiguration swcStartConfiguration;
     private GateStartConfiguration gateStartConfiguration;
     private ESSConfiguration essConfiguration;
     private LeagueConfiguration leagueConfiguration;
@@ -52,12 +52,12 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
     }
 
     @Override
-    public SWCConfiguration getSWCConfiguration() {
-        return swcConfiguration;
+    public SWCStartConfiguration getSWCStartConfiguration() {
+        return swcStartConfiguration;
     }
 
-    public void setSWCConfiguration(SWCConfiguration swcConfiguration) {
-        this.swcConfiguration = swcConfiguration;
+    public void setSWCStartConfiguration(SWCStartConfiguration swcStartConfiguration) {
+        this.swcStartConfiguration = swcStartConfiguration;
     }
 
     @Override
@@ -102,7 +102,7 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
         copy.setDefaultRacingProcedureType(defaultRacingProcedureType);
         copy.setDefaultCourseDesignerMode(defaultCourseDesignerMode);
         copy.setRRS26Configuration(rrs26Configuration);
-        copy.setSWCConfiguration(swcConfiguration);
+        copy.setSWCStartConfiguration(swcStartConfiguration);
         copy.setGateStartConfiguration(gateStartConfiguration);
         copy.setESSConfiguration(essConfiguration);
         copy.setBasicConfiguration(basicConfiguration);
@@ -124,9 +124,9 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
             target.setRRS26Configuration(
                     (RRS26Configuration) target.getRRS26Configuration().merge(update.getRRS26Configuration()));
         }
-        if (update.getSWCConfiguration() != null) {
-            target.setSWCConfiguration(
-                    (SWCConfiguration) target.getSWCConfiguration().merge(update.getSWCConfiguration()));
+        if (update.getSWCStartConfiguration() != null) {
+            target.setSWCStartConfiguration(
+                    (SWCStartConfiguration) target.getSWCStartConfiguration().merge(update.getSWCStartConfiguration()));
         }
         if (update.getGateStartConfiguration() != null) {
             target.setGateStartConfiguration(

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/SWCConfigurationImpl.java

@@ -1,20 +0,0 @@
-package com.sap.sailing.domain.base.configuration.impl;
-
-import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
-import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
-
-public class SWCConfigurationImpl extends RacingProcedureWithConfigurableStartModeFlagConfigurationImpl
-        implements SWCConfiguration {
-
-    private static final long serialVersionUID = 5141617199229598965L;
-
-    @Override
-    public RacingProcedureConfiguration merge(RacingProcedureConfiguration value) {
-        SWCConfiguration update = (SWCConfiguration) value;
-        SWCConfigurationImpl target = (SWCConfigurationImpl) super.merge(update);
-        if (update.getStartModeFlags() != null) {
-            target.setStartModeFlags(update.getStartModeFlags());
-        }
-        return target;
-    }
-}

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/SWCStartConfigurationImpl.java

@@ -0,0 +1,24 @@
+package com.sap.sailing.domain.base.configuration.impl;
+
+import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
+import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
+
+public class SWCStartConfigurationImpl extends RacingProcedureWithConfigurableStartModeFlagConfigurationImpl
+        implements SWCStartConfiguration {
+
+    private static final long serialVersionUID = 5141617199229598965L;
+
+    @Override
+    public RacingProcedureConfiguration merge(RacingProcedureConfiguration value) {
+        SWCStartConfiguration update = (SWCStartConfiguration) value;
+        SWCStartConfigurationImpl target = (SWCStartConfigurationImpl) super.merge(update);
+        if (update.getStartModeFlags() != null) {
+            target.setStartModeFlags(update.getStartModeFlags());
+        }
+        return target;
+    }
+    
+    protected SWCStartConfigurationImpl newInstance() {
+        return new SWCStartConfigurationImpl();
+    }
+}

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/SWCStartConfiguration.java

@@ -6,5 +6,5 @@ package com.sap.sailing.domain.base.configuration.procedures;
  * @author Frank
  *
  */
-public interface SWCConfiguration extends ConfigurableStartModeFlagRacingProcedureConfiguration {
+public interface SWCStartConfiguration extends ConfigurableStartModeFlagRacingProcedureConfiguration {
 }