unified stringmessage handling

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/LeaderboardWithHeaderPerspective.java

@@ -75,7 +75,7 @@ public class LeaderboardWithHeaderPerspective extends AbstractPerspectiveComposi
         addChildComponent(leaderboardPanel);
         dockPanel = new DockLayoutPanel(Unit.PX);
         dockPanel.addNorth(sapHeader, SAP_HEADER_HEIGHT);
-        OldLeaderboard oldLeaderboard = new OldLeaderboard(leaderboardPanel);
+        OldLeaderboard oldLeaderboard = new OldLeaderboard(leaderboardPanel, stringMessages);
         leaderboardPanel.addLeaderboardUpdateListener(oldLeaderboard);
         currentContentWidget = oldLeaderboard.getContentWidget();
         if (getPerspectiveSettings().isLeaderboardAutoZoom()) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/oldleaderboard/OldLeaderboard.java

@@ -33,8 +33,10 @@ public class OldLeaderboard extends Composite implements LeaderboardUpdateListen
     @UiField DivElement scoringSchemeDiv;
 
     private LeaderboardPanel leaderboardPanel;
+    private final StringMessages stringmessages;
 
-    public OldLeaderboard(LeaderboardPanel leaderboardPanel) {
+    public OldLeaderboard(LeaderboardPanel leaderboardPanel, StringMessages stringmessages) {
+        this.stringmessages = stringmessages;
         this.leaderboardPanel = leaderboardPanel;
 
         OldLeaderboardResources.INSTANCE.css().ensureInjected();
@@ -51,13 +53,14 @@ public class OldLeaderboard extends Composite implements LeaderboardUpdateListen
     public void updatedLeaderboard(LeaderboardDTO leaderboard) {
         if(leaderboard != null) {
             lastScoringCommentDiv.setInnerText(leaderboard.getComment() != null ? leaderboard.getComment() : "");
-            scoringSchemeDiv.setInnerText(leaderboard.scoringScheme != null ? ScoringSchemeTypeFormatter.getDescription(leaderboard.scoringScheme, StringMessages.INSTANCE) : "");
+            scoringSchemeDiv.setInnerText(leaderboard.scoringScheme != null
+                    ? ScoringSchemeTypeFormatter.getDescription(leaderboard.scoringScheme, stringmessages) : "");
             if (leaderboard.getTimePointOfLastCorrectionsValidity() != null) {
                 Date lastCorrectionDate = leaderboard.getTimePointOfLastCorrectionsValidity();
                 String lastUpdate = DateAndTimeFormatterUtil.defaultDateFormatter.render(lastCorrectionDate) + ", "
                         + DateAndTimeFormatterUtil.longTimeFormatter.render(lastCorrectionDate);
                 lastScoringUpdateTimeDiv.setInnerText(lastUpdate);
-                lastScoringUpdateTextDiv.setInnerText(StringMessages.INSTANCE.eventRegattaLeaderboardLastScoreUpdate());
+                lastScoringUpdateTextDiv.setInnerText(stringmessages.eventRegattaLeaderboardLastScoreUpdate());
             } else {
                 lastScoringUpdateTimeDiv.setInnerText("");
                 lastScoringUpdateTextDiv.setInnerText("");

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java

@@ -506,7 +506,7 @@ TrackedRaceChangedListener, LeaderboardsDisplayer {
      * are no-ops.
      */
     private void openLeaderboardUrlConfigDialog(AbstractLeaderboardDTO leaderboard) {
-        LeaderboardEntryPoint.openUrlConfigurationDialog(leaderboard);
+        LeaderboardEntryPoint.openUrlConfigurationDialog(leaderboard, stringMessages);
     }
 
     private void setStartTime(RaceColumnDTO raceColumnDTO, FleetDTO fleetDTO) {

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

@@ -15,7 +15,7 @@ import com.sap.sailing.gwt.ui.client.shared.filter.LeaderboardFetcher;
 
 public class CompetitorColumnBase<T> {
     private final LeaderboardFetcher leaderboardFetcher;
-    private final StringMessages stringMessages;
+    protected final StringMessages stringMessages;
     private final CompetitorFetcher<T> competitorFetcher;
     
     public CompetitorColumnBase(LeaderboardFetcher leaderboardFetcher, StringMessages stringMessages, CompetitorFetcher<T> competitorFetcher) {
@@ -29,10 +29,6 @@ public class CompetitorColumnBase<T> {
         return leaderboardFetcher.getLeaderboard();
     }
 
-    private StringMessages getStringMessages() {
-        return stringMessages;
-    }
-
     public AbstractSafeHtmlCell<T> getCell(final LeaderboardDTO leaderboard) {
         return new AbstractSafeHtmlCell<T>(new AbstractSafeHtmlRenderer<T>() {
             @Override
@@ -59,7 +55,8 @@ public class CompetitorColumnBase<T> {
     }
     
     public SafeHtmlHeader getHeader() {
-        return new SafeHtmlHeaderWithTooltip(SafeHtmlUtils.fromString(getStringMessages().name()), getStringMessages().competitorColumnTooltip());
+        return new SafeHtmlHeaderWithTooltip(SafeHtmlUtils.fromString(stringMessages.name()),
+                stringMessages.competitorColumnTooltip());
     }
 
     public void render(T t, String competitorColorBarStyle, SafeHtmlBuilder sb) {

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

@@ -42,6 +42,7 @@ import com.sap.sse.security.ui.settings.UserSettingsStorageManager;
 public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
     public static final long DEFAULT_REFRESH_INTERVAL_MILLIS = 3000l;
 
+    private StringMessages stringmessages = StringMessages.INSTANCE;
     private String leaderboardName;
     private String leaderboardGroupName;
     private LeaderboardType leaderboardType;
@@ -123,7 +124,7 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
             // overall
 
             MetaLeaderboardPerspectiveLifecycle rootComponentLifeCycle = new MetaLeaderboardPerspectiveLifecycle(
-                    StringMessages.INSTANCE);
+                    stringmessages);
             AbstractComponentContextWithSettingsStorage<MetaLeaderboardPerspectiveLifecycle, PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> context = new AbstractComponentContextWithSettingsStorage<>(
                     rootComponentLifeCycle,
                     settingsManager);
@@ -251,20 +252,23 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
      * The implementation by and large uses the {@link LeaderboardSettingsDialogComponent}'s widget and adds to it a
      * checkbox for driving the {@link #LeaderboardUrlSettings.PARAM_EMBEDDED} field.
      * 
+     * @param stringmessages
+     * 
      * @see LeaderboardEntryPoint#getUrl(String, LeaderboardSettings, boolean)
      */
-    public static void openUrlConfigurationDialog(final AbstractLeaderboardDTO leaderboard) {
+    public static void openUrlConfigurationDialog(final AbstractLeaderboardDTO leaderboard,
+            StringMessages stringmessages) {
         final AbstractLeaderboardPerspectiveLifecycle lifeCycle;
         if (leaderboard.type.isMetaLeaderboard()) {
-            lifeCycle = new MetaLeaderboardPerspectiveLifecycle(StringMessages.INSTANCE, leaderboard);
+            lifeCycle = new MetaLeaderboardPerspectiveLifecycle(stringmessages, leaderboard);
         } else {
-            lifeCycle = new LeaderboardPerspectiveLifecycle(StringMessages.INSTANCE, leaderboard);
+            lifeCycle = new LeaderboardPerspectiveLifecycle(stringmessages, leaderboard);
         }
         final LeaderboardContextSettings leaderboardContextSettings = new LeaderboardContextSettings(leaderboard.name,
                 leaderboard.getDisplayName());
         final LinkWithSettingsGenerator<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> linkWithSettingsGenerator = new LinkWithSettingsGenerator<>(
                 "/gwt/Leaderboard.html", leaderboardContextSettings);
-        new SettingsDialogForLinkSharing<>(linkWithSettingsGenerator, lifeCycle, StringMessages.INSTANCE)
+        new SettingsDialogForLinkSharing<>(linkWithSettingsGenerator, lifeCycle, stringmessages)
                 .show();
     }
 }

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

@@ -177,7 +177,7 @@ public class LeaderboardPanel extends AbstractCompositeComponent<LeaderboardSett
 
     private final ErrorReporter errorReporter;
 
-    private final StringMessages stringMessages;
+    public final StringMessages stringMessages;
 
     private final FlushableSortedCellTableWithStylableHeaders<LeaderboardRowDTO> leaderboardTable;
 
@@ -584,10 +584,6 @@ public class LeaderboardPanel extends AbstractCompositeComponent<LeaderboardSett
         return toolbarPanel;
     }
 
-    protected StringMessages getStringMessages() {
-        return stringMessages;
-    }
-
     @Override
     public Widget getEntryWidget() {
         return this;
@@ -2975,7 +2971,7 @@ public class LeaderboardPanel extends AbstractCompositeComponent<LeaderboardSett
     }
 
     protected CompetitorColumn createCompetitorColumn() {
-        return new CompetitorColumn(new CompetitorColumnBase<LeaderboardRowDTO>(this, getStringMessages(),
+        return new CompetitorColumn(new CompetitorColumnBase<LeaderboardRowDTO>(this, stringMessages,
                 new CompetitorFetcher<LeaderboardRowDTO>() {
             @Override
             public CompetitorDTO getCompetitor(LeaderboardRowDTO t) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditableLeaderboardPanel.java

@@ -142,7 +142,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
 
         @Override
         public Header<String> getHeader() {
-            return new TextHeader(getStringMessages().competitor());
+            return new TextHeader(stringMessages.competitor());
         }
 
         @Override
@@ -576,7 +576,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
 
         @Override
         public String getValue(LeaderboardRowDTO object) {
-            return getStringMessages().edit();
+            return stringMessages.edit();
         }
     }
 
@@ -599,7 +599,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
                     @Override
                     public void onSuccess(Iterable<String> providerNames) {
                         ResultSelectionAndApplyDialog dialog = new ResultSelectionAndApplyDialog(EditableLeaderboardPanel.this, providerNames, getSailingService(), 
-                                getStringMessages(), getErrorReporter());
+                                stringMessages, getErrorReporter());
                         dialog.show();
                     }
                     
@@ -666,7 +666,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
             }
         });
         getContentPanel().insert(scoreCorrectionInfoGrid, 0);
-        getContentPanel().add(new Label(getStringMessages().suppressedCompetitors()+":"));
+        getContentPanel().add(new Label(stringMessages.suppressedCompetitors() + ":"));
         getContentPanel().add(suppressedCompetitorsTable);
 
         // add a dedicated settings button that allows users to remove columns if needed; the settings
@@ -687,7 +687,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
         suppressedSailIDColumn.setSortable(true);
         result.addColumn(suppressedSailIDColumn, suppressedSailIDColumn.getHeader());
         final SuppressedCompetitorColumn suppressedCompetitorColumn = new SuppressedCompetitorColumn(
-                new CompetitorColumnBase<CompetitorDTO>(this, getStringMessages(), new CompetitorFetcher<CompetitorDTO>() {
+                new CompetitorColumnBase<CompetitorDTO>(this, stringMessages, new CompetitorFetcher<CompetitorDTO>() {
                     @Override
                     public CompetitorDTO getCompetitor(CompetitorDTO t) {
                         return t;
@@ -698,7 +698,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
         final Column<CompetitorDTO, String> unsuppressButtonColumn = new Column<CompetitorDTO, String>(new ButtonCell()) {
             @Override
             public String getValue(CompetitorDTO object) {
-                return getStringMessages().unsuppress();
+                return stringMessages.unsuppress();
             }
         };
         unsuppressButtonColumn.setFieldUpdater(new FieldUpdater<CompetitorDTO, String>() {
@@ -752,7 +752,8 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
     @Override
     protected CompetitorColumn createCompetitorColumn() {
         return new EditableCompetitorColumn(getCellListForEditableCompetitorColumn(),
-                new CompetitorColumnBase<LeaderboardRowDTO>(this, getStringMessages(), new CompetitorFetcher<LeaderboardRowDTO>() {
+                new CompetitorColumnBase<LeaderboardRowDTO>(this, stringMessages,
+                        new CompetitorFetcher<LeaderboardRowDTO>() {
                     @Override
                     public CompetitorDTO getCompetitor(LeaderboardRowDTO t) {
                         return t.competitor;
@@ -795,7 +796,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
 
             @Override
             public String getValue(LeaderboardRowDTO object) {
-                return getStringMessages().suppress();
+                return stringMessages.suppress();
             }
         });
         final class OptionalBoldRenderer implements SafeHtmlRenderer<String> {
@@ -865,7 +866,8 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
                 return new FieldUpdater<LeaderboardRowDTO, String>() {
                     @Override
                     public void update(int index, final LeaderboardRowDTO row, String valueToUpdate) {
-                        new EditCompetitorNameDialog(getStringMessages(), row.competitor.getName(), new DialogCallback<String>() {
+                        new EditCompetitorNameDialog(stringMessages, row.competitor.getName(),
+                                new DialogCallback<String>() {
                             @Override
                             public void ok(final String value) {
                                 getSailingService().updateCompetitorDisplayNameInLeaderboard(getLeaderboardName(), row.competitor.getIdAsString(),
@@ -900,7 +902,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
 
             @Override
             public String getValue(LeaderboardRowDTO object) {
-                return getStringMessages().edit();
+                return stringMessages.edit();
             }
         });
         return result;
@@ -920,7 +922,8 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
                 return new FieldUpdater<LeaderboardRowDTO, String>() {
                     @Override
                     public void update(int index, final LeaderboardRowDTO row, String value) {
-                        new EditCarryValueDialog(getStringMessages(), row.competitor.getName(), row.carriedPoints, new DialogCallback<Double>() {
+                        new EditCarryValueDialog(stringMessages, row.competitor.getName(), row.carriedPoints,
+                                new DialogCallback<Double>() {
                             @Override
                             public void ok(final Double value) {
                                 updateCarriedPoints(EditableLeaderboardPanel.this.getData().getList().indexOf(row), row, value);
@@ -935,7 +938,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
 
             @Override
             public String getValue(LeaderboardRowDTO object) {
-                return getStringMessages().edit();
+                return stringMessages.edit();
             }
         });
         final EditTextCell carryTextCell = new EditTextCell();
@@ -996,7 +999,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
         list.add(totalPointsEditCellProvider);
         final UncorrectedTotalPointsViewProvider uncorrectedViewProvider = new UncorrectedTotalPointsViewProvider(race.getRaceColumnName());
         list.add(uncorrectedViewProvider);
-        list.add(new MaxPointsReasonAndTotalPointsEditButtonCell(getStringMessages(), race.getRaceColumnName(),
+        list.add(new MaxPointsReasonAndTotalPointsEditButtonCell(stringMessages, race.getRaceColumnName(),
                 maxPointsDropDownCellProvider, totalPointsEditCellProvider));
         return list;
     }