diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index 5a92504f20e..3eda2625e91 100755
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.common,
org.moxieapps.gwt.highcharts;bundle-version="1.1.4",
com.sap.sailing.geocoding,
- com.sap.sailing.server.replication
+ com.sap.sailing.server.replication,
+ com.sap.sailing.simulator
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
Bundle-ActivationPolicy: lazy
Export-Package: com.sap.sailing.gwt.ui.client;x-friends:="com.sap.sailing.gwt.ui.test",
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
index 810f5501462..7faf56faa29 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
@@ -297,6 +297,37 @@ public interface StringMessages extends Messages {
String finishLine();
String advantageLine();
String courseMiddleLine();
+ /*Start of simulator related messages*/
+ String simulator();
+ String optionsBar();
+ String update();
+
+ String setup();
+ String pattern();
+ String strength();
+ String oscillation();
+ String oscillating();
+ String amplitude();
+ String frequency();
+ String noise();
+
+ String sailing();
+ String optimality();
+ String maximumTurns();
+ String raceDirection();
+ String upWind();
+ String downWind();
+ String strategies();
+ String omniscient();
+ String opportunistic();
+ String mixed();
+ String maps();
+ String startEnd();
+ String course();
+ String summary();
+ String replay();
+ String display();
+ /*End of simulator related messages*/
String jmsPortNumber();
String servletPortNumber();
String registeredAt(String string);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
index 10ef80f5de8..308d338a12b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
@@ -295,15 +295,42 @@ startLine=Start line
finishLine=Finish line
advantageLine=Advantage line
courseMiddleLine=Course middle line
+simulator=Simulator
+optionsBar=Optionsbar
+update=Update
+setup=Setup
+pattern=Pattern
+strength=Strength (in kn)
+oscillation=Oscillation
+oscillating=Oscillating
+amplitude=Amplitude(in Grad)
+frequency=Frequency(in 1/h)
+noise=Noise
+sailing=Sailing
+optimality=Optimality
+maximumTurns=Maximum Turns
+raceDirection=Race Direction
+upWind=Upwind
+downWind=Downwind
+strategies=Strategies
+omniscient=Omniscient
+opportunistic=Opportunistic
+mixed=Mixed
+maps=Maps
+startEnd=Start-End
+course=Course
+summary=Summary
+replay=Replay
+display=Display
jmsPortNumber=JMS port number
servletPortNumber=Servlet port number
registeredAt=Registered at {0}
replicatingFromMaster=Replicating from master {0}, JMS port {1}, servlet port {2}
showWindSpeedSeries=Show wind speed data
-showWindDirectionSeries=Show wind directions data
+showWindDirectionSeries=Show wind directions data
fleet=Fleet
boatClass=Boat Class
-setDelayToLive=Set delay to live
+setDelayToLive=Set delay to live
pleaseEnterNonEmptyVenue=Please enter a venue.
eventWithThisNameAlreadyExists=An event with this name already exists.
venue=Venue
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
index 3e68f23254d..35a0b9ba948 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
@@ -296,6 +296,33 @@ startLine=Startlinie
finishLine=Ziellinie
advantageLine=Führungslinie
courseMiddleLine=Kursmittellinie
+simulator=Simulator
+optionsBar=Optionsbar
+update=Update
+setup=Setup
+pattern=Pattern
+strength=Strength(in kn)
+oscillation=Oscillation
+oscillating=Oscillating
+amplitude=Amplitude(in Grad)
+frequency=Frequency(in 1/h)
+noise=Noise
+sailing=Sailing
+optimality=Optimality
+maximumTurns=Maximum Turns
+raceDirection=Race Direction
+upWind=Upwind
+downWind=Downwind
+strategies=Strategies
+omniscient=Omniscient
+opportunistic=Opportunistic
+mixed=Mixed
+maps=Maps
+startEnd=Start-End
+course=Course
+summary=Summary
+replay=Replay
+display=Display
jmsPortNumber=JMS Portnummer
servletPortNumber=Servlet Portnummer
registeredAt=Registriert {0}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
index 0c7ca5740ce..b8a43ab3317 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
@@ -343,7 +343,7 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula
}
public BoatClassDTO[] getBoatClasses() {
- BoatClassDTO boatClassDTO = new BoatClassDTO("49er");
+ BoatClassDTO boatClassDTO = new BoatClassDTO("49er",4.995);
return new BoatClassDTO[] { boatClassDTO };
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java
index c829bee2e00..fdc04cb75d1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java
@@ -352,10 +352,12 @@ public class SimulatorMainPanel extends SplitLayoutPanel {
sliderBar.addValueChangeHandler(handler);
sliderBar.setLabelFormatter(new SliderBar.LabelFormatter() {
- @Override
- public String formatLabel(SliderBar slider, double value) {
- return String.valueOf(Math.round(value));
- }
+
+ @Override
+ public String formatLabel(SliderBar slider, Double value,
+ Double previousValue) {
+ return String.valueOf(Math.round(value));
+ }
});
sliderBar.setCurrentValue(defaultValue);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
index c1ac3fe6038..21992405079 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
@@ -17,6 +17,9 @@
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
index 44b72e7079a..7ee6f322816 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
@@ -20,9 +20,9 @@
-
+
-
+
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy).launch b/java/com.sap.sailing.server/SailingServer (Proxy).launch
index 4798ce05e64..c20c4ec721b 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy).launch
+++ b/java/com.sap.sailing.server/SailingServer (Proxy).launch
@@ -21,10 +21,10 @@
-
+
-
+