Merge remote-tracking branch 'origin/design2015' into design2015

2026-10-01 09:53:58 +00:00 · 2015-05-27 17:36:48 +02:00
commit 539bca0e5f
@@ -43,7 +43,7 @@ public enum BoatClassMasterdata {
    NACRA_17 ("Nacra 17", true, 5.25, 2.59, BoatHullType.CATAMARAN, true, "N17", "Nacra-17"),
    OK ("OK Dinghy", true, 5.25, 2.59, BoatHullType.MONOHULL, false, "OK-Dinghy", "OK-Jolle", "OK"),
    OPTIMIST ("Optimist", true, 2.34, 1.07, BoatHullType.MONOHULL, false, "Opti", "Optimist Dinghy"),
-    PIRAT ("Pirat", true, 5.00, 1.61, BoatHullType.MONOHULL, false, "Pirate", "Piraten"),
+    PIRATE ("Pirate", true, 5.00, 1.61, BoatHullType.MONOHULL, false, "Pirat", "Piraten"),
    PLATU_25 ("Platu 25", true, 7.53, 2.62, BoatHullType.MONOHULL, true, "Platu", "Platu-25", "PLA", "B25"),
    RS_X ("RS:X", true, 2.86, 0.93, BoatHullType.SURFERBOARD, false, "RS-X", "RSX", "RS:X"),
    SONAR ("Sonar", true, 7.01, 2.39, BoatHullType.MONOHULL, true),
@@ -11,6 +11,4 @@ public interface RaceStateEventScheduler {
    void unscheduleStateEvent(RaceStateEvents stateEventName);

    void unscheduleAllEvents();
-    
-    
 }
@@ -58,7 +58,7 @@ public class BoatClassImageResolver {
        boatClassIconsMap.put(BoatClassMasterdata.NACRA_17.getDisplayName(), imageResources.Nacra17Icon());
        boatClassIconsMap.put(BoatClassMasterdata.OK.getDisplayName(), imageResources.OKIcon());
        boatClassIconsMap.put(BoatClassMasterdata.OPTIMIST.getDisplayName(), imageResources.OptimistIcon());
-        boatClassIconsMap.put(BoatClassMasterdata.PIRAT.getDisplayName(), imageResources.PiratIcon());
+        boatClassIconsMap.put(BoatClassMasterdata.PIRATE.getDisplayName(), imageResources.PiratIcon());
        boatClassIconsMap.put(BoatClassMasterdata.PLATU_25.getDisplayName(), imageResources.Platu25Icon());
        boatClassIconsMap.put(BoatClassMasterdata.RS_X.getDisplayName(), imageResources.RSXIcon());
        boatClassIconsMap.put(BoatClassMasterdata.SONAR.getDisplayName(), imageResources.SonarIcon());
@@ -20,6 +20,7 @@ public interface SharedResources extends ClientBundle {
        String navbar_buttonhidden();
        String navbar_buttonactive();
        String button();
+        String buttontextonly();
        String buttonsmall();
        String buttonstrong();
        String buttoninactive();
@@ -41,6 +42,12 @@ public interface SharedResources extends ClientBundle {
        String lightbox_overlay();
        String lightbox_content();
        String lightbox_close();
+        String spacer();
+        String spacersmall();
+        String spacermediumsmall();
+        String spacermedium();
+        String spacermediumbig();
+        String spacerbig();
        String stickyheader();
        String slideto();
        String slidetonav();
@@ -4,6 +4,7 @@
    <ui:with field="i18n_ubi" type="com.sap.sailing.gwt.common.client.i18n.TextMessages"/>
 	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
  <g:HTMLPanel>
+    <div class="{res.mainCss.spacer} {res.mainCss.spacersmall}"></div>
    <m:Message ui:field="message" />
    <div class="{res.mediaCss.grid}">
      <g:SimplePanel ui:field="stage" addStyleNames="{res.mediaCss.small12} {res.mediaCss.columns}" />
@@ -1,11 +1,11 @@
 .message {
  font-size: 1rem;
-  margin-top: 2em;
  line-height: 1.733333333333333em;
  background: #f2f2f2;
  border: 1px solid #dedede;
  border-radius: 0.333333333333333em;
  padding: 1.066666666666667em 2.533333333333333em 1.066666666666667em 2.733333333333333em;
+  margin-bottom: 1.333333333333333em;
 }
 .message img {
  display: inline-block;
@@ -36,7 +36,6 @@
  font-size: 1rem;
  height: 28.333333333333332em;
  position: relative;
-  margin-top: 1.333333333333333em;
 }
@media (max-width: 976px) {
  .video {
@@ -129,6 +129,14 @@ figcaption {
  outline: none;
  text-decoration: none;
 }
+.buttontextonly {
+  color: #333;
+  background: none;
+  -webkit-transition: none;
+     -moz-transition: none;
+          transition: none;
+  font-weight: normal;
+}
 .buttonsmall {
  visibility: inherit;
 }
@@ -338,8 +346,7 @@ figcaption {
          transform: translate(-50%, -50%);
 }
 .mainsection {
-  padding-top: 5.333333333333333em;
-  padding-bottom: 5.333333333333333em;
+  padding: 5.333333333333333em 0;
 }
 .mainsection_header {
  text-align: center;
@@ -400,6 +407,28 @@ figcaption {
  cursor: pointer;
  z-index: 2;
 }
+.spacer {
+  width: 100%;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+.spacersmall {
+  height: 1em;
+}
+.spacermediumsmall {
+  height: 1.333333333333333em;
+}
+.spacermedium {
+  height: 2em;
+}
+.spacermediumbig {
+  height: 4em;
+}
+.spacerbig {
+  height: 5.333333333333333em;
+}
 .stickyheader {
  background: inherit;
 }
@@ -20,6 +20,7 @@ public interface ThemeResources extends ClientBundle {
        String navbar_buttonhidden();
        String navbar_buttonactive();
        String button();
+        String buttontextonly();
        String buttonsmall();
        String buttonstrong();
        String buttoninactive();
@@ -41,6 +42,12 @@ public interface ThemeResources extends ClientBundle {
        String lightbox_overlay();
        String lightbox_content();
        String lightbox_close();
+        String spacer();
+        String spacersmall();
+        String spacermediumsmall();
+        String spacermedium();
+        String spacermediumbig();
+        String spacerbig();
        String stickyheader();
        String slideto();
        String slidetonav();
@@ -44,7 +44,7 @@ h2 {
  font-size: 1.466666666666667em;
  font-weight: bold;
  color: #008fcc;
-  margin-top: 0.7em;
+  margin-top: 0;
  margin-bottom: 0.7em;
 }
 h3 {
@@ -129,6 +129,14 @@ figcaption {
  outline: none;
  text-decoration: none;
 }
+.buttontextonly {
+  color: #333;
+  background: none;
+  -webkit-transition: none;
+     -moz-transition: none;
+          transition: none;
+  font-weight: normal;
+}
 .buttonsmall {
  visibility: inherit;
 }
@@ -338,8 +346,7 @@ figcaption {
          transform: translate(-50%, -50%);
 }
 .mainsection {
-  padding-top: 5.333333333333333em;
-  padding-bottom: 5.333333333333333em;
+  padding: 5.333333333333333em 0;
 }
 .mainsection_header {
  text-align: center;
@@ -400,6 +407,28 @@ figcaption {
  cursor: pointer;
  z-index: 2;
 }
+.spacer {
+  width: 100%;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+.spacersmall {
+  height: 1em;
+}
+.spacermediumsmall {
+  height: 1.333333333333333em;
+}
+.spacermedium {
+  height: 2em;
+}
+.spacermediumbig {
+  height: 4em;
+}
+.spacerbig {
+  height: 5.333333333333333em;
+}
 .stickyheader {
  background: inherit;
 }
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TracTrac Client module
 Bundle-SymbolicName: com.tractrac.clientmodule
-Bundle-Version: 3.0.10
+Bundle-Version: 3.0.11
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
 lib/TracAPI.jar
@@ -16,6 +16,39 @@ It contains also some files:
 - test.sh -> script that compiles the code in the src folder, creates the test.jar library and execute the code of the example.
 - Manifest.txt -> manifest used to create the test.jar file
 
+********************************************
+************* TracAPI 3.0.11 ***************
+********************************************
+This is a final version. It fixes bugs in the implementation and it adds a some features. 
+These features add methods to the API, but they keep the backward compatibility. 
+This version provides a new JavaDoc version.
+
+Release date: 27/05/2015
+Build number: 10715
+
+ 1) Features 
+ 
+ - Adding the method IRace.setInitialized(boolean) that allows to load control point positions despite of
+ the race is not initialized (Requested by Jorge Piera, 17/05/2015)
+ 
+ 1) Bugs 
+ 
+  - The subscription library sends (per each control point) an "ControlPointPosition" event with the positions 
+ of the parameters with a time stamp equals to the tracking start time. If the control  point is static (it 
+ doesn't have a tracker), it means that this control won't exist until the tracking start time arrives: it is 
+ not possible to open a subscription connection before the tracking start time and see the control point. But 
+ if the control is static,  it has to exist during all the event. Now when a control is static, the subscription 
+ library sends a "ControlPointPosition" event with the event start time and then it sends other "ControlPointPosition"
+ event with the tracking start time. It allows to connect with future races and see the static controls (Requested 
+ by Jakob Odum, 25/02/2015)
+   
+ - It is possible to add two or more subscriptions for the same subscriber (Reported by Jorge Piera, 02/05/2015)
+ 
+ - If a race is in a not initialized state and it is loaded using the parameters file, the library assumes that 
+ the consumer application wants to load the race and it changes its initialized attribute to true. This assumption 
+ is  wrong. Now, if a race is not initialized it will continue being uninitialized until the event administrator 
+ changes its state to initialized (Reported by Axel Uhl, 17/05/2015)
+ 
 ********************************************
 ************* TracAPI 3.0.10 ***************
 ******************************************** 
@@ -8,6 +8,6 @@
    <version>1.0.0-SNAPSHOT</version>
  </parent>
  <artifactId>com.tractrac.clientmodule</artifactId>
-  <version>3.0.10</version>
+  <version>3.0.11</version>
  <packaging>eclipse-plugin</packaging>
 </project>