Merge branch 'master' into axel-usermanagement

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

@@ -2,6 +2,6 @@ package com.sap.sailing.domain.common;
 
 public enum ScoringSchemeType {
     LOW_POINT, HIGH_POINT, HIGH_POINT_ESS_OVERALL, HIGH_POINT_LAST_BREAKS_TIE, HIGH_POINT_FIRST_GETS_TEN,
-    HIGH_POINT_FIRST_GETS_ONE, LOW_POINT_WINNER_GETS_ZERO, HIGH_POINT_WINNER_GETS_SIX, HIGH_POINT_WINNER_GETS_FIVE,
+    HIGH_POINT_FIRST_GETS_ONE, LOW_POINT_WINNER_GETS_ZERO, HIGH_POINT_WINNER_GETS_SIX, HIGH_POINT_WINNER_GETS_FIVE, HIGH_POINT_WINNER_GETS_EIGHT,
     HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT
 }

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java

@@ -44,6 +44,7 @@ import com.sap.sailing.domain.leaderboard.impl.HighPointFirstGets10LastBreaksTie
 import com.sap.sailing.domain.leaderboard.impl.HighPointFirstGets10Or8AndLastBreaksTie;
 import com.sap.sailing.domain.leaderboard.impl.HighPointFirstGets1LastBreaksTie;
 import com.sap.sailing.domain.leaderboard.impl.HighPointLastBreaksTie;
+import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsEight;
 import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsFive;
 import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsSix;
 import com.sap.sailing.domain.leaderboard.impl.LowPoint;
@@ -105,6 +106,8 @@ public class DomainFactoryImpl extends SharedDomainFactoryImpl implements Domain
             return new HighPointWinnerGetsFive();
         case HIGH_POINT_WINNER_GETS_SIX:
             return new HighPointWinnerGetsSix();
+        case HIGH_POINT_WINNER_GETS_EIGHT:
+            return new HighPointWinnerGetsEight();
         case HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT:
             return new HighPointFirstGets10Or8AndLastBreaksTie();
         }

java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointWinnerGetsEight.java

@@ -0,0 +1,16 @@
+package com.sap.sailing.domain.leaderboard.impl;
+
+import com.sap.sailing.domain.common.ScoringSchemeType;
+
+public class HighPointWinnerGetsEight extends HighPointFirstGetsFixedScore {
+    private static final long serialVersionUID = 330293087596268557L;
+
+    public HighPointWinnerGetsEight() {
+        super(/* scoreForRaceWinner */ 8);
+    }
+
+    @Override
+    public ScoringSchemeType getType() {
+        return ScoringSchemeType.HIGH_POINT_WINNER_GETS_EIGHT;
+    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java

@@ -388,6 +388,7 @@ public interface StringMessages extends Messages {
     String scoringSchemeLowPointWinnerGetsZero();
     String scoringSchemeWinnerGetsFive();
     String scoringSchemeWinnerGetsSix();
+    String scoringSchemeWinnerGetsEight();
     String scoringSystem();
     String createFlexibleLeaderboard();
     String createRegattaLeaderboard();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

@@ -412,6 +412,7 @@ scoringSchemeHighPointLastBreaksTie=High Point System, Last Race Breaks Tie
 scoringSchemeLowPointWinnerGetsZero=Low Point System, Winner Gets Zero
 scoringSchemeWinnerGetsFive=High Point System, Winner Gets 5 Points
 scoringSchemeWinnerGetsSix=High Point System, Winner Gets 6 Points
+scoringSchemeWinnerGetsEight=High Point System, Winner Gets 8 Points
 scoringSystem=Scoring system
 createFlexibleLeaderboard=Create flexible leaderboard
 createRegattaLeaderboard=Create regatta leaderboard

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties

@@ -413,6 +413,7 @@ scoringSchemeHighPointLastBreaksTie=High Point System, letztes Rennen entscheide
 scoringSchemeLowPointWinnerGetsZero=Low Point System, Gewinner erhält 0 Punkte
 scoringSchemeWinnerGetsFive=High Point System, Gewinner erhält 5 Punkte
 scoringSchemeWinnerGetsSix=High Point System, Gewinner erhält 6 Punkte
+scoringSchemeWinnerGetsEight=High Point System, Gewinner erhält 8 Punkte
 scoringSystem=Bepunktungssystem
 createFlexibleLeaderboard=Flexible Rangliste anlegen
 createRegattaLeaderboard=Rangliste für Regatta anlegen

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties

@@ -402,6 +402,7 @@ scoringSchemeHighPointLastBreaksTie=Высокобальная система п
 scoringSchemeLowPointWinnerGetsZero=Низкобальная система подсчета очков, победитель получает ноль очков
 scoringSchemeWinnerGetsFive=Высокобальная система подсчета, победитель получает 5 очков
 scoringSchemeWinnerGetsSix=Высокобальная система подсчета, победитель получает 6 очков
+scoringSchemeWinnerGetsEight=Высокобальная система подсчета, победитель получает 8 очков
 scoringSystem=Система подсчета очков
 createFlexibleLeaderboard=Создание адаптивной таблицы лидеров
 createRegattaLeaderboard=Создание таблицы лидеров регаты

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ScoringSchemeTypeFormatter.java

@@ -24,6 +24,8 @@ public class ScoringSchemeTypeFormatter {
             return stringMessages.scoringSchemeWinnerGetsFive();
         case HIGH_POINT_WINNER_GETS_SIX:
             return stringMessages.scoringSchemeWinnerGetsSix();
+        case HIGH_POINT_WINNER_GETS_EIGHT:
+            return stringMessages.scoringSchemeWinnerGetsEight();
         case HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT:
             return stringMessages.scoringSchemeHighPointFirstGetsTenOrEight();
         }

wiki/planning.md

@@ -1,3 +1,7 @@
+Planning 2014 / 2015
+
+See [http://wiki.sapsailing.com/wiki/planning/offseason-2014-2015](http://wiki.sapsailing.com/wiki/planning/offseason-2014-2015).
+
 # Planning 2013 / 2014
 
 During our workshop of 2013-09-30, three major areas of development were identified as candidates for focus topics for the next few months. These are: