From a682e80a61019d2d229f2bd545ddce3dbf363bd0 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 6 Dec 2013 17:52:10 +0100 Subject: [PATCH] renamed the UUID as string for course area accordingly --- .../src/com/sap/sailing/domain/base/CourseArea.java | 4 +++- .../gwt/ui/adminconsole/FlexibleLeaderboardDialog.java | 2 +- .../ui/adminconsole/FlexibleLeaderboardEditDialog.java | 2 +- .../gwt/ui/adminconsole/RegattaDetailsComposite.java | 2 +- .../gwt/ui/adminconsole/RegattaListComposite.java | 2 +- .../adminconsole/RegattaStructureManagementPanel.java | 2 +- .../adminconsole/RegattaWithSeriesAndFleetsDialog.java | 10 +++++----- .../com/sap/sailing/gwt/ui/client/SailingService.java | 2 +- .../sap/sailing/gwt/ui/client/SailingServiceAsync.java | 2 +- .../ui/regattaoverview/RegattaRaceStatesComponent.java | 2 +- .../RegattaRaceStatesSettingsDialogComponent.java | 4 ++-- .../sap/sailing/gwt/ui/server/SailingServiceImpl.java | 8 ++++---- .../com/sap/sailing/gwt/ui/shared/CourseAreaDTO.java | 2 +- .../java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java | 2 +- 14 files changed, 24 insertions(+), 22 deletions(-) diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CourseArea.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CourseArea.java index bd90d7a8be7..c170a53ecb7 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CourseArea.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CourseArea.java @@ -1,5 +1,7 @@ package com.sap.sailing.domain.base; +import java.util.UUID; + import com.sap.sailing.domain.common.Named; import com.sap.sailing.domain.common.WithID; @@ -11,5 +13,5 @@ import com.sap.sailing.domain.common.WithID; * */ public interface CourseArea extends Named, WithID, IsManagedBySharedDomainFactory { - + UUID getId(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java index cfde83c7a6e..f8e3610d6fc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java @@ -80,7 +80,7 @@ public abstract class FlexibleLeaderboardDialog extends AbstractLeaderboardDialo if (courseArea == null) { leaderboard.setCourseAreaIdAsString(null); } else { - leaderboard.setCourseAreaIdAsString(getSelectedCourseArea().id); + leaderboard.setCourseAreaIdAsString(getSelectedCourseArea().uuidAsString); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java index f182de91b50..58c2efd007e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java @@ -38,7 +38,7 @@ public class FlexibleLeaderboardEditDialog extends FlexibleLeaderboardDialog { sailingEventsListBox = createSailingEventListBox(); for (EventDTO event : existingEvents) { for (CourseAreaDTO courseArea : event.venue.getCourseAreas()) { - if (courseArea.id.equals(leaderboard.getCourseAreaIdAsString())) { + if (courseArea.uuidAsString.equals(leaderboard.getCourseAreaIdAsString())) { int index = existingEvents.indexOf(event) + 1; // + 1 because of the "Please select... item" sailingEventsListBox.setSelectedIndex(index); onEventSelectionChanged(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java index 967522a82be..fde518c072d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java @@ -318,7 +318,7 @@ public class RegattaDetailsComposite extends Composite { if (regatta != null) { regattaName.setText(regatta.getName()); boatClassName.setText(regatta.boatClass != null ? regatta.boatClass.getName() : ""); - defaultCourseArea.setText(regatta.defaultCourseAreaIdAsString == null ? "" : regatta.defaultCourseAreaName); + defaultCourseArea.setText(regatta.defaultCourseAreaUuidAsString == null ? "" : regatta.defaultCourseAreaName); if (regatta.configuration != null) { configuration.setText(stringMessages.configured()); } else { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java index bbda97e5c9f..5a835a8a2b4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java @@ -221,7 +221,7 @@ public class RegattaListComposite extends Composite implements RegattaDisplayer private void commitEditedRegatta(final RegattaDTO editedRegatta) { final RegattaIdentifier regattaName = new RegattaName(editedRegatta.getName()); - sailingService.updateRegatta(regattaName, editedRegatta.defaultCourseAreaIdAsString, + sailingService.updateRegatta(regattaName, editedRegatta.defaultCourseAreaUuidAsString, editedRegatta.configuration, new AsyncCallback() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaStructureManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaStructureManagementPanel.java index 508e526ee78..96449b5c68a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaStructureManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaStructureManagementPanel.java @@ -165,7 +165,7 @@ public class RegattaStructureManagementPanel extends SimplePanel implements Rega } sailingService.createRegatta(newRegatta.getName(), newRegatta.boatClass==null?null:newRegatta.boatClass.getName(), new RegattaCreationParametersDTO(seriesStructure), true, - newRegatta.scoringScheme, newRegatta.defaultCourseAreaIdAsString, new AsyncCallback() { + newRegatta.scoringScheme, newRegatta.defaultCourseAreaUuidAsString, new AsyncCallback() { @Override public void onFailure(Throwable t) { errorReporter.reportError("Error trying to create new regatta " + newRegatta.getName() + ": " + t.getMessage()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java index b80b030db96..fcb050e7a4e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java @@ -105,9 +105,9 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog regattas); - void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaId, RegattaConfigurationDTO regattaConfiguration); + void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaUuidAsString, RegattaConfigurationDTO regattaConfiguration); List addRaceColumnsToSeries(RegattaIdentifier regattaIdentifier, String seriesName, List columnNames); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java index 64056e5be4a..4e4917d1158 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java @@ -429,7 +429,7 @@ public interface SailingServiceAsync { void getEventByIdAsString(String eventIdAsString, AsyncCallback asyncCallback); - void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaId, RegattaConfigurationDTO regattaConfiguration, AsyncCallback callback); + void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaUuidAsString, RegattaConfigurationDTO regattaConfiguration, AsyncCallback callback); void getLeaderboardDataEntriesForAllRaceColumns(String leaderboardName, Date date, DetailType detailType, AsyncCallback, List>>> callback); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java index 8b0fff416a3..bf2d50d1b09 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java @@ -626,7 +626,7 @@ public class RegattaRaceStatesComponent extends SimplePanel implements Component private void fillVisibleCourseAreasInSettingsIfEmpty() { if (settings.getVisibleCourseAreas().isEmpty() && eventDTO != null) { for (CourseAreaDTO courseArea : eventDTO.venue.getCourseAreas()) { - settings.getVisibleCourseAreas().add(courseArea.id); + settings.getVisibleCourseAreas().add(courseArea.uuidAsString); } } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesSettingsDialogComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesSettingsDialogComponent.java index bbe117b1d4f..1345db57b30 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesSettingsDialogComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesSettingsDialogComponent.java @@ -76,10 +76,10 @@ public class RegattaRaceStatesSettingsDialogComponent implements SettingsDialogC boolean allCheckboxesSelected = true; for (CourseAreaDTO courseAreaDTO : courseAreas) { CheckBox checkBox = dialog.createCheckbox(courseAreaDTO.getName()); - boolean isCourseAreaVisible = Util.contains(initialSettings.getVisibleCourseAreas(), courseAreaDTO.id); + boolean isCourseAreaVisible = Util.contains(initialSettings.getVisibleCourseAreas(), courseAreaDTO.uuidAsString); allCheckboxesSelected &= isCourseAreaVisible; checkBox.setValue(isCourseAreaVisible); - courseAreaCheckBoxMap.put(courseAreaDTO.id, checkBox); + courseAreaCheckBoxMap.put(courseAreaDTO.uuidAsString, checkBox); courseAreaGrid.setWidget(rowIndex, columnIndex++, checkBox); if(columnIndex == maxCourseAreasPerRow) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index c8fb24093f7..83bb9c90b79 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -643,7 +643,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S regattaDTO.boatClass = new BoatClassDTO(boatClass.getName(), boatClass.getHullLength().getMeters()); } if (regatta.getDefaultCourseArea() != null) { - regattaDTO.defaultCourseAreaIdAsString = regatta.getDefaultCourseArea().getId().toString(); + regattaDTO.defaultCourseAreaUuidAsString = regatta.getDefaultCourseArea().getId().toString(); regattaDTO.defaultCourseAreaName = regatta.getDefaultCourseArea().getName(); } regattaDTO.configuration = convertToRegattaConfigurationDTO(regatta.getRegattaConfiguration()); @@ -2813,7 +2813,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S private CourseAreaDTO convertToCourseAreaDTO(CourseArea courseArea) { CourseAreaDTO courseAreaDTO = new CourseAreaDTO(courseArea.getName()); - courseAreaDTO.id = courseArea.getId().toString(); + courseAreaDTO.uuidAsString = courseArea.getId().toString(); return courseAreaDTO; } @@ -2899,9 +2899,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S } @Override - public void updateRegatta(RegattaIdentifier regattaName, String defaultCourseAreaId, + public void updateRegatta(RegattaIdentifier regattaName, String defaultCourseAreaUuidAsString, RegattaConfigurationDTO configurationDTO) { - UUID courseAreaUuid = convertIdentifierStringToUuid(defaultCourseAreaId); + UUID courseAreaUuid = convertIdentifierStringToUuid(defaultCourseAreaUuidAsString); getService().apply(new UpdateSpecificRegatta(regattaName, courseAreaUuid, convertToRegattaConfiguration(configurationDTO))); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CourseAreaDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CourseAreaDTO.java index 1cfc8ec697e..8cc6a250306 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CourseAreaDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CourseAreaDTO.java @@ -5,7 +5,7 @@ import com.sap.sailing.domain.common.dto.NamedDTO; public class CourseAreaDTO extends NamedDTO implements IsSerializable { private static final long serialVersionUID = -5279690838452265454L; - public String id; + public String uuidAsString; public CourseAreaDTO() { } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java index 9eff8f922a2..f5d211a14f4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java @@ -19,7 +19,7 @@ public class RegattaDTO extends NamedDTO { public List races; public List series; public ScoringSchemeType scoringScheme; - public String defaultCourseAreaIdAsString; + public String defaultCourseAreaUuidAsString; public String defaultCourseAreaName; public DeviceConfigurationDTO.RegattaConfigurationDTO configuration;