some renames towards FlexibleLeaderboard and RaceColumn instead of RaceInLeaderboard stuff

java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java

@@ -123,7 +123,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
             BasicDBObject query = new BasicDBObject();
             query.put(FieldNames.LEADERBOARD_NAME.name(), name);
             for (DBObject o : leaderboardCollection.find(query)) {
-                result = loadLeaderboard(o);
+                result = loadFlexibleLeaderboard(o);
             }
         } catch (Throwable t) {
              // something went wrong during DB access; report, then use empty new wind track
@@ -139,7 +139,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
         Set<Leaderboard> result = new HashSet<Leaderboard>();
         try {
             for (DBObject o : leaderboardCollection.find()) {
-                result.add(loadLeaderboard(o));
+                result.add(loadFlexibleLeaderboard(o));
             }
         } catch (Throwable t) {
              // something went wrong during DB access; report, then use empty new wind track
@@ -149,7 +149,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
         return result;
     }
 
-    private Leaderboard loadLeaderboard(DBObject o) {
+    private Leaderboard loadFlexibleLeaderboard(DBObject o) {
         SettableScoreCorrection scoreCorrection = new ScoreCorrectionImpl();
         BasicDBList dbDiscardIndexResultsStartingWithHowManyRaces = (BasicDBList) o.get(FieldNames.LEADERBOARD_DISCARDING_THRESHOLDS.name());
         int[] discardIndexResultsStartingWithHowManyRaces = new int[dbDiscardIndexResultsStartingWithHowManyRaces.size()];
@@ -158,8 +158,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
             discardIndexResultsStartingWithHowManyRaces[i++] = (Integer) discardingThresholdAsObject;
         }
         ThresholdBasedResultDiscardingRule resultDiscardingRule = new ResultDiscardingRuleImpl(discardIndexResultsStartingWithHowManyRaces);
-        // TODO should this be a FlexibleLeaderboard or a RegattaLeaderboard? See bug 636
-        LeaderboardImplWithDelayedCarriedPoints result = new LeaderboardImplWithDelayedCarriedPoints(
+        FlexibleLeaderboardImplWithDelayedCarriedPoints result = new FlexibleLeaderboardImplWithDelayedCarriedPoints(
                 (String) o.get(FieldNames.LEADERBOARD_NAME.name()), scoreCorrection, resultDiscardingRule);
         BasicDBList dbRaceColumns = (BasicDBList) o.get(FieldNames.LEADERBOARD_COLUMNS.name());
         // For a FlexibleLeaderboard, fleets are owned by the leaderboard's RaceColumn objects. We need to manage them here:
@@ -300,7 +299,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
         for (Object object : dbLeaderboardIds) {
             ObjectId dbLeaderboardId = (ObjectId) object;
             DBObject dbLeaderboard = leaderboardCollection.findOne(dbLeaderboardId);
-            leaderboards.add(loadLeaderboard(dbLeaderboard));
+            leaderboards.add(loadFlexibleLeaderboard(dbLeaderboard));
         }
         
         return new LeaderboardGroupImpl(name, description, leaderboards);
@@ -316,7 +315,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
             BasicDBObject query = new BasicDBObject("$where", "function() { return db." + CollectionNames.LEADERBOARD_GROUPS.name() + ".find({ "
                     + FieldNames.LEADERBOARD_GROUP_LEADERBOARDS.name() + ": this._id }).count() == 0; }");
             for (DBObject o : leaderboardCollection.find(query)) {
-                result.add(loadLeaderboard(o));
+                result.add(loadFlexibleLeaderboard(o));
             }
         } catch (Throwable t) {
             logger.log(Level.SEVERE, "Error connecting to MongoDB, unable to load leaderboards.");

java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FlexibleLeaderboardImplWithDelayedCarriedPoints.java

@@ -32,7 +32,7 @@ import com.sap.sailing.domain.tracking.TrackedRace;
  * @author Axel Uhl (d043530)
  * 
  */
-public class LeaderboardImplWithDelayedCarriedPoints extends FlexibleLeaderboardImpl {
+public class FlexibleLeaderboardImplWithDelayedCarriedPoints extends FlexibleLeaderboardImpl {
     private static final long serialVersionUID = -8933075542228571746L;
     private final Map<String, Integer> carriedPointsByCompetitorName;
     private final Map<String, Map<RaceColumn, MaxPointsReason>> maxPointsReasonsByCompetitorName;
@@ -41,14 +41,14 @@ public class LeaderboardImplWithDelayedCarriedPoints extends FlexibleLeaderboard
 
     /**
      * A wrapper for {@link RaceColumn} that, when its {@link #setTrackedRace(Fleet, TrackedRace)} method is called,
-     * additionally calls {@link LeaderboardImplWithDelayedCarriedPoints#assignLeftOvers(TrackedRace)}.
+     * additionally calls {@link FlexibleLeaderboardImplWithDelayedCarriedPoints#assignLeftOvers(TrackedRace)}.
      * 
      * @author Axel Uhl (D043530)
      */
-    private class RaceInLeaderboardForDelayedCarriedPoints extends RaceColumnImpl {
+    private class RaceColumnForDelayedCarriedPoints extends RaceColumnImpl {
         private static final long serialVersionUID = -1243132535406059096L;
 
-        public RaceInLeaderboardForDelayedCarriedPoints(Leaderboard leaderboard, String name, boolean medalRace, Fleet... fleets) {
+        public RaceColumnForDelayedCarriedPoints(Leaderboard leaderboard, String name, boolean medalRace, Fleet... fleets) {
             super(name, medalRace, fleets==null ? Collections.singletonList(defaultFleet) : Arrays.asList(fleets));
         }
 
@@ -61,7 +61,7 @@ public class LeaderboardImplWithDelayedCarriedPoints extends FlexibleLeaderboard
         }
     }
     
-    public LeaderboardImplWithDelayedCarriedPoints(String name, SettableScoreCorrection scoreCorrection,
+    public FlexibleLeaderboardImplWithDelayedCarriedPoints(String name, SettableScoreCorrection scoreCorrection,
             ThresholdBasedResultDiscardingRule resultDiscardingRule) {
         super(name, scoreCorrection, resultDiscardingRule);
         carriedPointsByCompetitorName = new HashMap<String, Integer>();
@@ -80,7 +80,7 @@ public class LeaderboardImplWithDelayedCarriedPoints extends FlexibleLeaderboard
 
     @Override
     protected RaceColumnImpl createRaceColumn(String columnName, boolean medalRace, Fleet... fleets) {
-        return new RaceInLeaderboardForDelayedCarriedPoints(this, columnName, medalRace, fleets);
+        return new RaceColumnForDelayedCarriedPoints(this, columnName, medalRace, fleets);
     }
 
     public void setCarriedPoints(String competitorName, int carriedPoints) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java

@@ -612,7 +612,7 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
         List<Pair<RaceColumnDTO, String>> existingRacesWithoutThisRace = new ArrayList<Pair<RaceColumnDTO, String>>();
         existingRacesWithoutThisRace.addAll(raceColumnAndFleetNameList.getList());
         existingRacesWithoutThisRace.remove(object);
-        final RaceInLeaderboardDialog raceDialog = new RaceInLeaderboardDialog(existingRacesWithoutThisRace,
+        final RaceColumnDialog raceDialog = new RaceColumnDialog(existingRacesWithoutThisRace,
                 object.getA(), stringMessages, new AsyncCallback<Pair<RaceColumnDTO, String>>() {
                     @Override
                     public void onFailure(Throwable caught) {
@@ -685,7 +685,7 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
     private void addRaceColumnToLeaderboard() {
         final RaceColumnDTO raceInLeaderboard = new RaceColumnDTO();
         final String leaderboardName = getSelectedLeaderboardName();
-        final RaceInLeaderboardDialog raceDialog = new RaceInLeaderboardDialog(raceColumnAndFleetNameList.getList(),
+        final RaceColumnDialog raceDialog = new RaceColumnDialog(raceColumnAndFleetNameList.getList(),
                 raceInLeaderboard, stringMessages, new AsyncCallback<Pair<RaceColumnDTO, String>>() {
 
                     @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnDialog.java

@@ -19,7 +19,7 @@ import com.sap.sailing.gwt.ui.shared.RaceColumnDTO;
  * @author Axel Uhl (D043530)
  *
  */
-public class RaceInLeaderboardDialog extends DataEntryDialog<Pair<RaceColumnDTO, String>> {
+public class RaceColumnDialog extends DataEntryDialog<Pair<RaceColumnDTO, String>> {
     private final static String DEFAULT_FLEET_NAME = "Default";
     
     private final TextBox raceNameBox;
@@ -66,7 +66,7 @@ public class RaceInLeaderboardDialog extends DataEntryDialog<Pair<RaceColumnDTO,
 
     }
 
-    public RaceInLeaderboardDialog(Collection<Pair<RaceColumnDTO, String>> existingRaces,
+    public RaceColumnDialog(Collection<Pair<RaceColumnDTO, String>> existingRaces,
             RaceColumnDTO raceInLeaderboard, StringMessages stringConstants,
             AsyncCallback<Pair<RaceColumnDTO, String>> callback) {
         super(stringConstants.name(), null, stringConstants.ok(), stringConstants.cancel(),