RegattaOverview: Shortened text in table

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

@@ -7,11 +7,8 @@ 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)) {
+        
+        if (status.equals(RaceLogRaceStatus.RUNNING)) {
             statusText = getTextForRunningRace();
         } else if (status.equals(RaceLogRaceStatus.FINISHING)) {
             statusText = getTextForFinishingRace();
@@ -46,8 +43,6 @@ public abstract class FlagAlphabetInterpretationTemplate {
     
     protected abstract String getTextForRunningRace();
     
-    protected abstract String getTextForRunningRaceWithEarlyStarter();
-    
     protected abstract String getTextForFinishingRace();
     
     protected abstract String getTextForFinishedRace();

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

@@ -670,18 +670,13 @@ public interface StringMessages extends Messages {
     String stopConnectionToMaster();
     String asLink();
     String raceIsRunning();
-    String raceIsRunningWithEarlyStarters();
     String raceIsFinishing();
     String raceIsFinished();
     String raceIsScheduled();
     String raceIsInStartphase();
     String generalRecall();
     String startPostponed();
-    String startPostponedNoMoreRacingToday();
-    String startPostponedFurtherSignalsAshore();
     String raceAbandoned();
-    String raceAbandonedNoMoreRacingToday();
-    String raceAbandonedFurtherSignalsAshore();
     String stopAllReplicas();
     String warningServerIsReplica();
     String dropReplicaConnection();
@@ -691,4 +686,7 @@ public interface StringMessages extends Messages {
     String protestTimeFinishedAt();
     String flags();
     String lastUpdate();
+    String earlyStarters();
+    String noMoreRacingToday();
+    String furtherSignalsAshore();
 }

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

@@ -662,19 +662,14 @@ explainNoConnectionsToMaster=No connections to a master server configured. Click
 explainNoConnectionsFromReplicas=No connections from a replica found. You can connect replicas by using their AdminConsole.
 stopConnectionToMaster=Stop Replication
 asLink=As link
-raceIsRunning=Race is running
-raceIsRunningWithEarlyStarters=Race is running (had early starters)
-raceIsFinishing=Race is finishing
-raceIsFinished=Race is finished
-raceIsScheduled=Race is scheduled
-raceIsInStartphase=Race in start phase
+raceIsRunning=Running
+raceIsFinishing=Finishing
+raceIsFinished=Finished
+raceIsScheduled=Scheduled
+raceIsInStartphase=Start phase
 generalRecall=General recall
-startPostponed=Start postponed
-startPostponedNoMoreRacingToday=Start postponed - No more racing today
-startPostponedFurtherSignalsAshore=Start postponed - Further signals ashore
-raceAbandoned=Race abandoned
-raceAbandonedNoMoreRacingToday=Race abandoned - No more racing today
-raceAbandonedFurtherSignalsAshore=Race abandoned - Further signals ashore
+startPostponed=Postponed
+raceAbandoned=Abandoned
 stopAllReplicas=Drop connection to all replicas (Dangerous!)
 warningServerIsReplica=ATTENTION: This server is configured to be a replica. Do NOT change anything or this will lead to strange effects!
 dropReplicaConnection=Drop connection
@@ -683,4 +678,7 @@ competitorFilterExplanation=The filter will show all competitors matching the cr
 protestTimeFinishesAt=Protest time finishes at 
 protestTimeFinishedAt=Protest time finished at 
 flags=Flags
-lastUpdate=Last update
+lastUpdate=Last update
+noMoreRacingToday=No more racing today
+furtherSignalsAshore=Further signals ashore
+earlyStarters=Early starters

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

@@ -659,8 +659,6 @@ explainConnectionsToMaster=Verbindungen zu einem Master (dieser Server ist eine
 explainNoConnectionsToMaster=Es sind keine Verbindungen zu einem Master Server konfiguriert.
 explainNoConnectionsFromReplicas=Es sind keine Verbindugen von Replicas registriert.
 stopConnectionToMaster=Replikation anhalten
-raceAbandonedNoMoreRacingToday=Rennabbruch - heute keine Rennen mehr
-raceAbandonedFurtherSignalsAshore=Rennabbruch - weitere Signale an Land
 stoppAllReplicas=Verbindung zu allen Replicas abbrechen
 warningServerIsReplica=ACHTUNG: Dieser Server ist als Replica konfiguriert. Vermeiden Sie alle Operationen!
 dropReplicaConnection=Verbindung abbrechen
@@ -670,4 +668,15 @@ The filter will show all competitors matching the criterias:dropReplicaConnectio
 protestTimeFinishesAt=Protestzeit endet um 
 protestTimeFinishedAt=Protestzeit beendet um 
 flags=Flaggen
-lastUpdate=Letzte Aktualisierung
+lastUpdate=Letzte Aktualisierung
+noMoreRacingToday=Heute keine Rennen mehr
+furtherSignalsAshore=Weitere Signale an Land
+startPostponed=Startverschiebung
+raceAbandoned=Rennabbruch
+generalRecall=Gesamtrückruf
+raceIsInStartphase=Startphase
+raceIsScheduled=Start angesetzt
+raceIsFinished=Beendet
+raceIsFinishing=Zieleinlauf
+raceIsRunning=Rennen läuft
+earlyStarters=Frühstarter

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/FlagAlphabetInterpreter.java

@@ -16,11 +16,6 @@ public class FlagAlphabetInterpreter extends FlagAlphabetInterpretationTemplate
         return stringMessages.raceIsRunning();
     }
 
-    @Override
-    protected String getTextForRunningRaceWithEarlyStarter() {
-        return stringMessages.raceIsRunningWithEarlyStarters();
-    }
-
     @Override
     protected String getTextForFinishingRace() {
         return stringMessages.raceIsFinishing();
@@ -58,12 +53,12 @@ public class FlagAlphabetInterpreter extends FlagAlphabetInterpretationTemplate
 
     @Override
     protected String getTextForAnsweringPennantWithAlphaFlags() {
-        return stringMessages.startPostponedNoMoreRacingToday();
+        return stringMessages.startPostponed();
     }
 
     @Override
     protected String getTextForAnsweringPennantWithHotelFlags() {
-        return stringMessages.startPostponedFurtherSignalsAshore();
+        return stringMessages.startPostponed();
     }
 
     @Override
@@ -73,12 +68,12 @@ public class FlagAlphabetInterpreter extends FlagAlphabetInterpretationTemplate
 
     @Override
     protected String getTextForNovemberWithAlphaFlags() {
-        return stringMessages.raceAbandonedNoMoreRacingToday();
+        return stringMessages.raceAbandoned();
     }
 
     @Override
     protected String getTextForNovemberWithHotelFlags() {
-        return stringMessages.raceAbandonedFurtherSignalsAshore();
+        return stringMessages.raceAbandoned();
     }
 
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java

@@ -41,6 +41,7 @@ import com.sap.sailing.domain.common.LeaderboardNameConstants;
 import com.sap.sailing.domain.common.NauticalSide;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.domain.common.impl.NaturalComparator;
+import com.sap.sailing.domain.common.racelog.Flags;
 import com.sap.sailing.gwt.ui.client.AnchorCell;
 import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory;
 import com.sap.sailing.gwt.ui.client.ErrorReporter;
@@ -347,6 +348,7 @@ public class RegattaRaceStatesComponent extends SimplePanel implements Component
             }
 
         });
+        raceStatusColumn.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
 
         Column<RegattaOverviewEntryDTO, String> raceCourseColumn = new Column<RegattaOverviewEntryDTO, String>(new ClickableTextCell()) {
             @Override
@@ -413,7 +415,20 @@ public class RegattaRaceStatesComponent extends SimplePanel implements Component
             public String getValue(RegattaOverviewEntryDTO entryDTO) {
                 StringBuffer additionalInformation = new StringBuffer();
                 boolean isInfoBefore = false;
+                if (entryDTO.raceInfo.lastLowerFlag != null && entryDTO.raceInfo.lastLowerFlag.equals(Flags.ALPHA)) {
+                    additionalInformation.append(stringMessages.noMoreRacingToday());
+                    isInfoBefore = true;
+                } else if (entryDTO.raceInfo.lastLowerFlag != null && entryDTO.raceInfo.lastLowerFlag.equals(Flags.HOTEL)) {
+                    additionalInformation.append(stringMessages.furtherSignalsAshore());
+                    isInfoBefore = true;
+                } else if (entryDTO.raceInfo.lastUpperFlag != null && entryDTO.raceInfo.lastUpperFlag.equals(Flags.XRAY) && entryDTO.raceInfo.isLastFlagDisplayed) {
+                    additionalInformation.append(stringMessages.earlyStarters());
+                    isInfoBefore = true;
+                }
                 if (entryDTO.raceInfo.pathfinderId != null) {
+                    if (isInfoBefore) {
+                        additionalInformation.append("  /  ");
+                    }
                     additionalInformation.append("Pathfinder: " + entryDTO.raceInfo.pathfinderId);
                     isInfoBefore = true;
                 }