eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-11 23:00:59 +00:00
Code Activity

renamed stringConstants to stringMessages where I found it

Browse Source
This commit is contained in:
Axel Uhl committed 2013-05-27 14:33:58 +02:00
1 parent a95386cb36
commit 6b6584f85d
3 files changed
+28 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
+14 -14
View File
@@ -20,15 +20,15 @@ import com.sap.sailing.gwt.ui.shared.SeriesDTO;
public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAndFleetsDialog {
protected Grid seriesGrid;
private Grid seriesGrid;
protected static class RegattaParameterValidator implements Validator<RegattaDTO> {
private StringMessages stringConstants;
private StringMessages stringMessages;
private ArrayList<RegattaDTO> existingRegattas;
public RegattaParameterValidator(StringMessages stringConstants, Collection<RegattaDTO> existingRegattas) {
this.stringConstants = stringConstants;
public RegattaParameterValidator(StringMessages stringMessages, Collection<RegattaDTO> existingRegattas) {
this.stringMessages = stringMessages;
this.existingRegattas = new ArrayList<RegattaDTO>(existingRegattas);
}
@@ -48,11 +48,11 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd
}
if (!nameNotEmpty) {
errorMessage = stringConstants.pleaseEnterAName();
errorMessage = stringMessages.pleaseEnterAName();
} else if (!boatClassNotEmpty) {
errorMessage = stringConstants.pleaseEnterAName();
errorMessage = stringMessages.pleaseEnterAName();
} else if (!unique) {
errorMessage = stringConstants.regattaWithThisNameAlreadyExists();
errorMessage = stringMessages.regattaWithThisNameAlreadyExists();
}
if (errorMessage == null) {
@@ -81,11 +81,11 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd
}
if (!seriesNameNotEmpty) {
errorMessage = stringConstants.series() + " " + (index + 1) + ": "
+ stringConstants.pleaseEnterAName();
errorMessage = stringMessages.series() + " " + (index + 1) + ": "
+ stringMessages.pleaseEnterAName();
} else if (!seriesUnique) {
errorMessage = stringConstants.series() + " " + (index2 + 1) + ": "
+ stringConstants.seriesWithThisNameAlreadyExists();
errorMessage = stringMessages.series() + " " + (index2 + 1) + ": "
+ stringMessages.seriesWithThisNameAlreadyExists();
}
}
@@ -104,7 +104,7 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd
@Override
protected void setupAdditionalWidgetsOnPanel(final VerticalPanel panel) {
panel.add(createHeadlineLabel(stringConstants.series()));
panel.add(createHeadlineLabel(stringMessages.series()));
panel.add(seriesGrid);
Button addSeriesButton = new Button("Add series");
addSeriesButton.addClickHandler(new ClickHandler() {
@@ -112,7 +112,7 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd
public void onClick(ClickEvent event) {
RegattaDTO result = getResult();
SeriesWithFleetsCreateDialog dialog = new SeriesWithFleetsCreateDialog(Collections
.unmodifiableCollection(result.series), stringConstants, new DialogCallback<SeriesDTO>() {
.unmodifiableCollection(result.series), stringMessages, new DialogCallback<SeriesDTO>() {
@Override
public void cancel() {
}
@@ -139,7 +139,7 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd
for (int i = 0; i < seriesCount; i++) {
SeriesDTO seriesDTO = series.get(i);
Label seriesLabel = new Label((i + 1) + ". " + stringConstants.series() + ":");
Label seriesLabel = new Label((i + 1) + ". " + stringMessages.series() + ":");
seriesLabel.setWordWrap(false);
seriesLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD);
seriesGrid.setWidget(i * 2, 0, seriesLabel);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
+12 -12
View File
@@ -23,7 +23,7 @@ import com.sap.sailing.gwt.ui.shared.SeriesDTO;
public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<RegattaDTO> {
protected StringMessages stringConstants;
protected StringMessages stringMessages;
protected RegattaDTO regatta;
protected TextBox nameEntryField;
@@ -38,11 +38,11 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
protected abstract void setupAdditionalWidgetsOnPanel(VerticalPanel panel);
public RegattaWithSeriesAndFleetsDialog(RegattaDTO regatta, List<EventDTO> existingEvents, String title,
String okButton, StringMessages stringConstants, Validator<RegattaDTO> validator,
String okButton, StringMessages stringMessages, Validator<RegattaDTO> validator,
DialogCallback<RegattaDTO> callback) {
super(title, null, okButton, stringConstants.cancel(), validator, callback);
super(title, null, okButton, stringMessages.cancel(), validator, callback);
this.stringConstants = stringConstants;
this.stringMessages = stringMessages;
this.regatta = regatta;
this.existingEvents = existingEvents;
@@ -60,7 +60,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
scoringSchemeListBox = createListBox(false);
for (ScoringSchemeType scoringSchemeType : ScoringSchemeType.values()) {
scoringSchemeListBox.addItem(ScoringSchemeTypeFormatter.format(scoringSchemeType, stringConstants),
scoringSchemeListBox.addItem(ScoringSchemeTypeFormatter.format(scoringSchemeType, stringMessages),
String.valueOf(scoringSchemeType.ordinal()));
if (scoringSchemeType == regatta.scoringScheme) {
scoringSchemeListBox.setSelectedIndex(scoringSchemeListBox.getItemCount() - 1);
@@ -69,7 +69,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
sailingEventsListBox = createListBox(false);
courseAreaListBox = createListBox(false);
setupEventAndCourseAreaListBoxes(stringConstants);
setupEventAndCourseAreaListBoxes(stringMessages);
courseAreaListBox.setEnabled(false);
}
@@ -83,15 +83,15 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
}
Grid formGrid = new Grid(5, 2);
panel.add(formGrid);
formGrid.setWidget(0, 0, new Label(stringConstants.name() + ":"));
formGrid.setWidget(0, 0, new Label(stringMessages.name() + ":"));
formGrid.setWidget(0, 1, nameEntryField);
formGrid.setWidget(1, 0, new Label(stringConstants.boatClass() + ":"));
formGrid.setWidget(1, 0, new Label(stringMessages.boatClass() + ":"));
formGrid.setWidget(1, 1, boatClassEntryField);
formGrid.setWidget(2, 0, new Label(stringConstants.scoringSystem() + ":"));
formGrid.setWidget(2, 0, new Label(stringMessages.scoringSystem() + ":"));
formGrid.setWidget(2, 1, scoringSchemeListBox);
formGrid.setWidget(3, 0, new Label(stringConstants.event() + ":"));
formGrid.setWidget(3, 0, new Label(stringMessages.event() + ":"));
formGrid.setWidget(3, 1, sailingEventsListBox);
formGrid.setWidget(4, 0, new Label(stringConstants.courseArea() + ":"));
formGrid.setWidget(4, 0, new Label(stringMessages.courseArea() + ":"));
formGrid.setWidget(4, 1, courseAreaListBox);
setupAdditionalWidgetsOnPanel(panel);
return panel;
@@ -165,7 +165,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
}
private void fillCourseAreaListBox(EventDTO selectedEvent) {
courseAreaListBox.addItem(stringConstants.selectCourseArea());
courseAreaListBox.addItem(stringMessages.selectCourseArea());
for (CourseAreaDTO courseArea : selectedEvent.venue.getCourseAreas()) {
courseAreaListBox.addItem(courseArea.name);
if (courseArea.id == regatta.defaultCourseAreaIdAsString) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsEditDialog.java
+2 -2
View File
@@ -11,8 +11,8 @@ import com.sap.sailing.gwt.ui.shared.RegattaDTO;
public class RegattaWithSeriesAndFleetsEditDialog extends RegattaWithSeriesAndFleetsDialog {
public RegattaWithSeriesAndFleetsEditDialog(RegattaDTO regatta, Collection<RegattaDTO> existingRegattas,
List<EventDTO> existingEvents, StringMessages stringConstants, DialogCallback<RegattaDTO> callback) {
super(regatta, existingEvents, stringConstants.editRegatta(), stringConstants.ok(), stringConstants,
List<EventDTO> existingEvents, StringMessages stringMessages, DialogCallback<RegattaDTO> callback) {
super(regatta, existingEvents, stringMessages.editRegatta(), stringMessages.ok(), stringMessages,
null, callback);
nameEntryField.setEnabled(false);
boatClassEntryField.setEnabled(false);