Merge remote branch 'origin/master'

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

@@ -1,53 +0,0 @@
-package com.sap.sailing.gwt.ui.adminconsole;
-
-public enum BoatTypes {
-    RS_X ("RS:X"),
-    RS_XY ("RS:X-Y"),
-    LASER ("Laser"),
-    LASER_RADIAL ("Laser Radial"),
-    LASER_SB3 ("Laser SB3"),
-    FINN ("Finn"),
-    EUROPE ("Europe"),
-    A_CAT ("A-Cat"),
-    CONTENDER ("Contender"),
-    STAR ("Star"),
-    OK_DINGHY ("OK-Dinghy"),
-    FLYING_DUTCHMAN ("Flying Dutchman"),
-    FOLKEBOOT ("Folkeboot"),
-    FORMULA ("Formula"),
-    H_BOOT ("H-Boot"),
-    HOBIE ("Hobie"),
-    CLASS_420 ("420"),
-    CLASS_470 ("470"),
-    CLASS_505 ("505"),
-    CLASS_29er("29er"),
-    CLASS_49er("49er"),
-    CLASS_24mR("2.4mR open"),
-    CLASS_J_24 ("J-24"),
-    CLASS_X_35 ("X-35"),
-    CLASS_X_99 ("X-99"),
-    SWAN_45 ("Swan-45"),
-    ORC_I ("ORC I"),
-    ORC_II ("ORC II"),
-    ORC_III ("ORC II"),
-    ORC_IV ("ORC IV"),
-    MULTIHALL ("Multihull"),
-    ALBIN_BALLAD ("Albin Ballad"),
-    ALBIN_EXPRESS ("Albin Express"),
-    CB66 ("CB66"),
-    J_80 ("J/80"),
-    MELGES24 ("Melges 24"),
-    PLATU25 ("Platu25"),
-    STREAMLINE ("Steamline"),
-    ANY_CLASS ("Any class");
-    
-    private String name;
-    
-    BoatTypes(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

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

@@ -10,6 +10,7 @@ import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.domain.common.BoatClassMasterdata;
 import com.sap.sailing.domain.common.Color;
 import com.sap.sailing.domain.common.CountryCode;
 import com.sap.sailing.domain.common.CountryCodeFactory;
@@ -67,8 +68,8 @@ public class CompetitorEditDialog extends DataEntryDialog<CompetitorDTO> {
         this.boatClassName = createListBox(/* isMultipleSelect */ false);
         int i=0;
         List<String> boatClassNamesList = new ArrayList<String>();
-        for (BoatTypes t : BoatTypes.values()) {
-            boatClassNamesList.add(t.getName());
+        for (BoatClassMasterdata t : BoatClassMasterdata.values()) {
+            boatClassNamesList.add(t.getDisplayName());
         }
         String competitorsBoatClassName = competitorToEdit.getBoatClass() != null ? competitorToEdit.getBoatClass().getName() : null;
         Collections.sort(boatClassNamesList);

java/com.sap.sse.gwt/.classpath

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="com/sap/sse/gwt/jre/" kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sse.gwt/.settings/org.eclipse.jdt.core.prefs

@@ -2,7 +2,7 @@ eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

java/com.sap.sse.gwt/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Shared GWT Code
 Bundle-SymbolicName: com.sap.sse.gwt
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0",
  com.sap.sse.common;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
@@ -19,6 +19,7 @@ Export-Package: com.sap.sse.gwt.client,
  com.sap.sse.gwt.client.async,
  com.sap.sse.gwt.client.controls,
  com.sap.sse.gwt.client.controls.busyindicator,
+ com.sap.sse.gwt.client.controls.listedit,
  com.sap.sse.gwt.client.controls.slider,
  com.sap.sse.gwt.client.dialog,
  com.sap.sse.gwt.client.event,