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

renamed the UUID as string for course area accordingly

Browse Source
This commit is contained in:
Axel Uhl committed 2013-12-06 17:52:10 +01:00
1 parent 2992622af5
commit a682e80a61
14 files changed
+24 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CourseArea.java
+3 -1
View File
@@ -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();
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java
+1 -1
View File
@@ -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);
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
+1 -1
View File
@@ -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();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java
+1 -1
View File
@@ -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 {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
+1 -1
View File
@@ -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<Void>() {
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaStructureManagementPanel.java
+1 -1
View File
@@ -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<RegattaDTO>() {
newRegatta.scoringScheme, newRegatta.defaultCourseAreaUuidAsString, new AsyncCallback<RegattaDTO>() {
@Override
public void onFailure(Throwable t) {
errorReporter.reportError("Error trying to create new regatta " + newRegatta.getName() + ": " + t.getMessage());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
+5 -5
View File
@@ -105,9 +105,9 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
private void setCourseAreaInRegatta(RegattaDTO regatta) {
CourseAreaDTO courseArea = getSelectedCourseArea();
if (courseArea == null) {
regatta.defaultCourseAreaIdAsString = null;
regatta.defaultCourseAreaUuidAsString = null;
} else {
regatta.defaultCourseAreaIdAsString = courseArea.id;
regatta.defaultCourseAreaUuidAsString = courseArea.uuidAsString;
regatta.defaultCourseAreaName = courseArea.getName();
}
}
@@ -125,7 +125,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
return false;
}
for (CourseAreaDTO courseArea : event.venue.getCourseAreas()) {
if (courseArea.id == courseAreaIdAsString) {
if (courseArea.uuidAsString == courseAreaIdAsString) {
return true;
}
}
@@ -136,7 +136,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
sailingEventsListBox.addItem(stringConstants.selectSailingEvent());
for (EventDTO event : existingEvents) {
sailingEventsListBox.addItem(event.getName());
if (isCourseAreaInEvent(event, regatta.defaultCourseAreaIdAsString)) {
if (isCourseAreaInEvent(event, regatta.defaultCourseAreaUuidAsString)) {
sailingEventsListBox.setSelectedIndex(sailingEventsListBox.getItemCount() - 1);
fillCourseAreaListBox(event);
}
@@ -162,7 +162,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog<R
courseAreaListBox.addItem(stringMessages.selectCourseArea());
for (CourseAreaDTO courseArea : selectedEvent.venue.getCourseAreas()) {
courseAreaListBox.addItem(courseArea.getName());
if (courseArea.id == regatta.defaultCourseAreaIdAsString) {
if (courseArea.uuidAsString == regatta.defaultCourseAreaUuidAsString) {
courseAreaListBox.setSelectedIndex(courseAreaListBox.getItemCount() - 1);
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
+1 -1
View File
@@ -160,7 +160,7 @@ public interface SailingService extends RemoteService {
void removeRegattas(Collection<RegattaIdentifier> regattas);
void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaId, RegattaConfigurationDTO regattaConfiguration);
void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaUuidAsString, RegattaConfigurationDTO regattaConfiguration);
List<RaceColumnInSeriesDTO> addRaceColumnsToSeries(RegattaIdentifier regattaIdentifier, String seriesName, List<String> columnNames);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
+1 -1
View File
@@ -429,7 +429,7 @@ public interface SailingServiceAsync {
void getEventByIdAsString(String eventIdAsString, AsyncCallback<EventDTO> asyncCallback);
void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaId, RegattaConfigurationDTO regattaConfiguration, AsyncCallback<Void> callback);
void updateRegatta(RegattaIdentifier regattaIdentifier, String defaultCourseAreaUuidAsString, RegattaConfigurationDTO regattaConfiguration, AsyncCallback<Void> callback);
void getLeaderboardDataEntriesForAllRaceColumns(String leaderboardName, Date date, DetailType detailType,
AsyncCallback<List<Triple<String, List<CompetitorDTO>, List<Double>>>> callback);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java
+1 -1
View File
@@ -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);
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesSettingsDialogComponent.java
+2 -2
View File
@@ -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) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+4 -4
View File
@@ -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)));
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CourseAreaDTO.java
+1 -1
View File
@@ -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() {
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class RegattaDTO extends NamedDTO {
public List<RaceWithCompetitorsDTO> races;
public List<SeriesDTO> series;
public ScoringSchemeType scoringScheme;
public String defaultCourseAreaIdAsString;
public String defaultCourseAreaUuidAsString;
public String defaultCourseAreaName;
public DeviceConfigurationDTO.RegattaConfigurationDTO configuration;