From 1377bcfdc715c0c2a1f7f3e7639b587047f58db2 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 13 Jan 2012 22:09:46 +0100 Subject: [PATCH] fixed UTF-8 issues in german property files; first working version of refactored leaderboard settings panel --- .../.settings/org.eclipse.core.resources.prefs | 3 ++- .../sap/sailing/gwt/ui/adminconsole/AdminConsole.java | 4 +++- .../sailing/gwt/ui/client/StringConstants_de.properties | 2 +- .../sap/sailing/gwt/ui/client/StringMessages.properties | 2 +- .../sailing/gwt/ui/client/StringMessages_de.properties | 2 +- .../sailing/gwt/ui/shared/components/SettingsDialog.java | 6 ++++++ .../sap/sailing/server/impl/RacingEventServiceImpl.java | 9 ++++----- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs index 7faf173b37f..41e85ddbb89 100755 --- a/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Sat Oct 01 15:18:53 CEST 2011 +#Fri Jan 13 22:08:39 CET 2012 eclipse.preferences.version=1 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringConstants_de.properties=UTF-8 +encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties=UTF-8 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsole.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsole.java index d40951c4110..413198e63e5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsole.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsole.java @@ -12,6 +12,7 @@ import com.google.gwt.user.client.ui.TabPanel; import com.sap.sailing.gwt.ui.client.AbstractEntryPoint; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; import com.sap.sailing.gwt.ui.shared.EventDAO; +import com.sap.sailing.server.api.DefaultLeaderboardName; public class AdminConsole extends AbstractEntryPoint implements EventRefresher { private Set eventDisplayers; @@ -47,7 +48,8 @@ public class AdminConsole extends AbstractEntryPoint implements EventRefresher { eventDisplayers.add(raceMapPanel); raceMapPanel.setSize("90%", "90%"); tabPanel.add(raceMapPanel, stringConstants.map(), /* asHTML */ false); - LeaderboardPanel defaultLeaderboardPanel = new LeaderboardPanel(sailingService, stringConstants.defaultLeaderboard(), this, stringConstants); + LeaderboardPanel defaultLeaderboardPanel = new LeaderboardPanel(sailingService, + DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME, this, stringConstants); defaultLeaderboardPanel.setSize("90%", "90%"); tabPanel.add(defaultLeaderboardPanel, stringConstants.defaultLeaderboard(), /* asHTML */ false); LeaderboardConfigPanel leaderboardConfigPanel = new LeaderboardConfigPanel(sailingService, this, this, stringConstants); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringConstants_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringConstants_de.properties index 5632fd6a93f..cda5dcded8c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringConstants_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringConstants_de.properties @@ -138,7 +138,7 @@ tacks=Wenden jibes=Halsen penaltyCircles=Strafkringel medalRaceIsNull=Medialienwert nicht erlaubt -maneuverTypes=Man�ver +maneuverTypes=Manöver raceNameEmpty=Der Name des Rennens ist leer configuration=Konfiguration chooseChart=Diagramm wählen diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 4675edd4746..905c853e643 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1 +1 @@ -settingsForComponent=Settings for {1} \ No newline at end of file +settingsForComponent=Settings for {0} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index bd84196e60e..29598078d66 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1 +1 @@ -settingsForComponent=Einstellungen für {1} \ No newline at end of file +settingsForComponent=Einstellungen für {0} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/SettingsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/SettingsDialog.java index df926fe1d45..a094915a483 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/SettingsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/SettingsDialog.java @@ -3,6 +3,7 @@ package com.sap.sailing.gwt.ui.shared.components; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.FocusWidget; +import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.DataEntryDialog; import com.sap.sailing.gwt.ui.client.StringConstants; import com.sap.sailing.gwt.ui.client.StringMessages; @@ -26,6 +27,11 @@ public class SettingsDialog extends DataEntryDialog this.settingsDialogComponent = component.getSettingsDialogComponent(); } + @Override + protected Widget getAdditionalWidget() { + return settingsDialogComponent.getAdditionalWidget(this); + } + @Override protected SettingsType getResult() { return settingsDialogComponent.getResult(); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index ef6b0c3cce1..71108cf2cd6 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -59,6 +59,7 @@ import com.sap.sailing.domain.tractracadapter.RaceRecord; import com.sap.sailing.domain.tractracadapter.Receiver; import com.sap.sailing.expeditionconnector.ExpeditionWindTrackerFactory; import com.sap.sailing.server.RacingEventService; +import com.sap.sailing.server.api.DefaultLeaderboardName; import com.sap.sailing.server.api.EventFetcher; import com.sap.sailing.server.api.EventIdentifier; import com.sap.sailing.server.api.EventNameAndRaceName; @@ -101,8 +102,6 @@ public class RacingEventServiceImpl implements RacingEventService, EventFetcher, */ private final Map leaderboardsByName; - private static final String DEFAULT_LEADERBOARD_NAME = "Default Leaderboard"; - private Set eventsObservedForDefaultLeaderboard = new HashSet(); private final MongoObjectFactory mongoObjectFactory; @@ -131,7 +130,7 @@ public class RacingEventServiceImpl implements RacingEventService, EventFetcher, leaderboardsByName = new HashMap(); // Add one default leaderboard that aggregates all races currently tracked by this service. // This is more for debugging purposes than for anything else. - addLeaderboard(DEFAULT_LEADERBOARD_NAME, new int[] { 5, 8 }); + addLeaderboard(DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME, new int[] { 5, 8 }); loadStoredLeaderboards(); } @@ -353,7 +352,7 @@ public class RacingEventServiceImpl implements RacingEventService, EventFetcher, @Override public void raceAdded(TrackedRace trackedRace) { - leaderboardsByName.get(DEFAULT_LEADERBOARD_NAME).addRace(trackedRace, + leaderboardsByName.get(DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME).addRace(trackedRace, trackedRace.getRace().getName(), /* medalRace */ false); } }); @@ -383,7 +382,7 @@ public class RacingEventServiceImpl implements RacingEventService, EventFetcher, for (RaceDefinition race : event.getAllRaces()) { stopTrackingWind(event, race); // remove from default leaderboard - Leaderboard defaultLeaderboard = getLeaderboardByName(DEFAULT_LEADERBOARD_NAME); + Leaderboard defaultLeaderboard = getLeaderboardByName(DefaultLeaderboardName.DEFAULT_LEADERBOARD_NAME); defaultLeaderboard.removeRaceColumn(race.getName()); } }