Merge branch 'master' into replication-revamp

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

java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF

@@ -13,4 +13,5 @@ Export-Package: com.sap.sailing.domain.common,
  com.sap.sailing.domain.common.quadtree,
  com.sap.sailing.domain.common.quadtree.impl;x-friends:="com.sap.sailing.domain.test",
  com.sap.sailing.domain.common.racelog,
+ com.sap.sailing.domain.common.racelog.utils,
  com.sap.sailing.domain.common.dto

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

@@ -1,3 +1,3 @@
 package com.sap.sailing.domain.common;
 
-public enum MarkType { BUOY, CAMERABOAT, STARTBOAT, UMPIREBOAT, LANDMARK }
+public enum MarkType { BUOY, CAMERABOAT, STARTBOAT, UMPIREBOAT, LANDMARK, FINISHBOAT }

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/RaceLogRaceStatus.java

@@ -2,8 +2,17 @@ package com.sap.sailing.domain.common.racelog;
 
 /**
  * @author D053502
- *
+ * 
  */
 public enum RaceLogRaceStatus {
-    UNKNOWN, UNSCHEDULED, SCHEDULED, STARTPHASE, RUNNING, FINISHING, FINISHED
+    UNKNOWN, UNSCHEDULED, SCHEDULED, STARTPHASE, RUNNING, FINISHING, FINISHED;
+
+    public static boolean isActive(RaceLogRaceStatus status) {
+        if (status == null) {
+            return false;
+        }
+
+        return status.equals(SCHEDULED) || status.equals(STARTPHASE) || status.equals(RUNNING)
+                || status.equals(FINISHING);
+    }
 }

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/StartProcedureType.java

@@ -1,18 +1,18 @@
 package com.sap.sailing.domain.common.racelog;
 
 public enum StartProcedureType {
-    //RRS26("Fix Line Start (RRS26)"),
+    RRS26("Fix Line Start (RRS26)"),
     GateStart("Gate Start"),
     ESS("\"Extreme Sailing Series\"-Start");
     
     private String displayName;
 
-    private StartProcedureType(String displayName){
+    private StartProcedureType(String displayName) {
         this.displayName = displayName;
     }
 
     @Override 
-    public String toString(){
+    public String toString() {
         return displayName;
     }
 }

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/utils/FlagAlphabetInterpretationTemplate.java

@@ -0,0 +1,74 @@
+package com.sap.sailing.domain.common.racelog.utils;
+
+import com.sap.sailing.domain.common.racelog.Flags;
+import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
+
+public abstract class FlagAlphabetInterpretationTemplate {
+
+    public String getMeaningOfRaceStateAndFlags(RaceLogRaceStatus status, Flags upperFlag, Flags lowerFlag, boolean isDisplayed) {
+        String statusText = "";
+        if (status.equals(RaceLogRaceStatus.RUNNING) && upperFlag.equals(Flags.XRAY) && isDisplayed) {
+            statusText = getTextForRunningRaceWithEarlyStarter();
+        } else if (status.equals(RaceLogRaceStatus.RUNNING) && upperFlag.equals(Flags.XRAY) && !isDisplayed) {
+            statusText = getTextForRunningRace();
+        } else if (status.equals(RaceLogRaceStatus.RUNNING)) {
+            statusText = getTextForRunningRace();
+        } else if (status.equals(RaceLogRaceStatus.FINISHING)) {
+            statusText = getTextForFinishingRace();
+        } else if (status.equals(RaceLogRaceStatus.FINISHED)) {
+            statusText = getTextForFinishedRace();
+        } else if (status.equals(RaceLogRaceStatus.SCHEDULED)) {
+            statusText = getTextForScheduledRace();
+        } else if (status.equals(RaceLogRaceStatus.STARTPHASE)) {
+            statusText = getTextForRaceInStartphase();
+        } else if (status.equals(RaceLogRaceStatus.UNSCHEDULED)) {
+            statusText = getTextForUnscheduledRace();
+            if (upperFlag != null) {
+                if (upperFlag.equals(Flags.FIRSTSUBSTITUTE)) {
+                    statusText = getTextForFirstSubstituteFlag();
+                } else if (upperFlag.equals(Flags.AP) && lowerFlag.equals(Flags.ALPHA) && isDisplayed) {
+                    statusText = getTextForAnsweringPennantWithAlphaFlags();
+                } else if (upperFlag.equals(Flags.AP) && lowerFlag.equals(Flags.HOTEL) && isDisplayed) {
+                    statusText = getTextForAnsweringPennantWithHotelFlags();
+                } else if (upperFlag.equals(Flags.AP) && isDisplayed) {
+                    statusText = getTextForAnsweringPennantFlag();
+                } else if (upperFlag.equals(Flags.NOVEMBER) && lowerFlag.equals(Flags.ALPHA) && isDisplayed) {
+                    statusText = getTextForNovemberWithAlphaFlags();
+                } else if (upperFlag.equals(Flags.NOVEMBER) && lowerFlag.equals(Flags.HOTEL) && isDisplayed) {
+                    statusText = getTextForNovemberWithHotelFlags();
+                } else if (upperFlag.equals(Flags.NOVEMBER) && isDisplayed) {
+                    statusText = getTextForNovemberFlag();
+                }
+            }
+        }
+        return statusText;
+    }
+    
+    protected abstract String getTextForRunningRace();
+    
+    protected abstract String getTextForRunningRaceWithEarlyStarter();
+    
+    protected abstract String getTextForFinishingRace();
+    
+    protected abstract String getTextForFinishedRace();
+    
+    protected abstract String getTextForScheduledRace();
+    
+    protected abstract String getTextForRaceInStartphase();
+    
+    protected abstract String getTextForUnscheduledRace();
+    
+    protected abstract String getTextForFirstSubstituteFlag();
+    
+    protected abstract String getTextForAnsweringPennantFlag();
+    
+    protected abstract String getTextForAnsweringPennantWithAlphaFlags();
+    
+    protected abstract String getTextForAnsweringPennantWithHotelFlags();
+    
+    protected abstract String getTextForNovemberFlag();
+    
+    protected abstract String getTextForNovemberWithAlphaFlags();
+    
+    protected abstract String getTextForNovemberWithHotelFlags();
+}

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/utils/RaceStateOfSameDayHelper.java

@@ -0,0 +1,47 @@
+package com.sap.sailing.domain.common.racelog.utils;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import com.sap.sailing.domain.common.TimePoint;
+
+public class RaceStateOfSameDayHelper {
+    
+    public static boolean isRaceStateOfSameDay(TimePoint raceStartTimePoint, TimePoint raceFinishedTimePoint, Calendar now) {
+        Date raceStartTime = null;
+        Date raceFinishedTime = null;
+        
+        if (raceStartTimePoint != null) {
+            raceStartTime = raceStartTimePoint.asDate();
+        }
+        if (raceFinishedTimePoint != null) {
+            raceFinishedTime = raceFinishedTimePoint.asDate();
+        }
+        
+        return isRaceStateOfSameDay(raceStartTime, raceFinishedTime, now);
+    }
+    
+    public static boolean isRaceStateOfSameDay(Date raceStartTime, Date raceFinishedTime, Calendar now) {
+        boolean result = false;
+        if (raceFinishedTime != null) {
+            Calendar finishedTimeCal = Calendar.getInstance();
+            finishedTimeCal.setTime(raceFinishedTime);
+            if(isSameDay(now, finishedTimeCal)) {
+                result = true;
+            }
+        } else if (raceStartTime != null) {
+            Calendar startTimeCal = Calendar.getInstance();
+            startTimeCal.setTime(raceStartTime);
+            if(isSameDay(now, startTimeCal)) {
+                result = true;
+            }
+        }
+        return result;
+    }
+    
+    private static boolean isSameDay(Calendar cal1, Calendar cal2) {
+        return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
+                cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR);
+    }
+
+}