Merge remote-tracking branch 'origin/master' into newhome

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java

@@ -18,16 +18,16 @@ public enum BoatClassMasterdata {
     B_ONE ("B/ONE", true, 7.80, 2.49, BoatHullType.MONOHULL, "B-ONE"),
     DRAGON_INT ("Dragon Int.", true, 8.89, 1.96, BoatHullType.MONOHULL, "Drachen", "Dragon"),
     EXTREME_40 ("Extreme 40", false, 12.2, 6.60, BoatHullType.CATAMARAN, "Extreme-40", "Extreme40", "ESS40"),
-    EUROPE_INT ("Europe Int.", false, 3.35, 1.35, BoatHullType.MONOHULL, "Europe"),
-    F_18 ("Formula 18", false, 6.85, 2.25, BoatHullType.CATAMARAN, "F18", "F-18"),
-    FARR_30 ("Farr 30", false, 9.42, 3.08, BoatHullType.MONOHULL, "F30", "F-30", "Farr-30"),
-    FINN ("Finn", false, 4.50, 1.51, BoatHullType.MONOHULL),
-    FOLKBOAT ("Folkboat", false, 7.68, 2.20, BoatHullType.MONOHULL, "Folke", "Folkeboot"),
-    F_16 ("Formula 16", false, 5.00, 2.50, BoatHullType.CATAMARAN, "F16", "F-16"),
-    HOBIE_16 ("Hobie 16", false, 5.05, 2.41, BoatHullType.CATAMARAN, "H16"),
-    H_BOAT ("H-Boat", false, 8.28, 2.18, BoatHullType.MONOHULL, "HB"),
-    HOBIE_TIGER ("Hobie Tiger", false, 5.51, 2.60, BoatHullType.CATAMARAN),
-    HOBIE_WILD_CAT ("Hobie Wild Cat", false, 5.49, 2.59, BoatHullType.CATAMARAN, "Hobie Wild Cat F18"),
+    EUROPE_INT ("Europe Int.", true, 3.35, 1.35, BoatHullType.MONOHULL, "Europe"),
+    F_18 ("Formula 18", true, 6.85, 2.25, BoatHullType.CATAMARAN, "F18", "F-18"),
+    FARR_30 ("Farr 30", true, 9.42, 3.08, BoatHullType.MONOHULL, "F30", "F-30", "Farr-30"),
+    FINN ("Finn", true, 4.50, 1.51, BoatHullType.MONOHULL),
+    FOLKBOAT ("Folkboat", true, 7.68, 2.20, BoatHullType.MONOHULL, "Folke", "Folkeboot"),
+    F_16 ("Formula 16", true, 5.00, 2.50, BoatHullType.CATAMARAN, "F16", "F-16"),
+    HOBIE_16 ("Hobie 16", true, 5.05, 2.41, BoatHullType.CATAMARAN, "H16"),
+    H_BOAT ("H-Boat", true, 8.28, 2.18, BoatHullType.MONOHULL, "HB"),
+    HOBIE_TIGER ("Hobie Tiger", true, 5.51, 2.60, BoatHullType.CATAMARAN),
+    HOBIE_WILD_CAT ("Hobie Wild Cat", true, 5.49, 2.59, BoatHullType.CATAMARAN, "Hobie Wild Cat F18"),
     J70 ("J/70", true, 6.93, 2.25, BoatHullType.MONOHULL, "J70", "J-70"),
     J80 ("J/80", true, 8.0, 2.51, BoatHullType.MONOHULL, "J80", "J-80"),
     J24 ("J/24", true, 7.32, 2.67, BoatHullType.MONOHULL, "J24", "J-24"),

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

@@ -25,6 +25,7 @@ import com.google.gwt.user.client.ui.TabPanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.domain.common.LeaderboardNameConstants;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.client.shared.controls.listedit.StringListEditorComposite;
@@ -371,7 +372,7 @@ public class SeriesEditDialog extends DataEntryDialog<SeriesDescriptor> {
             addRacesPanel.add(new Label(stringMessages.withNamePrefix()));
 
             raceNamePrefixTextBox.setWidth("20px");
-            if ("Default".equals(seriesName)) {
+            if (LeaderboardNameConstants.DEFAULT_SERIES_NAME.equals(seriesName)) {
                 raceNamePrefixTextBox.setText("R");
             } else {
                 raceNamePrefixTextBox.setText(seriesName.substring(0, 1).toUpperCase());

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

@@ -16,6 +16,7 @@ import com.google.gwt.user.client.ui.TabPanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.domain.common.LeaderboardNameConstants;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.client.shared.controls.listedit.ListEditorComposite;
@@ -133,7 +134,7 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog<SeriesDTO> {
         widget.ensureDebugId("DiscardThresholdBoxes");
         widget.setVisible(false);
         
-        fleetListComposite = new FleetListEditorComposite(Arrays.asList(new FleetDTO("Default", 0, null)), stringMessages, resources.removeIcon());
+        fleetListComposite = new FleetListEditorComposite(Arrays.asList(new FleetDTO(LeaderboardNameConstants.DEFAULT_FLEET_NAME, 0, null)), stringMessages, resources.removeIcon());
         fleetListComposite.ensureDebugId("FleetListEditorComposite");
         fleetListComposite.addValueChangeHandler(new ValueChangeHandler<List<FleetDTO>>() {
             

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java

@@ -327,7 +327,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg
                 int seriesRow = 0;
                 for (SeriesDTO series : regatta.series) {
                     // render the series name
-                    if (! "Default".equals(series.getName())) {
+                    if (!LeaderboardNameConstants.DEFAULT_SERIES_NAME.equals(series.getName())) {
                         seriesGrid.setHTML(seriesRow, 0, TEXTTEMPLATE.textWithClass(series.getName(), 50, STYLE_TABLE_TEXT));
                     }
                     seriesGridFormatter.setVerticalAlignment(seriesRow, 0, HasVerticalAlignment.ALIGN_MIDDLE);
@@ -355,7 +355,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg
                         FleetDTO fleet = series.getFleets().get(0);
                         List<RaceColumnDTO> raceColumnsOfSeries = getRacesOfFleet(leaderboard, series, fleet);
                         String displayName = fleet.getName();
-                        if (! "Default".equals(fleet.getName())) {
+                        if (!LeaderboardNameConstants.DEFAULT_FLEET_NAME.equals(fleet.getName())) {
                             Grid fleetsGrid = new Grid(1, 2);
                             CellFormatter fleetGridsFormatter = fleetsGrid.getCellFormatter();
                             fleetsGrid.setHTML(0, 0, TEXTTEMPLATE.textWithClass(displayName, 50, STYLE_TABLE_TEXT));