# moved some hardcoded strings to StringMessages

This commit is contained in:
Lukas Niemeier committed 2013-11-04 02:21:19 +01:00
1 parent 422d24eaa5
commit 92c6914371
7 files changed
+42 -17

No files matched your search

@@ -124,7 +124,7 @@ public class AdminConsoleEntryPoint extends AbstractEntryPoint implements Regatt
tabPanel.add(masterDataImportPanel, stringMessages.masterDataImportPanel(), /* asHTML */ false);
final DeviceConfigurationPanel deviceConfigurationPanel = new DeviceConfigurationPanel(sailingService, stringMessages, this);
tabPanel.add(deviceConfigurationPanel, "Device Configuration", false);
tabPanel.add(deviceConfigurationPanel, stringMessages.deviceConfiguration(), false);
tabPanel.selectTab(0);
tabPanel.addSelectionHandler(new SelectionHandler<Integer>() {
@@ -26,6 +26,7 @@ public class DeviceConfigurationDetailComposite extends Composite {
private final SailingServiceAsync sailingService;
private final ErrorReporter errorReporter;
private final StringMessages stringMessages;
private CaptionPanel captionPanel;
private Grid mainGrid;
@@ -42,14 +43,15 @@ public class DeviceConfigurationDetailComposite extends Composite {
public DeviceConfigurationDetailComposite(final SailingServiceAsync sailingService, final ErrorReporter errorReporter, StringMessages stringMessages) {
this.sailingService = sailingService;
this.errorReporter = errorReporter;
this.stringMessages = stringMessages;
this.matcher = null;
this.configuration = null;
captionPanel = new CaptionPanel("Configuration");
captionPanel = new CaptionPanel(stringMessages.configuration());
VerticalPanel verticalPanel = new VerticalPanel();
mainGrid = new Grid(4, 2);
updateButton = new Button("Update");
updateButton = new Button(stringMessages.save());
updateButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -83,9 +85,9 @@ public class DeviceConfigurationDetailComposite extends Composite {
private void markAsDrity(boolean dirty) {
if (dirty) {
captionPanel.setCaptionText("Configuration*");
captionPanel.setCaptionText(stringMessages.configuration() + "*");
} else {
captionPanel.setCaptionText("Configuration");
captionPanel.setCaptionText(stringMessages.configuration());
}
}
@@ -115,7 +117,7 @@ public class DeviceConfigurationDetailComposite extends Composite {
}
allowedCourseAreasBox.setText(builder.substring(0, builder.length() - 1));
}
mainGrid.setWidget(0, 0, new Label("Allowed Course Areas"));
mainGrid.setWidget(0, 0, new Label(stringMessages.allowedCourseAreas()));
mainGrid.setWidget(0, 1, allowedCourseAreasBox);
minRoundsBox = new TextBox();
@@ -129,7 +131,7 @@ public class DeviceConfigurationDetailComposite extends Composite {
if (result.minRoundsForCourse != null) {
minRoundsBox.setText(result.minRoundsForCourse.toString());
}
mainGrid.setWidget(1, 0, new Label("Minimum Rounds for Course"));
mainGrid.setWidget(1, 0, new Label(stringMessages.minimumRoundsForCourse()));
mainGrid.setWidget(1, 1, minRoundsBox);
maxRoundsBox = new TextBox();
@@ -143,7 +145,7 @@ public class DeviceConfigurationDetailComposite extends Composite {
if (result.maxRoundsForCourse != null) {
maxRoundsBox.setText(result.maxRoundsForCourse.toString());
}
mainGrid.setWidget(2, 0, new Label("Maximum Rounds for Course"));
mainGrid.setWidget(2, 0, new Label(stringMessages.maximumRoundsForCourse()));
mainGrid.setWidget(2, 1, maxRoundsBox);
mailRecipientBox = new TextBox();
@@ -157,7 +159,7 @@ public class DeviceConfigurationDetailComposite extends Composite {
if (result.resultsMailRecipient != null) {
mailRecipientBox.setText(result.resultsMailRecipient);
}
mainGrid.setWidget(3, 0, new Label("Results Mail Recipient"));
mainGrid.setWidget(3, 0, new Label(stringMessages.resultsMailRecipient()));
mainGrid.setWidget(3, 1, mailRecipientBox);
}
@@ -30,7 +30,6 @@ public class DeviceConfigurationListComposite extends Composite {
private final CellTable<DeviceConfigurationMatcherDTO> configurationTable;
private ListDataProvider<DeviceConfigurationMatcherDTO> configurationsDataProvider;
private final SimplePanel mainPanel;
private final VerticalPanel panel;
@@ -38,6 +37,7 @@ public class DeviceConfigurationListComposite extends Composite {
private final SailingServiceAsync sailingService;
private final ErrorReporter errorReporter;
private final StringMessages stringMessages;
private static AdminConsoleTableResources tableResource = GWT.create(AdminConsoleTableResources.class);
@@ -46,12 +46,13 @@ public class DeviceConfigurationListComposite extends Composite {
final ErrorReporter errorReporter, final StringMessages stringMessages) {
this.sailingService = sailingService;
this.errorReporter = errorReporter;
this.stringMessages = stringMessages;
mainPanel = new SimplePanel();
panel = new VerticalPanel();
mainPanel.setWidget(panel);
noConfigurationsLabel = new Label("There are no configurations.");
noConfigurationsLabel = new Label(stringMessages.noConfigurations());
noConfigurationsLabel.setWordWrap(false);
panel.add(noConfigurationsLabel);
@@ -93,7 +94,7 @@ public class DeviceConfigurationListComposite extends Composite {
@Override
public void onFailure(Throwable caught) {
noConfigurationsLabel.setText("Error retrieving configuration data from server.");
noConfigurationsLabel.setText(stringMessages.errorRetrievingConfiguration());
noConfigurationsLabel.setVisible(true);
configurationTable.setVisible(false);
errorReporter.reportError("Error retrieving configuration data from server: " + caught.getMessage());
@@ -14,14 +14,12 @@ import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.sap.sailing.gwt.ui.client.DataEntryDialog.DialogCallback;
import com.sap.sailing.gwt.ui.client.DataEntryDialog.Validator;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.SelectionChangeListener;
import com.sap.sailing.gwt.ui.client.SelectionProvider;
import com.sap.sailing.gwt.ui.client.SelectionProviderImpl;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationDTO;
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationMatcherDTO;
public class DeviceConfigurationPanel extends SimplePanel implements SelectionChangeListener<DeviceConfigurationMatcherDTO> {
@@ -59,7 +57,7 @@ public class DeviceConfigurationPanel extends SimplePanel implements SelectionCh
private void setupControlPanel(VerticalPanel mainPanel) {
HorizontalPanel deviceManagementControlPanel = new HorizontalPanel();
deviceManagementControlPanel.setSpacing(5);
addConfigurationButton = new Button("Add Configuration");
addConfigurationButton = new Button(stringMessages.addConfiguration());
addConfigurationButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -816,4 +816,12 @@ public interface StringMessages extends Messages {
String raceTimeDownwindTooltip();
String raceTimeReachingTooltip();
String raceTimeUpwindTooltip();
String addConfiguration();
String noConfigurations();
String errorRetrievingConfiguration();
String allowedCourseAreas();
String minimumRoundsForCourse();
String maximumRoundsForCourse();
String resultsMailRecipient();
String deviceConfiguration();
}
@@ -808,4 +808,12 @@ timeUpwind=Time Upwind
raceTimeTooltip=Total time traveled in this race
raceTimeDownwindTooltip=Total time traveled downwind in this race
raceTimeReachingTooltip=Total time traveled reaching in this race
raceTimeUpwindTooltip=Total time traveled upwind in this race
raceTimeUpwindTooltip=Total time traveled upwind in this race
addConfiguration=Add Configuration
noConfigurations=There are no configurations.
errorRetrievingConfiguration=Error retrieving configuration data from server.
allowedCourseAreas=Allowed Course Areas
minimumRoundsForCourse=Minimum Rounds for Course
maximumRoundsForCourse=Maximum Rounds for Course
resultsMailRecipient=Results Mail Recipient
deviceConfiguration=Device Configuration
@@ -804,4 +804,12 @@ timeUpwind=Zeit Kreuz
raceTimeTooltip=Die für dieses Rennen benötigte Zeit
raceTimeDownwindTooltip=Die in diesem Rennen auf Vorwind gesegelte Zeit
raceTimeReachingTooltip=Die in diesem Rennen auf Holeschlage gesegelte Zeit
raceTimeUpwindTooltip=Diw in diesem Rennen auf Kreuz gesegelte Zeit
raceTimeUpwindTooltip=Diw in diesem Rennen auf Kreuz gesegelte Zeit
addConfiguration=Konfiguration hinzufügen
noConfigurations=Keine Konfigurationen vorhanden.
errorRetrievingConfiguration=Fehler beim Laden der Konfiguration.
allowedCourseAreas=Erlaubte Rennbahnen
minimumRoundsForCourse=Minimale Rundenanzahl
maximumRoundsForCourse=Maximale Rundenanzahl
resultsMailRecipient=Empfänger der Ergebnislisten
deviceConfiguration=Device Configuration