From 24ce576c19dbe9d99dc31feb527343ce63f4aae0 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 10 Jun 2013 16:34:33 +0200 Subject: [PATCH] encapsulated CompetitorDTO fields; fixed SailingGWT.launch for missing simulator classpath entry; added some compaction for competitors in leaderboard transmission --- .../common/dto/AbstractLeaderboardDTO.java | 10 +- .../domain/common/dto/CompetitorDTO.java | 61 ++++-------- .../domain/common/dto/CompetitorDTOImpl.java | 87 +++++++++++++++++ .../sailing/domain/common/dto/FleetDTO.java | 8 +- .../common/dto/IncrementalLeaderboardDTO.java | 95 ++++++++++++++++++- .../sailing/domain/common/dto/NamedDTO.java | 20 ++-- .../domain/common/dto/PlacemarkDTO.java | 4 +- .../domain/common/dto/RaceColumnDTO.java | 10 +- .../sailing/domain/common/dto/RaceDTO.java | 2 +- .../test/LeaderboardDTODiffingTest.java | 5 +- .../sailing/domain/base/DomainFactory.java | 2 +- .../domain/base/impl/DomainFactoryImpl.java | 3 +- .../impl/AbstractSimpleLeaderboardImpl.java | 2 +- .../ui/test/GwtTestCaseColumnToggling.java | 2 +- java/com.sap.sailing.gwt.ui/SailingGWT.launch | 13 ++- .../gwt/ui/actions/GetRaceMapDataAction.java | 4 +- .../AbstractEventManagementPanel.java | 8 +- .../AbstractTrackedRacesListComposite.java | 8 +- .../gwt/ui/adminconsole/EventDialog.java | 12 +-- .../gwt/ui/adminconsole/EventEditDialog.java | 6 +- .../FlexibleLeaderboardDialog.java | 8 +- .../adminconsole/LeaderboardConfigPanel.java | 12 +-- .../LeaderboardGroupConfigPanel.java | 32 +++---- .../adminconsole/LeaderboardGroupDialog.java | 2 +- .../LeaderboardGroupEditDialog.java | 2 +- .../RaceColumnsInLeaderboardDialog.java | 6 +- .../RaceCourseManagementPanel.java | 24 ++--- .../ui/adminconsole/RacesListBoxPanel.java | 2 +- .../adminconsole/RegattaDetailsComposite.java | 26 ++--- .../RegattaLeaderboardDialog.java | 6 +- .../ui/adminconsole/RegattaListComposite.java | 24 ++--- .../RegattaStructureManagementPanel.java | 8 +- ...egattaWithSeriesAndFleetsCreateDialog.java | 12 +-- .../RegattaWithSeriesAndFleetsDialog.java | 16 ++-- .../SailingEventManagementPanel.java | 36 +++---- .../gwt/ui/adminconsole/SeriesEditDialog.java | 24 ++--- .../SeriesWithFleetsCreateDialog.java | 12 +-- .../SwissTimingEventManagementPanel.java | 2 +- .../SwissTimingReplayConnectorPanel.java | 8 +- .../TracTracEventManagementPanel.java | 10 +- .../sailing/gwt/ui/client/RaceTimePanel.java | 2 +- .../shared/charts/AbstractChartPanel.java | 4 +- .../shared/charts/LeaderboardRankChart.java | 2 +- .../filter/CompetitorNationalityFilter.java | 16 ++-- .../filter/CompetitorSailNumbersFilter.java | 4 +- .../ui/client/shared/racemap/BoatOverlay.java | 6 +- .../shared/racemap/CompetitorInfoOverlay.java | 8 +- .../shared/racemap/CourseMarkOverlay.java | 2 +- .../gwt/ui/client/shared/racemap/RaceMap.java | 18 ++-- .../AbstractRaceColumnSelection.java | 6 +- .../ui/leaderboard/CompetitorColumnBase.java | 6 +- .../ExplicitRaceColumnSelection.java | 2 +- .../LastNRacesColumnSelection.java | 2 +- .../gwt/ui/leaderboard/LeaderboardPanel.java | 20 ++-- .../LeaderboardUrlConfigurationDialog.java | 2 +- .../EditableLeaderboardPanel.java | 48 +++++----- .../MatchAndApplyScoreCorrectionsDialog.java | 8 +- .../gwt/ui/raceboard/RaceBoardEntryPoint.java | 6 +- .../regattaoverview/RaceCourseComposite.java | 2 +- .../regattaoverview/RegattaOverviewPanel.java | 4 +- ...attaRaceStatesSettingsDialogComponent.java | 2 +- .../gwt/ui/server/SailingServiceImpl.java | 51 +++++----- .../gwt/ui/server/SimulatorServiceImpl.java | 4 +- .../gwt/ui/shared/BulkScoreCorrectionDTO.java | 12 +-- .../gwt/ui/shared/CompactRaceMapDataDTO.java | 6 +- .../sap/sailing/gwt/ui/shared/LegInfoDTO.java | 2 +- .../gwt/ui/shared/MarkPassingTimesDTO.java | 4 +- .../sailing/gwt/ui/shared/RaceCourseDTO.java | 4 +- .../sap/sailing/gwt/ui/shared/RegattaDTO.java | 10 +- .../sailing/gwt/ui/shared/WaypointDTO.java | 2 +- .../gwt/ui/simulator/SimulatorMainPanel.java | 6 +- .../gwt/ui/simulator/SimulatorMap.java | 2 +- .../gwt/ui/spectator/EventOverviewPanel.java | 16 ++-- .../LeaderboardGroupOverviewPanel.java | 12 +-- .../ui/spectator/LeaderboardGroupPanel.java | 20 ++-- 75 files changed, 564 insertions(+), 391 deletions(-) create mode 100755 java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java index 2055b45e0a4..ebeec1546c1 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java @@ -40,7 +40,7 @@ public abstract class AbstractLeaderboardDTO implements Serializable { public Set getBoatClasses() { Set result = new HashSet(); for (CompetitorDTO competitor : rows.keySet()) { - result.add(competitor.boatClass); + result.add(competitor.getBoatClass()); } return result; } @@ -51,7 +51,7 @@ public abstract class AbstractLeaderboardDTO implements Serializable { public String getDisplayName(CompetitorDTO competitor) { if (competitorDisplayNames == null || competitorDisplayNames.get(competitor) == null) { - return competitor.name; + return competitor.getName(); } else { return competitorDisplayNames.get(competitor); } @@ -121,7 +121,7 @@ public abstract class AbstractLeaderboardDTO implements Serializable { RaceColumnDTO result = getRaceColumnByName(raceColumnName); if (result == null) { result = new RaceColumnDTO(/* isValidInTotalScore */ true); - result.name = raceColumnName; + result.setName(raceColumnName); races.add(result); } return result; @@ -151,7 +151,7 @@ public abstract class AbstractLeaderboardDTO implements Serializable { raceColumnDTO.setExplicitFactor(explicitFactor); boolean contains = false; for (FleetDTO fleet : raceColumnDTO.getFleets()) { - if (fleet.name.equals(fleetDTO.name)) { + if (fleet.getName().equals(fleetDTO.getName())) { contains = true; break; } @@ -167,7 +167,7 @@ public abstract class AbstractLeaderboardDTO implements Serializable { public RaceColumnDTO createEmptyRaceColumn(String raceColumnName, boolean medalRace, boolean isValidInTotalScore) { RaceColumnDTO raceColumn = new RaceColumnDTO(isValidInTotalScore); - raceColumn.name = raceColumnName; + raceColumn.setName(raceColumnName); raceColumn.setMedalRace(medalRace); races.add(raceColumn); return raceColumn; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java index 8144be2f1b2..167c57fa9cb 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java @@ -2,51 +2,26 @@ package com.sap.sailing.domain.common.dto; import java.io.Serializable; -public class CompetitorDTO extends NamedDTO implements Serializable { - private static final long serialVersionUID = -4997852354821083154L; - public String twoLetterIsoCountryCode; - public String threeLetterIocCountryCode; - public String countryName; - public String sailID; - public String idAsString; - public BoatClassDTO boatClass; +public interface CompetitorDTO extends Serializable { - CompetitorDTO() {} + String getTwoLetterIsoCountryCode(); + + String getThreeLetterIocCountryCode(); + + String getCountryName(); + + String getSailID(); + + String getIdAsString(); + + BoatClassDTO getBoatClass(); - public CompetitorDTO(String name, String twoLetterIsoCountryCode, String threeLetterIocCountryCode, - String countryName, String sailID, String idAsString, BoatClassDTO boatClass) { - super(name); - this.twoLetterIsoCountryCode = twoLetterIsoCountryCode; - this.threeLetterIocCountryCode = threeLetterIocCountryCode; - this.countryName = countryName; - this.sailID = sailID; - this.idAsString = idAsString; - this.boatClass = boatClass; - } + String getName(); - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * idAsString.hashCode(); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - CompetitorDTO other = (CompetitorDTO) obj; - if (idAsString == null) { - if (other.idAsString != null) - return false; - } else if (!idAsString.equals(other.idAsString)) - return false; - return true; - } + /** + * A regular instance will simply return this object. A compacted version may compute the result by looking it up + * from the previous version of the enclosing leaderboard. + */ + CompetitorDTO getCompetitorFromPrevious(LeaderboardDTO previousVersion); } diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java new file mode 100755 index 00000000000..b8fb1f8cc63 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java @@ -0,0 +1,87 @@ +package com.sap.sailing.domain.common.dto; + +import java.io.Serializable; + +public class CompetitorDTOImpl extends NamedDTO implements CompetitorDTO, Serializable { + private static final long serialVersionUID = -4997852354821083154L; + private String twoLetterIsoCountryCode; + private String threeLetterIocCountryCode; + private String countryName; + private String sailID; + private String idAsString; + private BoatClassDTO boatClass; + + CompetitorDTOImpl() {} + + public CompetitorDTOImpl(String name, String twoLetterIsoCountryCode, String threeLetterIocCountryCode, + String countryName, String sailID, String idAsString, BoatClassDTO boatClass) { + super(name); + this.twoLetterIsoCountryCode = twoLetterIsoCountryCode; + this.threeLetterIocCountryCode = threeLetterIocCountryCode; + this.countryName = countryName; + this.sailID = sailID; + this.idAsString = idAsString; + this.boatClass = boatClass; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * getIdAsString().hashCode(); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CompetitorDTOImpl other = (CompetitorDTOImpl) obj; + if (getIdAsString() == null) { + if (other.getIdAsString() != null) + return false; + } else if (!getIdAsString().equals(other.getIdAsString())) + return false; + return true; + } + + @Override + public String getTwoLetterIsoCountryCode() { + return twoLetterIsoCountryCode; + } + + @Override + public String getThreeLetterIocCountryCode() { + return threeLetterIocCountryCode; + } + + @Override + public String getCountryName() { + return countryName; + } + + @Override + public String getSailID() { + return sailID; + } + + @Override + public String getIdAsString() { + return idAsString; + } + + @Override + public BoatClassDTO getBoatClass() { + return boatClass; + } + + @Override + public CompetitorDTO getCompetitorFromPrevious(LeaderboardDTO previousVersion) { + return this; + } + +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/FleetDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/FleetDTO.java index 8698cf595b2..d86700cd61e 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/FleetDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/FleetDTO.java @@ -43,7 +43,7 @@ public class FleetDTO extends NamedDTO { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + orderNo; result = prime * result + ((seriesName == null) ? 0 : seriesName.hashCode()); return result; @@ -58,10 +58,10 @@ public class FleetDTO extends NamedDTO { if (getClass() != obj.getClass()) return false; FleetDTO other = (FleetDTO) obj; - if (name == null) { - if (other.name != null) + if (getName() == null) { + if (other.getName() != null) return false; - } else if (!name.equals(other.name)) + } else if (!getName().equals(other.getName())) return false; if (orderNo != other.orderNo) return false; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/IncrementalLeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/IncrementalLeaderboardDTO.java index 5a2be5402c4..b23d294dd9c 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/IncrementalLeaderboardDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/IncrementalLeaderboardDTO.java @@ -283,6 +283,66 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme } } + private class PreviousCompetitorDTOImpl implements CompetitorDTO { + private static final long serialVersionUID = 8820028699103040805L; + private int indexInPreviousCompetitorList; + + @SuppressWarnings("unused") // for serialization only + PreviousCompetitorDTOImpl() {} + + public PreviousCompetitorDTOImpl(int indexInPreviousCompetitorList) { + super(); + this.indexInPreviousCompetitorList = indexInPreviousCompetitorList; + } + + @Override + public String getTwoLetterIsoCountryCode() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public String getThreeLetterIocCountryCode() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public String getCountryName() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public String getSailID() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public String getIdAsString() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public BoatClassDTO getBoatClass() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public String getName() { + throw new RuntimeException("Internal error. Objects of type "+PreviousCompetitorDTOImpl.class.getName()+ + " need to be replaced by an object of "+CompetitorDTOImpl.class.getName()+" after deserialization"); + } + + @Override + public CompetitorDTO getCompetitorFromPrevious(LeaderboardDTO previousVersion) { + return previousVersion.competitors.get(indexInPreviousCompetitorList); + } + } + IncrementalLeaderboardDTO() {} public IncrementalLeaderboardDTO(String id, Cloner cloner) { @@ -341,13 +401,23 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme } } } + Set suppressedCompetitors = new HashSet(); if (suppressedCompetitorsUnchanged) { - Set suppressedCompetitors = new HashSet(); Util.addAll(previousVersion.getSuppressedCompetitors(), suppressedCompetitors); - setSuppressedCompetitors(suppressedCompetitors); + } else { + for (CompetitorDTO compactSuppressedCompetitor : getSuppressedCompetitors()) { + suppressedCompetitors.add(compactSuppressedCompetitor.getCompetitorFromPrevious(previousVersion)); + } } + setSuppressedCompetitors(suppressedCompetitors); if (competitorDisplayNamesUnchanged) { competitorDisplayNames = previousVersion.competitorDisplayNames; + } else { + Map expandedCompetitorDisplayNames = new HashMap(); + for (Map.Entry e : competitorDisplayNames.entrySet()) { + expandedCompetitorDisplayNames.put(e.getKey().getCompetitorFromPrevious(previousVersion), e.getValue()); + } + competitorDisplayNames = expandedCompetitorDisplayNames; } // TODO ensure that the races collection has all the necessary RaceColumnDTO objects before looking them up by name for (String raceColumnNameForWhichCompetitorOrderingPerRaceUnchanged : raceColumnNamesForWhichCompetitorOrderingPerRaceUnchanged) { @@ -443,25 +513,44 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme this.defaultCourseAreaNameUnchanged = true; } competitorIndexesInPreviousCompetitorsList = new int[competitors.size()]; + // for this stripping run, remembers the mapping of real CompetitorDTO objects to the compact form that only holds an int as reference to the + // previous version's competitors list; those will be used to replace the real CompetitorDTO objects where possible and will be replaced the other + // way in apply(...). + Map compactCompetitorMap = new HashMap(); int i=0; for (CompetitorDTO competitor : competitors) { int indexInPrevious = previousVersion.competitors.indexOf(competitor); competitorIndexesInPreviousCompetitorsList[i++] = indexInPrevious; + CompetitorDTO compactReplacementCompetitor = new PreviousCompetitorDTOImpl(indexInPrevious); + compactCompetitorMap.put(competitor, compactReplacementCompetitor); if (indexInPrevious == -1) { if (addedCompetitors == null) { addedCompetitors = new ArrayList(); } addedCompetitors.add(competitor); + compactCompetitorMap.put(competitor, competitor); } } competitors = null; if (Util.equalsWithNull(getSuppressedCompetitors(), previousVersion.getSuppressedCompetitors())) { suppressedCompetitorsUnchanged = true; setSuppressedCompetitors(null); + } else { + Set compactSuppressedCompetitors = new HashSet(); + for (CompetitorDTO suppressedCompetitor : getSuppressedCompetitors()) { + compactSuppressedCompetitors.add(compactCompetitorMap.get(suppressedCompetitor)); + } + setSuppressedCompetitors(compactSuppressedCompetitors); } if (Util.equalsWithNull(competitorDisplayNames, previousVersion.competitorDisplayNames)) { competitorDisplayNamesUnchanged = true; competitorDisplayNames = null; + } else { + Map compactCompetitorDisplayNames = new HashMap(); + for (Map.Entry e : competitorDisplayNames.entrySet()) { + compactCompetitorDisplayNames.put(compactCompetitorMap.get(e.getKey()), e.getValue()); + } + competitorDisplayNames = compactCompetitorDisplayNames; } raceColumnNamesForWhichCompetitorOrderingPerRaceUnchanged = new HashSet(); final HashMap> competitorOrderingPerRace = new HashMap>(getCompetitorOrderingPerRace()); @@ -469,7 +558,7 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme List competitorsFromBestToWorstForRaceColumn = getCompetitorsFromBestToWorst(raceColumn); List previousCompetitorsFrombestToWorstForRaceColumn = previousVersion.getCompetitorsFromBestToWorst(raceColumn); if (Util.equalsWithNull(competitorsFromBestToWorstForRaceColumn, previousCompetitorsFrombestToWorstForRaceColumn)) { - raceColumnNamesForWhichCompetitorOrderingPerRaceUnchanged.add(raceColumn.name); + raceColumnNamesForWhichCompetitorOrderingPerRaceUnchanged.add(raceColumn.getName()); competitorOrderingPerRace.remove(raceColumn); } } diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/NamedDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/NamedDTO.java index 6f1c881c144..d577f7275d6 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/NamedDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/NamedDTO.java @@ -4,7 +4,7 @@ import java.io.Serializable; public class NamedDTO implements Serializable { private static final long serialVersionUID = -6620231501480297257L; - public String name; + private String name; public NamedDTO() {} @@ -14,14 +14,14 @@ public class NamedDTO implements Serializable { @Override public String toString() { - return name; + return getName(); } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); return result; } @@ -34,12 +34,20 @@ public class NamedDTO implements Serializable { if (getClass() != obj.getClass()) return false; NamedDTO other = (NamedDTO) obj; - if (name == null) { - if (other.name != null) + if (getName() == null) { + if (other.getName() != null) return false; - } else if (!name.equals(other.name)) + } else if (!getName().equals(other.getName())) return false; return true; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PlacemarkDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PlacemarkDTO.java index 87e7c1eba6c..c9490002491 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PlacemarkDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PlacemarkDTO.java @@ -46,12 +46,12 @@ public class PlacemarkDTO extends NamedDTO { * @return The placemark as string with the format 'countryCode , name' */ public String asString() { - return countryCode + ", " + name; + return countryCode + ", " + getName(); } @Override public String toString() { - return countryCode + ", " + name + ", " + population + ", " + position.toString(); + return countryCode + ", " + getName() + ", " + population + ", " + position.toString(); } @Override diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceColumnDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceColumnDTO.java index 72465938745..18b31f80742 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceColumnDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceColumnDTO.java @@ -52,7 +52,7 @@ public class RaceColumnDTO extends NamedDTO implements Serializable { } public String getRaceColumnName() { - return name; + return getName(); } public Double getExplicitFactor() { @@ -202,7 +202,7 @@ public class RaceColumnDTO extends NamedDTO implements Serializable { int result = 1; result = prime * result + ((fleets == null) ? 0 : fleets.hashCode()); result = prime * result + (medalRace ? 1231 : 1237); - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((racesPerFleet == null) ? 0 : racesPerFleet.hashCode()); return result; } @@ -223,10 +223,10 @@ public class RaceColumnDTO extends NamedDTO implements Serializable { return false; if (medalRace != other.medalRace) return false; - if (name == null) { - if (other.name != null) + if (getName() == null) { + if (other.getName() != null) return false; - } else if (!name.equals(other.name)) + } else if (!getName().equals(other.getName())) return false; if (racesPerFleet == null) { if (other.racesPerFleet != null) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceDTO.java index f27b761075e..717baa5826d 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceDTO.java @@ -40,7 +40,7 @@ public class RaceDTO extends NamedDTO { } public RegattaAndRaceIdentifier getRaceIdentifier() { - return new RegattaNameAndRaceName(regattaName, name); + return new RegattaNameAndRaceName(regattaName, getName()); } public String getRegattaName() { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java index f91af853384..9f457c4373b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import com.sap.sailing.domain.common.Cloner; import com.sap.sailing.domain.common.dto.BoatClassDTO; import com.sap.sailing.domain.common.dto.CompetitorDTO; +import com.sap.sailing.domain.common.dto.CompetitorDTOImpl; import com.sap.sailing.domain.common.dto.IncrementalLeaderboardDTO; import com.sap.sailing.domain.common.dto.LeaderboardDTO; import com.sap.sailing.domain.common.dto.LeaderboardEntryDTO; @@ -55,7 +56,7 @@ public class LeaderboardDTODiffingTest { private CompetitorDTO getPreviousCompetitorByName(String name) { for (CompetitorDTO competitor : previousVersion.competitors) { - if (competitor.name.equals(name)) { + if (competitor.getName().equals(name)) { return competitor; } } @@ -158,7 +159,7 @@ public class LeaderboardDTODiffingTest { @Test public void testCompetitorListChange() { newVersion.competitors = new ArrayList(newVersion.competitors); // clone competitor list so it's not identical to that of previous version - CompetitorDTO somebodyNew = new CompetitorDTO("Someone New", "DE", "GER", "Germany", "GER 1234", "912p09871203987", + CompetitorDTO somebodyNew = new CompetitorDTOImpl("Someone New", "DE", "GER", "Germany", "GER 1234", "912p09871203987", new BoatClassDTO("505", 5.05)); newVersion.competitors.add(13, somebodyNew); // insert a competitor; this should mess up all others' indexes; check if this works CompetitorDTO wolfgang = getPreviousCompetitorByName("HUNGER +JESS"); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java index 9bb3997530d..87d1229f39a 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java @@ -97,7 +97,7 @@ public interface DomainFactory extends SharedDomainFactory { FleetDTO convertToFleetDTO(RaceColumn raceColumn, Fleet fleet); - RaceDTO createRaceDTO(TrackedRegattaRegistry trackedRegattaRegistry, boolean b, RegattaAndRaceIdentifier raceIdentifier, TrackedRace trackedRace); + RaceDTO createRaceDTO(TrackedRegattaRegistry trackedRegattaRegistry, boolean withGeoLocationData, RegattaAndRaceIdentifier raceIdentifier, TrackedRace trackedRace); PlacemarkDTO convertToPlacemarkDTO(Placemark placemark); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java index fba4a42561e..37c858ac297 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java @@ -45,6 +45,7 @@ import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WithID; import com.sap.sailing.domain.common.dto.BoatClassDTO; import com.sap.sailing.domain.common.dto.CompetitorDTO; +import com.sap.sailing.domain.common.dto.CompetitorDTOImpl; import com.sap.sailing.domain.common.dto.FleetDTO; import com.sap.sailing.domain.common.dto.PlacemarkDTO; import com.sap.sailing.domain.common.dto.PlacemarkOrderDTO; @@ -336,7 +337,7 @@ public class DomainFactoryImpl implements DomainFactory { CompetitorDTO competitorDTO = weakCompetitorDTOCache.get(c); if (competitorDTO == null) { CountryCode countryCode = c.getTeam().getNationality().getCountryCode(); - competitorDTO = new CompetitorDTO(c.getName(), countryCode == null ? "" + competitorDTO = new CompetitorDTOImpl(c.getName(), countryCode == null ? "" : countryCode.getTwoLetterISOCode(), countryCode == null ? "" : countryCode.getThreeLetterIOCCode(), countryCode == null ? "" : countryCode.getName(), c.getBoat().getSailID(), c.getId().toString(), diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java index 04f2b348ebc..abd1d3a91a4 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java @@ -1019,7 +1019,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race if (trackedRace != null) { raceIdentifier = new RegattaNameAndRaceName(trackedRace.getTrackedRegatta().getRegatta().getName(), trackedRace.getRace().getName()); - race = baseDomainFactory.createRaceDTO(trackedRegattaRegistry, false, raceIdentifier, trackedRace); + race = baseDomainFactory.createRaceDTO(trackedRegattaRegistry, /* withGeoLocationData */ false, raceIdentifier, trackedRace); if (trackedRace.hasStarted(timePoint) && trackedRace.hasGPSData() && trackedRace.hasWindData()) { TimePoint liveTimePointForTrackedRace = timePoint; final TimePoint endOfRace = trackedRace.getEndOfRace(); diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java index 4e9e9f9e3ae..078cc260910 100644 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java @@ -138,7 +138,7 @@ public class GwtTestCaseColumnToggling extends GWTTestCase { public void onSuccess(Void result) { System.out.println("Added column to leaderboard."); RaceColumnDTO race = new RaceColumnDTO(/* isValidInTotalScore */ null); - race.name = COLUMN1_NAME; + race.setName(COLUMN1_NAME); race.setMedalRace(false); leaderboardPanel.addColumn(leaderboardPanel.createRaceColumn(race)); linkTrackedRace(); diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch index 7fd34ca4adc..5dd54403d1c 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch @@ -4,6 +4,16 @@ + + + + + + + + + + @@ -22,6 +32,7 @@ + @@ -48,7 +59,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetRaceMapDataAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetRaceMapDataAction.java index a79a0d062fa..5816ab58b4e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetRaceMapDataAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetRaceMapDataAction.java @@ -49,11 +49,11 @@ public class GetRaceMapDataAction extends DefaultAsyncAction { }; Map fromByCompetitorIdAsString = new HashMap(); for (Map.Entry fromEntry : from.entrySet()) { - fromByCompetitorIdAsString.put(fromEntry.getKey().idAsString, fromEntry.getValue()); + fromByCompetitorIdAsString.put(fromEntry.getKey().getIdAsString(), fromEntry.getValue()); } Map toByCompetitorIdAsString = new HashMap(); for (Map.Entry toEntry : to.entrySet()) { - toByCompetitorIdAsString.put(toEntry.getKey().idAsString, toEntry.getValue()); + toByCompetitorIdAsString.put(toEntry.getKey().getIdAsString(), toEntry.getValue()); } sailingService.getRaceMapData(raceIdentifier, date, fromByCompetitorIdAsString, toByCompetitorIdAsString, extrapolate, uncompactingCallback); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java index 532563f9ad7..a0baf22d55e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java @@ -41,13 +41,13 @@ public abstract class AbstractEventManagementPanel extends AbstractRegattaPanel Collections.sort(regattasSortedByName, new Comparator() { @Override public int compare(RegattaDTO o1, RegattaDTO o2) { - return o1.name.compareTo(o2.name); + return o1.getName().compareTo(o2.getName()); } }); for (RegattaDTO regatta : regattasSortedByName) { this.availableRegattas.add(regatta); - this.availableRegattasListBox.addItem(regatta.name); - if(selectedRegatta != null && selectedRegatta.name.equals(regatta.name)) { + this.availableRegattasListBox.addItem(regatta.getName()); + if(selectedRegatta != null && selectedRegatta.getName().equals(regatta.getName())) { this.availableRegattasListBox.setSelectedIndex(this.availableRegattasListBox.getItemCount() - 1); } } @@ -68,7 +68,7 @@ public abstract class AbstractEventManagementPanel extends AbstractRegattaPanel if (selIndex > 0) { String itemText = this.availableRegattasListBox.getItemText(selIndex); for (RegattaDTO regatta : this.availableRegattas) { - if (regatta.name.equals(itemText)) { + if (regatta.getName().equals(itemText)) { result = regatta; break; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java index df9dfeb7379..3170ea0a708 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java @@ -220,14 +220,14 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl Column raceNameColumn = new Column(anchorCell) { @Override public SafeHtml getValue(RaceDTO raceDTO) { - return SafeHtmlUtils.fromString(raceDTO.name); + return SafeHtmlUtils.fromString(raceDTO.getName()); } }; raceNameColumn.setSortable(true); columnSortHandler.setComparator(raceNameColumn, new Comparator() { @Override public int compare(RaceDTO r1, RaceDTO r2) { - return r1.name.compareTo(r2.name); + return r1.getName().compareTo(r2.getName()); } }); @@ -371,7 +371,7 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl String textAsUppercase = word.toUpperCase().trim(); if (!raceDTO.getRegattaName().toUpperCase().contains(textAsUppercase) && !raceDTO.boatClass.toUpperCase().contains(textAsUppercase) - && !raceDTO.name.toUpperCase().contains(textAsUppercase)) { + && !raceDTO.getName().toUpperCase().contains(textAsUppercase)) { failed = true; break; } @@ -484,7 +484,7 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl for (RaceDTO race : raceList.getList()) { String regattaName = race.getRegattaName(); if (regattaName.equals(raceIdentifier.getRegattaName()) - && race.name.equals(raceIdentifier.getRaceName())) { + && race.getName().equals(raceIdentifier.getRaceName())) { dontFireNextSelectionChangeEvent = true; selectionModel.setSelected(race, true); break; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDialog.java index 854b8cd8c6b..a471dc0188e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDialog.java @@ -45,13 +45,13 @@ public class EventDialog extends DataEntryDialog { @Override public String getErrorMessage(EventDTO eventToValidate) { String errorMessage = null; - boolean nameNotEmpty = eventToValidate.name != null && eventToValidate.name.length() > 0; - boolean venueNotEmpty = eventToValidate.venue.name != null && eventToValidate.venue.name.length() > 0; + boolean nameNotEmpty = eventToValidate.getName() != null && eventToValidate.getName().length() > 0; + boolean venueNotEmpty = eventToValidate.venue.getName() != null && eventToValidate.venue.getName().length() > 0; boolean courseAreaNotEmpty = eventToValidate.venue.getCourseAreas() != null && eventToValidate.venue.getCourseAreas().size() > 0; if (courseAreaNotEmpty) { for (CourseAreaDTO courseArea : eventToValidate.venue.getCourseAreas()) { - courseAreaNotEmpty = courseArea.name != null && courseArea.name.length() > 0; + courseAreaNotEmpty = courseArea.getName() != null && courseArea.getName().length() > 0; if (!courseAreaNotEmpty) break; } @@ -59,7 +59,7 @@ public class EventDialog extends DataEntryDialog { boolean unique = true; for (EventDTO event : existingEvents) { - if (event.name.equals(eventToValidate.name)) { + if (event.getName().equals(eventToValidate.getName())) { unique = false; break; } @@ -105,7 +105,7 @@ public class EventDialog extends DataEntryDialog { @Override protected EventDTO getResult() { - this.event.name = nameEntryField.getText(); + this.event.setName(nameEntryField.getText()); this.event.publicationUrl = publicationUrlEntryField.getText(); this.event.isPublic = isPublicCheckBox.getValue(); this.event.id = id; @@ -114,7 +114,7 @@ public class EventDialog extends DataEntryDialog { int count = courseAreaNameEntryFields.size(); for(int i = 0; i < count; i++) { CourseAreaDTO courseAreaDTO = new CourseAreaDTO(); - courseAreaDTO.name = courseAreaNameEntryFields.get(i).getValue(); + courseAreaDTO.setName(courseAreaNameEntryFields.get(i).getValue()); courseAreas.add(courseAreaDTO); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventEditDialog.java index 05257490cd9..4850aa04d0e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventEditDialog.java @@ -12,9 +12,9 @@ public class EventEditDialog extends EventDialog { StringMessages stringConstants, DialogCallback callback) { super(new EventParameterValidator(stringConstants, otherExistingEvents), stringConstants, callback); - nameEntryField = createTextBox(event.name); + nameEntryField = createTextBox(event.getName()); nameEntryField.setWidth("200px"); - venueEntryField = createTextBox(event.venue.name); + venueEntryField = createTextBox(event.venue.getName()); venueEntryField.setWidth("200px"); publicationUrlEntryField = createTextBox(event.publicationUrl); publicationUrlEntryField.setWidth("200px"); @@ -24,7 +24,7 @@ public class EventEditDialog extends EventDialog { if (event.venue.getCourseAreas() != null && event.venue.getCourseAreas().size() > 0) { for (CourseAreaDTO courseArea : event.venue.getCourseAreas()) { - addCourseAreaWidget(courseArea.name, false); + addCourseAreaWidget(courseArea.getName(), false); } } 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 d55ad914d4f..cfde83c7a6e 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 @@ -109,7 +109,7 @@ public abstract class FlexibleLeaderboardDialog extends AbstractLeaderboardDialo ListBox eventListBox = createListBox(false); eventListBox.addItem("Please select a sailing event..."); for (EventDTO event: existingEvents) { - eventListBox.addItem(event.name); + eventListBox.addItem(event.getName()); } eventListBox.addChangeHandler(new ChangeHandler() { @Override @@ -132,7 +132,7 @@ public abstract class FlexibleLeaderboardDialog extends AbstractLeaderboardDialo private void fillCourseAreaListBox(EventDTO selectedEvent) { courseAreaListBox.addItem("Please select a course area..."); for (CourseAreaDTO courseArea : selectedEvent.venue.getCourseAreas()) { - courseAreaListBox.addItem(courseArea.name); + courseAreaListBox.addItem(courseArea.getName()); } courseAreaListBox.setEnabled(true); } @@ -143,7 +143,7 @@ public abstract class FlexibleLeaderboardDialog extends AbstractLeaderboardDialo if(selIndex > 0) { // the zero index represents the 'no selection' text String itemText = sailingEventsListBox.getItemText(selIndex); for(EventDTO eventDTO: existingEvents) { - if(eventDTO.name.equals(itemText)) { + if(eventDTO.getName().equals(itemText)) { result = eventDTO; break; } @@ -159,7 +159,7 @@ public abstract class FlexibleLeaderboardDialog extends AbstractLeaderboardDialo if(selIndex > 0 && event != null) { // the zero index represents the 'no selection' text String itemText = courseAreaListBox.getItemText(selIndex); for(CourseAreaDTO courseAreaDTO: event.venue.getCourseAreas()) { - if(courseAreaDTO.name.equals(itemText)) { + if(courseAreaDTO.getName().equals(itemText)) { result = courseAreaDTO; break; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java index c5976537bb7..060a20f329a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java @@ -400,7 +400,7 @@ public class LeaderboardConfigPanel extends FormPanel implements SelectedLeaderb TextColumn> fleetNameColumn = new TextColumn>() { @Override public String getValue(Pair object) { - return object.getB().name; + return object.getB().getName(); } }; TextColumn> explicitFactorColumn = new TextColumn>() { @@ -618,7 +618,7 @@ public class LeaderboardConfigPanel extends FormPanel implements SelectedLeaderb private void unlinkRaceColumnFromTrackedRace(final String raceColumnName, final FleetDTO fleet) { final String selectedLeaderboardName = getSelectedLeaderboardName(); - sailingService.disconnectLeaderboardColumnFromTrackedRace(selectedLeaderboardName, raceColumnName, fleet.name, + sailingService.disconnectLeaderboardColumnFromTrackedRace(selectedLeaderboardName, raceColumnName, fleet.getName(), new AsyncCallback() { @Override public void onFailure(Throwable t) { @@ -715,7 +715,7 @@ public class LeaderboardConfigPanel extends FormPanel implements SelectedLeaderb private void selectRaceColumn(String raceCoumnName) { List> list = raceColumnAndFleetList.getList(); for (Pair pair : list) { - if (pair.getA().name.equals(raceCoumnName)) { + if (pair.getA().getName().equals(raceCoumnName)) { raceColumnTableSelectionModel.setSelected(pair, true); break; } @@ -726,7 +726,7 @@ public class LeaderboardConfigPanel extends FormPanel implements SelectedLeaderb final String selectedLeaderboardName = getSelectedLeaderboardName(); final Pair selectedRaceColumnAndFleetNameInLeaderboard = getSelectedRaceColumnWithFleet(); final String selectedRaceColumnName = selectedRaceColumnAndFleetNameInLeaderboard.getA().getRaceColumnName(); - final String selectedFleetName = selectedRaceColumnAndFleetNameInLeaderboard.getB().name; + final String selectedFleetName = selectedRaceColumnAndFleetNameInLeaderboard.getB().getName(); sailingService.getRegattaAndRaceNameOfTrackedRaceConnectedToLeaderboardColumn(selectedLeaderboardName, selectedRaceColumnName, new AsyncCallback>() { @Override @@ -866,7 +866,7 @@ public class LeaderboardConfigPanel extends FormPanel implements SelectedLeaderb for(RaceColumnDTO newRaceColumn: newRaceColumns) { if(!existingRaceColumns.contains(newRaceColumn)) { - raceColumnsToAdd.add(new Pair(newRaceColumn.name, newRaceColumn.isMedalRace())); + raceColumnsToAdd.add(new Pair(newRaceColumn.getName(), newRaceColumn.isMedalRace())); } } @@ -1088,7 +1088,7 @@ public class LeaderboardConfigPanel extends FormPanel implements SelectedLeaderb private void linkTrackedRaceToSelectedRaceColumn(final RaceColumnDTO selectedRaceInLeaderboard, final FleetDTO fleet, final RegattaAndRaceIdentifier selectedRace) { sailingService.connectTrackedRaceToLeaderboardColumn(getSelectedLeaderboardName(), selectedRaceInLeaderboard - .getRaceColumnName(), fleet.name, selectedRace, + .getRaceColumnName(), fleet.getName(), selectedRace, new AsyncCallback() { @Override public void onFailure(Throwable t) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java index 2ccd05d3a07..2e8e44d50b5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java @@ -413,17 +413,17 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { @Override public SafeHtml getValue(LeaderboardGroupDTO group) { String debugParam = Window.Location.getParameter("gwt.codesvr"); - String link = URLEncoder.encode("/gwt/Spectator.html?leaderboardGroupName=" + group.name + String link = URLEncoder.encode("/gwt/Spectator.html?leaderboardGroupName=" + group.getName() + "&showRaceDetails=true&"+RaceBoardViewConfiguration.PARAM_CAN_REPLAY_DURING_LIVE_RACES+"=true" + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); - return ANCHORTEMPLATE.cell(link, group.name); + return ANCHORTEMPLATE.cell(link, group.getName()); } }; groupNameColumn.setSortable(true); leaderboardGroupsListHandler.setComparator(groupNameColumn, new Comparator() { @Override public int compare(LeaderboardGroupDTO group1, LeaderboardGroupDTO group2) { - return group1.name.compareTo(group2.name); + return group1.getName().compareTo(group2.getName()); } }); @@ -450,7 +450,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { @Override public void update(int index, final LeaderboardGroupDTO group, String command) { if (command.equals(LeaderboardGroupConfigImagesBarCell.ACTION_EDIT)) { - final String oldGroupName = group.name; + final String oldGroupName = group.getName(); ArrayList otherExistingGroups = new ArrayList(availableLeaderboardGroups); otherExistingGroups.remove(group); LeaderboardGroupEditDialog dialog = new LeaderboardGroupEditDialog(group, otherExistingGroups, stringMessages, @@ -464,7 +464,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { }); dialog.show(); } else if (command.equals(LeaderboardGroupConfigImagesBarCell.ACTION_REMOVE)) { - if (Window.confirm("Do you really want to remove the leaderboard group: '" + group.name + "' ?")) { + if (Window.confirm("Do you really want to remove the leaderboard group: '" + group.getName() + "' ?")) { removeLeaderboardGroup(group); } } @@ -609,8 +609,8 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { // Update the availableLeaderboardGroups and the list of displayed groups for (int i = 0; i < availableLeaderboardGroups.size(); i++) { LeaderboardGroupDTO group = availableLeaderboardGroups.get(i); - if (oldGroupName.equals(group.name)) { - groupToUpdate.name = updateDescriptor.getName(); + if (oldGroupName.equals(group.getName())) { + groupToUpdate.setName(updateDescriptor.getName()); groupToUpdate.description = updateDescriptor.getDescription(); groupToUpdate.displayLeaderboardsInReverseOrder = updateDescriptor.isDisplayLeaderboardsInReverseOrder(); groupToUpdate.setOverallLeaderboardDiscardThresholds(updateDescriptor.getOverallLeaderboardDiscardThresholds()); @@ -635,12 +635,12 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { for (StrippedLeaderboardDTO leaderboardDTO : group.leaderboards) { leaderboardNames.add(leaderboardDTO.name); } - sailingService.updateLeaderboardGroup(group.name, group.name, group.description, + sailingService.updateLeaderboardGroup(group.getName(), group.getName(), group.description, leaderboardNames, group.getOverallLeaderboardDiscardThresholds(), group.getOverallLeaderboardScoringSchemeType(), new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to update leaderboard group " + group.name + ": " + errorReporter.reportError("Error trying to update leaderboard group " + group.getName() + ": " + t.getMessage()); } @Override @@ -650,10 +650,10 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { } private void removeLeaderboardGroup(final LeaderboardGroupDTO group) { - sailingService.removeLeaderboardGroup(group.name, new AsyncCallback() { + sailingService.removeLeaderboardGroup(group.getName(), new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to remove leaderboard group " + group.name + ": " + errorReporter.reportError("Error trying to remove leaderboard group " + group.getName() + ": " + t.getMessage()); } @Override @@ -663,7 +663,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { //Check if the removed group was the selected one LeaderboardGroupDTO selectedGroup = groupsSelectionModel.getSelectedObject(); - if (selectedGroup != null && selectedGroup.name.equals(group.name)) { + if (selectedGroup != null && selectedGroup.getName().equals(group.getName())) { groupsSelectionModel.setSelected(null, true); } } @@ -674,7 +674,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { List filter = Arrays.asList(groupsFilterTextBox.getText().split("\\s")); groupsProvider.getList().clear(); for (LeaderboardGroupDTO group : availableLeaderboardGroups) { - if (textContainsStringsToCheck(filter, group.name)) { + if (textContainsStringsToCheck(filter, group.getName())) { groupsProvider.getList().add(group); } } @@ -686,10 +686,10 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { final LeaderboardGroupDTO selectedGroup = groupsSelectionModel.getSelectedObject(); splitPanel.setVisible(selectedGroup != null); if (selectedGroup != null) { - sailingService.getLeaderboardGroupByName(selectedGroup.name, false /*withGeoLocationData*/, new AsyncCallback() { + sailingService.getLeaderboardGroupByName(selectedGroup.getName(), false /*withGeoLocationData*/, new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to obtain the leaderboard group " + selectedGroup.name + ": " + t.getMessage()); + errorReporter.reportError("Error trying to obtain the leaderboard group " + selectedGroup.getName() + ": " + t.getMessage()); } @Override public void onSuccess(LeaderboardGroupDTO result) { @@ -698,7 +698,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel { groupsSelectionModel.setSelected(result, true); //Display details of the group - groupDetailsCaptionPanel.setCaptionText(stringMessages.detailsOfLeaderboardGroup() + " '" + result.name + "'"); + groupDetailsCaptionPanel.setCaptionText(stringMessages.detailsOfLeaderboardGroup() + " '" + result.getName() + "'"); descriptionTextArea.setText(result.description); setDescriptionEditable(false); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java index b1a3e74fd20..57dbaa87315 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java @@ -89,7 +89,7 @@ public class LeaderboardGroupDialog extends DataEntryDialog 0; + raceColumnNameNotEmpty = raceColumn.getName() != null && raceColumn.getName().length() > 0; if (!raceColumnNameNotEmpty) { break; } @@ -55,7 +55,7 @@ public class RaceColumnsInLeaderboardDialog extends DataEntryDialog setToFindDuplicates = new HashSet(); for (RaceColumnDTO raceColumn : raceColumnsWithFleetToValidate) { - if (!setToFindDuplicates.add(raceColumn.name)) { + if (!setToFindDuplicates.add(raceColumn.getName())) { raceColumnUnique = false; break; } @@ -109,7 +109,7 @@ public class RaceColumnsInLeaderboardDialog extends DataEntryDialog nameColumn = new TextColumn() { @Override public String getValue(ControlPointAndOldAndNewMark cpaoanb) { - return cpaoanb.getControlPoint().name; + return cpaoanb.getControlPoint().getName(); } }; controlPointsTable.addColumn(nameColumn, stringMessages.controlPoint()); @@ -240,14 +240,14 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { TextColumn oldMarkColumn = new TextColumn() { @Override public String getValue(ControlPointAndOldAndNewMark cpaoanb) { - return "" + cpaoanb.getOldMark().name; + return "" + cpaoanb.getOldMark().getName(); } }; controlPointsTable.addColumn(oldMarkColumn, stringMessages.mark()); TextColumn newMarkColumn = new TextColumn() { @Override public String getValue(ControlPointAndOldAndNewMark cpaoanb) { - return "" + cpaoanb.getNewMark().name; + return "" + cpaoanb.getNewMark().getName(); } }; controlPointsTable.addColumn(newMarkColumn, stringMessages.newMark()); @@ -333,7 +333,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { MarkDTO newMark = controlPointsSelectionModel.getSelectedSet().iterator().next().getNewMark(); if (newMark != null) { for (MarkDTO markDTO : markDataProvider.getList()) { - if (markDTO.name.equals(newMark.name)) { + if (markDTO.getName().equals(newMark.getName())) { markSelectionModel.setSelected(markDTO, true); } } @@ -387,7 +387,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { for (ControlPointAndOldAndNewMark cpaoanb : controlPointDataProvider.getList()) { if (cpaoanb.getControlPoint() == oldGate) { MarkDTO newMark = cpaoanb.getNewMark(); - if (newRight != null || newMark.name.matches("^.*"+REGEX_FOR_LEFT+".*$")) { + if (newRight != null || newMark.getName().matches("^.*"+REGEX_FOR_LEFT+".*$")) { newLeft = newMark; } else { newRight = newMark; @@ -396,7 +396,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { } assert newLeft != null && newRight != null; // if old gate had null ID, the new gate will have a null ID too, causing the server to generate one - return new GateDTO(oldGate.getIdAsString(), oldGate.name, newLeft, newRight); + return new GateDTO(oldGate.getIdAsString(), oldGate.getName(), newLeft, newRight); } private CellTable createAvailableMarksTable(final StringMessages stringMessages, AdminConsoleTableResources tableRes, @@ -406,7 +406,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { TextColumn markNameColumn = new TextColumn() { @Override public String getValue(MarkDTO markDTO) { - return markDTO.name; + return markDTO.getName(); } }; result.addColumn(markNameColumn, stringMessages.mark()); @@ -460,7 +460,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { } else { w.setNewMark(selectedNewMark); } - if (w.getOldMark().name.equals(w.getNewMark().name)) { + if (w.getOldMark().getName().equals(w.getNewMark().getName())) { checkIfAllMarksOfControlPointAreUnchangedAndIfSoRememberThis(w.getControlPoint()); } else { controlPointsNeedingReplacement.add(w.getControlPoint()); @@ -477,7 +477,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { boolean allMarksUnchanged = true; for (ControlPointAndOldAndNewMark cpaoanb : controlPointDataProvider.getList()) { if (cpaoanb.getControlPoint() == controlPoint) { - if (!cpaoanb.getOldMark().name.equals(cpaoanb.getNewMark().name)) { + if (!cpaoanb.getOldMark().getName().equals(cpaoanb.getNewMark().getName())) { allMarksUnchanged = false; break; } @@ -549,7 +549,7 @@ public class RaceCourseManagementPanel extends AbstractRaceManagementPanel { Collections.sort(markDataProvider.getList(), new Comparator() { @Override public int compare(MarkDTO o1, MarkDTO o2) { - return o1.name.compareTo(o2.name); + return o1.getName().compareTo(o2.getName()); } }); for (ControlPointAndOldAndNewMark w : controlPointsSelectionModel.getSelectedSet()) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RacesListBoxPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RacesListBoxPanel.java index c50491bf79c..ff781a2dc3e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RacesListBoxPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RacesListBoxPanel.java @@ -112,7 +112,7 @@ public class RacesListBoxPanel extends FormPanel implements RegattaDisplayer, Ra } private String toString(RaceDTO race) { - return race.getRegattaName()+" - "+race.name+(race.isTracked ? " ("+stringConstants.tracked()+")" : ""); + return race.getRegattaName()+" - "+race.getName()+(race.isTracked ? " ("+stringConstants.tracked()+")" : ""); } @Override 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 7159584a44e..4e02f54c639 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 @@ -101,7 +101,7 @@ public class RegattaDetailsComposite extends Composite { TextColumn seriesNameColumn = new TextColumn() { @Override public String getValue(SeriesDTO series) { - return series.name; + return series.getName(); } }; @@ -147,7 +147,7 @@ public class RegattaDetailsComposite extends Composite { int fleetsCount = series.getFleets().size(); int i = 1; for(FleetDTO fleet: series.getFleets()) { - result += fleet.name; + result += fleet.getName(); result += "(" + fleet.getOrderNo() + ") "; if (i < fleetsCount) { result += ", "; @@ -237,26 +237,26 @@ public class RegattaDetailsComposite extends Composite { final boolean isStartsWithZeroScoreChanged = series.isStartsWithZeroScore() != seriesDescriptor.isStartsWithZeroScore(); final boolean seriesResultDiscardingThresholdsChanged = !Arrays.equals(series.getDiscardThresholds(), seriesDescriptor.getResultDiscardingThresholds()); - final RegattaIdentifier regattaIdentifier = new RegattaName(regatta.name); + final RegattaIdentifier regattaIdentifier = new RegattaName(regatta.getName()); List existingRaceColumns = series.getRaceColumns(); final List raceColumnsToAdd = new ArrayList(); final List raceColumnsToRemove = new ArrayList(); for (RaceColumnDTO newRaceColumn : newRaceColumns) { if (!existingRaceColumns.contains(newRaceColumn)) { - raceColumnsToAdd.add(newRaceColumn.name); + raceColumnsToAdd.add(newRaceColumn.getName()); } } for (RaceColumnDTO existingRaceColumn : existingRaceColumns) { if (!newRaceColumns.contains(existingRaceColumn)) { - raceColumnsToRemove.add(existingRaceColumn.name); + raceColumnsToRemove.add(existingRaceColumn.getName()); } } - sailingService.addRaceColumnsToSeries(regattaIdentifier, series.name, raceColumnsToAdd, new AsyncCallback>() { + sailingService.addRaceColumnsToSeries(regattaIdentifier, series.getName(), raceColumnsToAdd, new AsyncCallback>() { @Override public void onFailure(Throwable caught) { errorReporter.reportError("Error trying to add race columns " - + raceColumnsToAdd + " to series " + series.name + + raceColumnsToAdd + " to series " + series.getName() + ": " + caught.getMessage()); } @@ -267,11 +267,11 @@ public class RegattaDetailsComposite extends Composite { } }); - sailingService.removeRaceColumnsFromSeries(regattaIdentifier, series.name, raceColumnsToRemove, new AsyncCallback() { + sailingService.removeRaceColumnsFromSeries(regattaIdentifier, series.getName(), raceColumnsToRemove, new AsyncCallback() { @Override public void onFailure(Throwable caught) { errorReporter.reportError("Error trying to remove race columns " - + raceColumnsToAdd + " from series " + series.name + + raceColumnsToAdd + " from series " + series.getName() + ": " + caught.getMessage()); } @@ -281,13 +281,13 @@ public class RegattaDetailsComposite extends Composite { } }); if (isMedalChanged || seriesResultDiscardingThresholdsChanged || isStartsWithZeroScoreChanged) { - sailingService.updateSeries(regattaIdentifier, series.name, seriesDescriptor.isMedal(), + sailingService.updateSeries(regattaIdentifier, series.getName(), seriesDescriptor.isMedal(), seriesDescriptor.getResultDiscardingThresholds(), seriesDescriptor.isStartsWithZeroScore(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { errorReporter.reportError("Error trying to remove race columns " - + raceColumnsToAdd + " from series " + series.name + + raceColumnsToAdd + " from series " + series.getName() + ": " + caught.getMessage()); } @@ -301,8 +301,8 @@ public class RegattaDetailsComposite extends Composite { private void updateRegattaDetails() { if (regatta != null) { - regattaName.setText(regatta.name); - boatClassName.setText(regatta.boatClass != null ? regatta.boatClass.name : ""); + regattaName.setText(regatta.getName()); + boatClassName.setText(regatta.boatClass != null ? regatta.boatClass.getName() : ""); defaultCourseArea.setText(regatta.defaultCourseAreaIdAsString == null ? "" : regatta.defaultCourseAreaName); ScoringSchemeType scoringScheme = regatta.scoringScheme; String scoringSystemText = scoringScheme == null ? "" : ScoringSchemeTypeFormatter.format(scoringScheme, stringMessages); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java index 095d844acbb..f620cb9336a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java @@ -83,7 +83,7 @@ public abstract class RegattaLeaderboardDialog extends AbstractLeaderboardDialog // sort the regatta names List sortedRegattaNames = new ArrayList(); for (RegattaDTO regatta : existingRegattas) { - sortedRegattaNames.add(regatta.name); + sortedRegattaNames.add(regatta.getName()); } Collections.sort(sortedRegattaNames); @@ -102,7 +102,7 @@ public abstract class RegattaLeaderboardDialog extends AbstractLeaderboardDialog @Override protected LeaderboardDescriptor getResult() { LeaderboardDescriptor leaderboard = super.getResult(); - leaderboard.setRegattaName(getSelectedRegatta() != null ? getSelectedRegatta().name : null); + leaderboard.setRegattaName(getSelectedRegatta() != null ? getSelectedRegatta().getName() : null); return leaderboard; } @@ -132,7 +132,7 @@ public abstract class RegattaLeaderboardDialog extends AbstractLeaderboardDialog if (selIndex > 0) { // the zero index represents the 'no selection' text String itemText = regattaListBox.getItemText(selIndex); for (RegattaDTO regattaDTO : existingRegattas) { - if (regattaDTO.name.equals(itemText)) { + if (regattaDTO.getName().equals(itemText)) { result = regattaDTO; break; } 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 f75c86f12af..587a5a2aba1 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 @@ -138,28 +138,28 @@ public class RegattaListComposite extends Composite implements RegattaDisplayer TextColumn regattaNameColumn = new TextColumn() { @Override public String getValue(RegattaDTO regatta) { - return regatta.name; + return regatta.getName(); } }; regattaNameColumn.setSortable(true); columnSortHandler.setComparator(regattaNameColumn, new Comparator() { @Override public int compare(RegattaDTO r1, RegattaDTO r2) { - return r1.name.compareTo(r2.name); + return r1.getName().compareTo(r2.getName()); } }); TextColumn regattaBoatClassColumn = new TextColumn() { @Override public String getValue(RegattaDTO regatta) { - return regatta.boatClass != null ? regatta.boatClass.name : ""; + return regatta.boatClass != null ? regatta.boatClass.getName() : ""; } }; regattaBoatClassColumn.setSortable(true); columnSortHandler.setComparator(regattaBoatClassColumn, new Comparator() { @Override public int compare(RegattaDTO r1, RegattaDTO r2) { - return r1.boatClass.name.compareTo(r2.boatClass.name); + return r1.boatClass.getName().compareTo(r2.boatClass.getName()); } }); @@ -171,7 +171,7 @@ public class RegattaListComposite extends Composite implements RegattaDisplayer if (RegattaConfigImagesBarCell.ACTION_EDIT.equals(value)) { editRegatta(regatta); } else if (RegattaConfigImagesBarCell.ACTION_REMOVE.equals(value)) { - if (Window.confirm(stringMessages.doYouReallyWantToRemoveRegatta(regatta.name))) { + if (Window.confirm(stringMessages.doYouReallyWantToRemoveRegatta(regatta.getName()))) { removeRegatta(regatta); } } @@ -194,9 +194,9 @@ public class RegattaListComposite extends Composite implements RegattaDisplayer boolean failed = false; for (String word : wordsToFilter) { String textAsUppercase = word.toUpperCase().trim(); - if (!regattaDTO.name.toUpperCase().contains(textAsUppercase) - && (regattaDTO.boatClass == null || !regattaDTO.boatClass.name.toUpperCase().contains( - textAsUppercase)) && !regattaDTO.name.toUpperCase().contains(textAsUppercase)) { + if (!regattaDTO.getName().toUpperCase().contains(textAsUppercase) + && (regattaDTO.boatClass == null || !regattaDTO.boatClass.getName().toUpperCase().contains( + textAsUppercase)) && !regattaDTO.getName().toUpperCase().contains(textAsUppercase)) { failed = true; break; } @@ -215,11 +215,11 @@ public class RegattaListComposite extends Composite implements RegattaDisplayer } private void removeRegatta(final RegattaDTO regatta) { - final RegattaIdentifier regattaIdentifier = new RegattaName(regatta.name); + final RegattaIdentifier regattaIdentifier = new RegattaName(regatta.getName()); sailingService.removeRegatta(regattaIdentifier, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - errorReporter.reportError("Error trying to remove regatta " + regatta.name + ": " + caught.getMessage()); + errorReporter.reportError("Error trying to remove regatta " + regatta.getName() + ": " + caught.getMessage()); } @Override @@ -260,12 +260,12 @@ public class RegattaListComposite extends Composite implements RegattaDisplayer } private void commitEditedRegatta(final RegattaDTO editedRegatta) { - final RegattaIdentifier regattaName = new RegattaName(editedRegatta.name); + final RegattaIdentifier regattaName = new RegattaName(editedRegatta.getName()); sailingService.updateRegatta(regattaName, editedRegatta.defaultCourseAreaIdAsString, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - errorReporter.reportError("Error trying to update regatta " + editedRegatta.name + ": " + caught.getMessage()); + errorReporter.reportError("Error trying to update regatta " + editedRegatta.getName() + ": " + caught.getMessage()); } @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 6668ebdb1a3..972a4975bae 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 @@ -123,19 +123,19 @@ public class RegattaStructureManagementPanel extends SimplePanel implements Rega for (SeriesDTO seriesDTO : newRegatta.series) { List> fleets = new ArrayList>(); for(FleetDTO fleetDTO : seriesDTO.getFleets()) { - Triple fleetTriple = new Triple(fleetDTO.name, fleetDTO.getOrderNo(), fleetDTO.getColor()); + Triple fleetTriple = new Triple(fleetDTO.getName(), fleetDTO.getOrderNo(), fleetDTO.getColor()); fleets.add(fleetTriple); } Triple>, Pair, int[]> seriesPair = new Triple>, Pair, int[]>( fleets, new Pair(seriesDTO.isMedal(), seriesDTO.isStartsWithZeroScore()), seriesDTO.getDiscardThresholds()); - seriesStructure.put(seriesDTO.name, seriesPair); + seriesStructure.put(seriesDTO.getName(), seriesPair); } - sailingService.createRegatta(newRegatta.name, newRegatta.boatClass==null?null:newRegatta.boatClass.name, seriesStructure, true, + sailingService.createRegatta(newRegatta.getName(), newRegatta.boatClass==null?null:newRegatta.boatClass.getName(), seriesStructure, true, newRegatta.scoringScheme, newRegatta.defaultCourseAreaIdAsString, new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to create new regatta " + newRegatta.name + ": " + t.getMessage()); + errorReporter.reportError("Error trying to create new regatta " + newRegatta.getName() + ": " + t.getMessage()); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java index e040ca2c8c9..b818570bb23 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java @@ -35,13 +35,13 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd @Override public String getErrorMessage(RegattaDTO regattaToValidate) { String errorMessage = null; - boolean nameNotEmpty = regattaToValidate.name != null && regattaToValidate.name.length() > 0; + boolean nameNotEmpty = regattaToValidate.getName() != null && regattaToValidate.getName().length() > 0; boolean boatClassNotEmpty = regattaToValidate.boatClass != null - && regattaToValidate.boatClass.name.length() > 0; + && regattaToValidate.boatClass.getName().length() > 0; boolean unique = true; for (RegattaDTO regatta : existingRegattas) { - if (regatta.name.equals(regattaToValidate.name)) { + if (regatta.getName().equals(regattaToValidate.getName())) { unique = false; break; } @@ -61,7 +61,7 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd boolean seriesNameNotEmpty = true; for (SeriesDTO series : seriesToValidate) { - seriesNameNotEmpty = series.name != null && series.name.length() > 0; + seriesNameNotEmpty = series.getName() != null && series.getName().length() > 0; if (!seriesNameNotEmpty) { break; } @@ -73,7 +73,7 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd HashSet setToFindDuplicates = new HashSet(); for (SeriesDTO series : seriesToValidate) { - if (!setToFindDuplicates.add(series.name)) { + if (!setToFindDuplicates.add(series.getName())) { seriesUnique = false; break; } @@ -143,7 +143,7 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends RegattaWithSeriesAnd seriesLabel.setWordWrap(false); seriesLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD); seriesGrid.setWidget(i * 2, 0, seriesLabel); - seriesGrid.setHTML(i * 2, 1, seriesDTO.name); + seriesGrid.setHTML(i * 2, 1, seriesDTO.getName()); if (seriesDTO.getFleets() != null && seriesDTO.getFleets().size() > 0) { seriesGrid.setHTML(i * 2 + 1, 1, seriesDTO.getFleets().size() + " fleets: " + seriesDTO.getFleets().toString()); 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 6324a2360a5..bfe5b2aff4f 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 @@ -50,12 +50,12 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog(); @@ -114,7 +114,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog 0) { // the zero index represents the 'no selection' text String itemText = sailingEventsListBox.getItemText(selIndex); for (EventDTO eventDTO : existingEvents) { - if (eventDTO.name.equals(itemText)) { + if (eventDTO.getName().equals(itemText)) { result = eventDTO; break; } @@ -197,7 +197,7 @@ public abstract class RegattaWithSeriesAndFleetsDialog extends DataEntryDialog 0 && event != null) { // the zero index represents the 'no selection' text String itemText = courseAreaListBox.getItemText(selIndex); for (CourseAreaDTO courseAreaDTO : event.venue.getCourseAreas()) { - if (courseAreaDTO.name.equals(itemText)) { + if (courseAreaDTO.getName().equals(itemText)) { result = courseAreaDTO; break; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SailingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SailingEventManagementPanel.java index 6671219969b..a55edabde62 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SailingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SailingEventManagementPanel.java @@ -96,14 +96,14 @@ public class SailingEventManagementPanel extends SimplePanel { String debugParam = Window.Location.getParameter("gwt.codesvr"); String link = URLEncoder.encode("/gwt/RegattaOverview.html?event=" + event.id + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); - return ANCHORTEMPLATE.cell(link, event.name); + return ANCHORTEMPLATE.cell(link, event.getName()); } }; TextColumn venueNameColumn = new TextColumn() { @Override public String getValue(EventDTO event) { - return event.venue != null ? event.venue.name : ""; + return event.venue != null ? event.venue.getName() : ""; } }; @@ -129,7 +129,7 @@ public class SailingEventManagementPanel extends SimplePanel { int courseAreasCount = event.venue.getCourseAreas().size(); int i = 1; for (CourseAreaDTO courseArea : event.venue.getCourseAreas()) { - builder.appendEscaped(courseArea.name); + builder.appendEscaped(courseArea.getName()); if (i < courseAreasCount) { builder.appendHtmlConstant("
"); } @@ -145,7 +145,7 @@ public class SailingEventManagementPanel extends SimplePanel { @Override public void update(int index, EventDTO event, String value) { if (EventConfigImagesBarCell.ACTION_REMOVE.equals(value)) { - if (Window.confirm(stringMessages.doYouReallyWantToRemoveRegatta(event.name))) { + if (Window.confirm(stringMessages.doYouReallyWantToRemoveRegatta(event.getName()))) { removeEvent(event); } } else if (EventConfigImagesBarCell.ACTION_EDIT.equals(value)) { @@ -181,7 +181,7 @@ public class SailingEventManagementPanel extends SimplePanel { sailingService.removeEvent(event.id, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - errorReporter.reportError("Error trying to remove event " + event.name + ": " + caught.getMessage()); + errorReporter.reportError("Error trying to remove event " + event.getName() + ": " + caught.getMessage()); } @Override @@ -231,25 +231,25 @@ public class SailingEventManagementPanel extends SimplePanel { // } List courseAreasToAdd = getCourseAreasToAdd(oldEvent, updatedEvent); - sailingService.updateEvent(oldEvent.name, oldEvent.id, updatedEvent.venue, updatedEvent.publicationUrl, + sailingService.updateEvent(oldEvent.getName(), oldEvent.id, updatedEvent.venue, updatedEvent.publicationUrl, updatedEvent.isPublic, regattaNames, new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to update sailing event" + oldEvent.name + ": " + t.getMessage()); + errorReporter.reportError("Error trying to update sailing event" + oldEvent.getName() + ": " + t.getMessage()); } @Override public void onSuccess(Void result) { fillEvents(); - if(!oldEvent.name.equals(updatedEvent.name)) { - sailingService.renameEvent(oldEvent.id, updatedEvent.name, new AsyncCallback() { + if(!oldEvent.getName().equals(updatedEvent.getName())) { + sailingService.renameEvent(oldEvent.id, updatedEvent.getName(), new AsyncCallback() { @Override public void onSuccess(Void result) { fillEvents(); } @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to rename sailing event " + oldEvent.name + ": " + t.getMessage()); + errorReporter.reportError("Error trying to rename sailing event " + oldEvent.getName() + ": " + t.getMessage()); } }); } @@ -258,11 +258,11 @@ public class SailingEventManagementPanel extends SimplePanel { if (courseAreasToAdd.size() > 0) { for (CourseAreaDTO courseArea : courseAreasToAdd) { - sailingService.createCourseArea(oldEvent.id, courseArea.name, new AsyncCallback() { + sailingService.createCourseArea(oldEvent.id, courseArea.getName(), new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to add course area to sailing event " + oldEvent.name + ": " + t.getMessage()); + errorReporter.reportError("Error trying to add course area to sailing event " + oldEvent.getName() + ": " + t.getMessage()); } @Override @@ -281,12 +281,12 @@ public class SailingEventManagementPanel extends SimplePanel { List newCourseAreaNames = new ArrayList(); for(CourseAreaDTO courseArea : updatedEvent.venue.getCourseAreas()) { - newCourseAreaNames.add(courseArea.name); + newCourseAreaNames.add(courseArea.getName()); } List oldCourseAreaNames = new ArrayList(); for(CourseAreaDTO courseArea : oldEvent.venue.getCourseAreas()) { - oldCourseAreaNames.add(courseArea.name); + oldCourseAreaNames.add(courseArea.getName()); } for (String newCourseAreaName : newCourseAreaNames) { @@ -295,7 +295,7 @@ public class SailingEventManagementPanel extends SimplePanel { } for(CourseAreaDTO courseArea : updatedEvent.venue.getCourseAreas()) { - if (courseAreaNamesToAdd.contains(courseArea.name)) { + if (courseAreaNamesToAdd.contains(courseArea.getName())) { courseAreasToAdd.add(courseArea); } } @@ -306,12 +306,12 @@ public class SailingEventManagementPanel extends SimplePanel { private void createNewEvent(final EventDTO newEvent) { List courseAreaNames = new ArrayList(); for (CourseAreaDTO courseAreaDTO : newEvent.venue.getCourseAreas()) { - courseAreaNames.add(courseAreaDTO.name); + courseAreaNames.add(courseAreaDTO.getName()); } - sailingService.createEvent(newEvent.name, newEvent.venue.name, newEvent.publicationUrl, newEvent.isPublic, courseAreaNames, new AsyncCallback() { + sailingService.createEvent(newEvent.getName(), newEvent.venue.getName(), newEvent.publicationUrl, newEvent.isPublic, courseAreaNames, new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to create new event" + newEvent.name + ": " + t.getMessage()); + errorReporter.reportError("Error trying to create new event" + newEvent.getName() + ": " + t.getMessage()); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java index a4ef3a0138c..c74bb1559b8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java @@ -56,16 +56,16 @@ public class SeriesEditDialog extends DataEntryDialog { List raceColumnsToValidate = valueToValidate.getRaces(); String errorMessage = null; for (SeriesDTO seriesDTO: regatta.series) { - if (!seriesDTO.name.equals(seriesToValidate.name)) { + if (!seriesDTO.getName().equals(seriesToValidate.getName())) { for (RaceColumnDTO raceColumn : seriesDTO.getRaceColumns()) { - raceColumnNamesOfOtherSeries.add(raceColumn.name); + raceColumnNamesOfOtherSeries.add(raceColumn.getName()); } } } boolean raceColumnNameNotEmpty = true; RaceColumnDTO wrongRaceColumn = null; for (RaceColumnDTO raceColumn : raceColumnsToValidate) { - raceColumnNameNotEmpty = raceColumn.name != null && raceColumn.name.length() > 0; + raceColumnNameNotEmpty = raceColumn.getName() != null && raceColumn.getName().length() > 0; if (!raceColumnNameNotEmpty) { wrongRaceColumn = raceColumn; break; @@ -75,24 +75,24 @@ public class SeriesEditDialog extends DataEntryDialog { boolean raceColumnUniqueInRegatta = true; HashSet setToFindDuplicates = new HashSet(); for (RaceColumnDTO raceColumn : raceColumnsToValidate) { - if (!setToFindDuplicates.add(raceColumn.name)) { + if (!setToFindDuplicates.add(raceColumn.getName())) { raceColumnUniqueInSeries = false; wrongRaceColumn = raceColumn; break; - } else if(raceColumnNamesOfOtherSeries.contains(raceColumn.name)) { + } else if(raceColumnNamesOfOtherSeries.contains(raceColumn.getName())) { raceColumnUniqueInRegatta = false; wrongRaceColumn = raceColumn; break; } } if (!raceColumnNameNotEmpty) { - errorMessage = stringMessages.race() + " " + wrongRaceColumn.name + ": " + errorMessage = stringMessages.race() + " " + wrongRaceColumn.getName() + ": " + stringMessages.pleaseEnterAName(); } else if (!raceColumnUniqueInSeries) { - errorMessage = stringMessages.race() + " " + wrongRaceColumn.name + ": " + errorMessage = stringMessages.race() + " " + wrongRaceColumn.getName() + ": " + stringMessages.raceWithThisNameAlreadyExists(); } else if (!raceColumnUniqueInRegatta) { - errorMessage = stringMessages.race() + " " + wrongRaceColumn.name + ": " + errorMessage = stringMessages.race() + " " + wrongRaceColumn.getName() + ": " + stringMessages.raceWithThisNameAlreadyExistsInRegatta(); } else { errorMessage = DiscardThresholdBoxes.getErrorMessage(valueToValidate.getResultDiscardingThresholds(), stringMessages); @@ -155,7 +155,7 @@ public class SeriesEditDialog extends DataEntryDialog { RaceColumnDTO raceColumnDTO = findRaceColumnInSeriesByName(selectedSeries, raceColumnName); if (raceColumnDTO == null) { raceColumnDTO = new RaceColumnDTO(/* isValidInTotalScore not relevant here; not in scope of a leaderboard */ null); - raceColumnDTO.name = raceColumnName; + raceColumnDTO.setName(raceColumnName); } races.add(raceColumnDTO); } @@ -168,7 +168,7 @@ public class SeriesEditDialog extends DataEntryDialog { RaceColumnDTO result = null; if(series != null) { for(RaceColumnDTO raceColumn: series.getRaceColumns()) { - if(raceColumn.name.equals(raceColumnName)) { + if(raceColumn.getName().equals(raceColumnName)) { result = raceColumn; break; } @@ -186,7 +186,7 @@ public class SeriesEditDialog extends DataEntryDialog { } HorizontalPanel seriesPanel = new HorizontalPanel(); seriesPanel.setSpacing(3); - String seriesName = getSelectedSeries().name; + String seriesName = getSelectedSeries().getName(); seriesPanel.add(new Label(stringMessages.series() + ": " + seriesName)); additionalWidgetPanel.add(seriesPanel); isMedalCheckbox = createCheckbox(stringMessages.medalSeries()); @@ -264,7 +264,7 @@ public class SeriesEditDialog extends DataEntryDialog { raceNameDeleteButtons.clear(); if(selectedSeries != null && !selectedSeries.getRaceColumns().isEmpty()) { for(RaceColumnDTO raceColumn: selectedSeries.getRaceColumns()) { - createRaceNameWidget(raceColumn.name, false); + createRaceNameWidget(raceColumn.getName(), false); createRaceNameDeleteButtonWidget(); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java index f737349bb27..74939106636 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java @@ -55,10 +55,10 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { @Override public String getErrorMessage(SeriesDTO seriesToValidate) { String errorMessage = null; - boolean nameNotEmpty = seriesToValidate.name != null && seriesToValidate.name.length() > 0; + boolean nameNotEmpty = seriesToValidate.getName() != null && seriesToValidate.getName().length() > 0; boolean unique = true; for (SeriesDTO series : existingSeries) { - if (series.name.equals(seriesToValidate.name)) { + if (series.getName().equals(seriesToValidate.getName())) { unique = false; break; } @@ -73,7 +73,7 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { int index = 0; boolean fleetNameNotEmpty = true; for (FleetDTO fleet : fleetsToValidate) { - fleetNameNotEmpty = fleet.name != null && fleet.name.length() > 0; + fleetNameNotEmpty = fleet.getName() != null && fleet.getName().length() > 0; if (!fleetNameNotEmpty) { break; } @@ -83,7 +83,7 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { boolean fleetUnique = true; HashSet setToFindDuplicates = new HashSet(); for (FleetDTO fleet: fleetsToValidate) { - if(!setToFindDuplicates.add(fleet.name)) { + if(!setToFindDuplicates.add(fleet.getName())) { fleetUnique = false; break; } @@ -178,14 +178,14 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { @Override protected SeriesDTO getResult() { - series.name = nameEntryField.getText(); + series.setName(nameEntryField.getText()); series.setMedal(isMedalSeriesCheckbox.getValue()); series.setStartsWithZeroScore(startsWithZeroScoreCheckbox.getValue()); List fleets = new ArrayList(); int fleetsCount = fleetNameEntryFields.size(); for(int i = 0; i < fleetsCount; i++) { FleetDTO fleetDTO = new FleetDTO(); - fleetDTO.name = fleetNameEntryFields.get(i).getValue(); + fleetDTO.setName(fleetNameEntryFields.get(i).getValue()); fleetDTO.setColor(getSelectedColor(fleetColorEntryFields.get(i))); int orderNo = -1; if(fleetOrderNoEntryFields.get(i).getValue() != null) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java index 12108cd4246..58bb552ca3b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java @@ -378,7 +378,7 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane RegattaDTO selectedRegatta = getSelectedRegatta(); RegattaIdentifier regattaIdentifier = null; if (selectedRegatta != null) { - regattaIdentifier = new RegattaName(selectedRegatta.name); + regattaIdentifier = new RegattaName(selectedRegatta.getName()); } sailingService.trackWithSwissTiming( /* regattaToAddTo */ regattaIdentifier, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java index 01ad676ad8c..bfc9c8ab21f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java @@ -341,12 +341,12 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane // in case no regatta has been selected we check if there would be a matching regatta for (RegattaDTO regatta : getAvailableRegattas()) { if ((boatClassName == null && regatta.boatClass == null) || - (regatta.boatClass != null && boatClassName.equalsIgnoreCase(regatta.boatClass.name))) { + (regatta.boatClass != null && boatClassName.equalsIgnoreCase(regatta.boatClass.getName()))) { return false; } } } else { - if (!boatClassName.equalsIgnoreCase(selectedRegatta.boatClass.name)) { + if (!boatClassName.equalsIgnoreCase(selectedRegatta.boatClass.getName())) { return false; } } @@ -358,7 +358,7 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane RegattaDTO selectedRegatta = getSelectedRegatta(); RegattaIdentifier regattaIdentifier = null; if (selectedRegatta != null) { - regattaIdentifier = new RegattaName(selectedRegatta.name); + regattaIdentifier = new RegattaName(selectedRegatta.getName()); } // Check if the assigned regatta makes sense @@ -375,7 +375,7 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane String warningText = "WARNING\n"; if (selectedRegatta != null) { warningText += stringMessages.boatClassDoesNotMatchSelectedRegatta( - selectedRegatta.boatClass==null?"":selectedRegatta.boatClass.name, selectedRegatta.name); + selectedRegatta.boatClass==null?"":selectedRegatta.boatClass.getName(), selectedRegatta.getName()); } else { warningText += stringMessages.regattaExistForSelectedBoatClass(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java index 6d68ce8a5b5..434b9d48bf0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java @@ -658,12 +658,12 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel { // in case no regatta has been selected we check if there would be a matching regatta for (RegattaDTO regatta : getAvailableRegattas()) { if ((tracTracBoatClassName == null && regatta.boatClass == null) || - (regatta.boatClass != null && tracTracBoatClassName.equalsIgnoreCase(regatta.boatClass.name))) { + (regatta.boatClass != null && tracTracBoatClassName.equalsIgnoreCase(regatta.boatClass.getName()))) { return false; } } } else { - if (!tracTracBoatClassName.equalsIgnoreCase(selectedRegatta.boatClass.name)) { + if (!tracTracBoatClassName.equalsIgnoreCase(selectedRegatta.boatClass.getName())) { return false; } } @@ -680,7 +680,7 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel { RegattaDTO selectedRegatta = getSelectedRegatta(); RegattaIdentifier regattaIdentifier = null; if (selectedRegatta != null) { - regattaIdentifier = new RegattaName(selectedRegatta.name); + regattaIdentifier = new RegattaName(selectedRegatta.getName()); } // Check if the assigned regatta makes sense List allRaces = this.raceList.getList(); @@ -698,8 +698,8 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel { builder.append("WARNING\n"); if (selectedRegatta != null) { builder.append(this.stringMessages.boatClassDoesNotMatchSelectedRegatta( - selectedRegatta.boatClass==null?"":selectedRegatta.boatClass.name, - selectedRegatta.name)); + selectedRegatta.boatClass==null?"":selectedRegatta.boatClass.getName(), + selectedRegatta.getName())); } else { builder.append(this.stringMessages.regattaExistForSelectedBoatClass()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java index fe11a39b7fa..8b204c594bd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java @@ -227,7 +227,7 @@ public class RaceTimePanel extends TimePanel implements R if (markPassingTimesDTO.firstPassingDate != null) { long markerTime = markPassingTimesDTO.firstPassingDate.getTime(); if(!timeSlider.isZoomed() || (timeSlider.isZoomed() && markerTime > timeSlider.getMinValue() && markerTime < timeSlider.getMaxValue())) { - timeSlider.addMarker(markPassingTimesDTO.name, new Double(markerTime)); + timeSlider.addMarker(markPassingTimesDTO.getName(), new Double(markerTime)); } } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractChartPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractChartPanel.java index 41ecdb00578..790125ab916 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractChartPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractChartPanel.java @@ -371,7 +371,7 @@ public abstract class AbstractChartPanel ext private Series getOrCreateCompetitorDataSeries(final CompetitorDTO competitor) { Series result = dataSeriesByCompetitor.get(competitor); if (result == null) { - result = chart.createSeries().setType(Series.Type.LINE).setName(competitor.name); + result = chart.createSeries().setType(Series.Type.LINE).setName(competitor.getName()); result.setPlotOptions(new LinePlotOptions() .setLineWidth(LINE_WIDTH) .setMarker(new Marker().setEnabled(false).setHoverState(new Marker().setEnabled(true).setRadius(4))) @@ -392,7 +392,7 @@ public abstract class AbstractChartPanel ext Series result = markPassingSeriesByCompetitor.get(competitor); if (result == null) { result = chart.createSeries().setType(Series.Type.SCATTER) - .setName(stringMessages.markPassing() + " " + competitor.name); + .setName(stringMessages.markPassing() + " " + competitor.getName()); result.setPlotOptions(new ScatterPlotOptions().setColor(competitorSelectionProvider.getColor(competitor)) .setSelected(true)); markPassingSeriesByCompetitor.put(competitor, result); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/LeaderboardRankChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/LeaderboardRankChart.java index 76e7b870e33..b55848f7021 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/LeaderboardRankChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/LeaderboardRankChart.java @@ -167,7 +167,7 @@ public class LeaderboardRankChart extends SimplePanel implements RequiresResize, private Series getOrCreateSeries(CompetitorDTO competitor) { Series result = competitorSeries.get(competitor); if (result == null) { - result = chart.createSeries().setType(Series.Type.LINE).setName(competitor.name); + result = chart.createSeries().setType(Series.Type.LINE).setName(competitor.getName()); result.setPlotOptions(new LinePlotOptions() .setLineWidth(LINE_WIDTH) .setMarker(new Marker().setEnabled(true).setRadius(4).setSymbol(Symbol.DIAMOND)) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorNationalityFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorNationalityFilter.java index d8602fa85e7..318343d3760 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorNationalityFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorNationalityFilter.java @@ -22,21 +22,21 @@ public class CompetitorNationalityFilter extends AbstractTextFilter toRemoveCourseMarks = new HashMap(courseMarkOverlays); if (courseDTO.marks != null) { for (MarkDTO markDTO : courseDTO.marks) { - CourseMarkOverlay courseMarkOverlay = courseMarkOverlays.get(markDTO.name); + CourseMarkOverlay courseMarkOverlay = courseMarkOverlays.get(markDTO.getName()); if (courseMarkOverlay == null) { courseMarkOverlay = createCourseMarkOverlay(markDTO); courseMarkOverlay.setShowBuoyZone(settings.getHelpLinesSettings().isVisible(HelpLineTypes.BUOYZONE)); courseMarkOverlay.setBuoyZoneRadiusInMeter(settings.getBuoyZoneRadiusInMeters()); - courseMarkOverlays.put(markDTO.name, courseMarkOverlay); - markDTOs.put(markDTO.name, markDTO); + courseMarkOverlays.put(markDTO.getName(), courseMarkOverlay); + markDTOs.put(markDTO.getName(), markDTO); map.addOverlay(courseMarkOverlay); courseMarkOverlay.setPaneZIndex(RaceMapOverlaysZIndexes.COURSEMARK_ZINDEX); } else { @@ -568,7 +568,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe courseMarkOverlay.setShowBuoyZone(settings.getHelpLinesSettings().isVisible(HelpLineTypes.BUOYZONE)); courseMarkOverlay.setBuoyZoneRadiusInMeter(settings.getBuoyZoneRadiusInMeters()); courseMarkOverlay.redraw(true); - toRemoveCourseMarks.remove(markDTO.name); + toRemoveCourseMarks.remove(markDTO.getName()); } } } @@ -742,7 +742,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe LegInfoDTO legInfoDTO = lastRaceTimesInfo.getLegInfos().get(visibleLeaderInfo.getA() - 1); double advantageLineLengthInKm = 1.0; // TODO this should probably rather scale with the visible // area of the map; bug 616 - double distanceFromBoatPositionInKm = visibleLeaderInfo.getB().boatClass.getHullLengthInMeters() / 1000.; // one hull length + double distanceFromBoatPositionInKm = visibleLeaderInfo.getB().getBoatClass().getHullLengthInMeters() / 1000.; // one hull length // implement and use Position.translateRhumb() double bearingOfBoatInDeg = lastBoatFix.speedWithBearing.bearingInDegrees; LatLng boatPosition = LatLng.newInstance(lastBoatFix.position.latDeg, lastBoatFix.position.lngDeg); @@ -1065,7 +1065,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe private Widget getInfoWindowContent(MarkDTO markDTO) { VerticalPanel vPanel = new VerticalPanel(); - vPanel.add(createInfoWindowLabelAndValue(stringMessages.mark(), markDTO.name)); + vPanel.add(createInfoWindowLabelAndValue(stringMessages.mark(), markDTO.getName())); vPanel.add(createInfoWindowLabelAndValue(stringMessages.position(), formatPosition(markDTO.position.latDeg, markDTO.position.lngDeg))); return vPanel; } @@ -1084,8 +1084,8 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe private Widget getInfoWindowContent(CompetitorDTO competitorDTO, GPSFixDTO lastFix) { final VerticalPanel vPanel = new VerticalPanel(); vPanel.setWidth("350px"); - vPanel.add(createInfoWindowLabelAndValue(stringMessages.competitor(), competitorDTO.name)); - vPanel.add(createInfoWindowLabelAndValue(stringMessages.sailNumber(), competitorDTO.sailID)); + vPanel.add(createInfoWindowLabelAndValue(stringMessages.competitor(), competitorDTO.getName())); + vPanel.add(createInfoWindowLabelAndValue(stringMessages.sailNumber(), competitorDTO.getSailID())); Integer rank = null; if (quickRanks != null) { for (QuickRankDTO quickRank : quickRanks) { @@ -1219,7 +1219,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe result.addPolylineMouseOverHandler(new PolylineMouseOverHandler() { @Override public void onMouseOver(PolylineMouseOverEvent event) { - map.setTitle(competitorDTO.sailID + ", " + competitorDTO.name); + map.setTitle(competitorDTO.getSailID() + ", " + competitorDTO.getName()); } }); result.addPolylineMouseOutHandler(new PolylineMouseOutHandler() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractRaceColumnSelection.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractRaceColumnSelection.java index 7ed89c5d6dd..9a066ca21c7 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractRaceColumnSelection.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractRaceColumnSelection.java @@ -17,7 +17,7 @@ public abstract class AbstractRaceColumnSelection implements RaceColumnSelection public Iterable getSelectedRaceColumnNames() { List names = new ArrayList(); for (RaceColumnDTO column : getSelectedRaceColumns()) { - names.add(column.name); + names.add(column.getName()); } return names; } @@ -26,11 +26,11 @@ public abstract class AbstractRaceColumnSelection implements RaceColumnSelection public Iterable getSelectedRaceColumnsOrderedAsInLeaderboard(LeaderboardDTO leaderboard) { List namesOfSelectedRaceColumns = new ArrayList(); for (RaceColumnDTO selectedColumn : getSelectedRaceColumns()) { - namesOfSelectedRaceColumns.add(selectedColumn.name); + namesOfSelectedRaceColumns.add(selectedColumn.getName()); } List result = new ArrayList(); for (RaceColumnDTO column : leaderboard.getRaceList()) { - if (Util.contains(namesOfSelectedRaceColumns, column.name)) { + if (Util.contains(namesOfSelectedRaceColumns, column.getName())) { result.add(column); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompetitorColumnBase.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompetitorColumnBase.java index 8c40db22330..8736b13f1b0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompetitorColumnBase.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompetitorColumnBase.java @@ -51,9 +51,9 @@ public class CompetitorColumnBase { return new InvertibleComparatorAdapter() { @Override public int compare(T o1, T o2) { - return competitorFetcher.getCompetitor(o1).sailID == null ? competitorFetcher.getCompetitor(o2).sailID == null ? 0 : -1 - : competitorFetcher.getCompetitor(o2).sailID == null ? 1 : Collator.getInstance().compare( - competitorFetcher.getCompetitor(o1).sailID, competitorFetcher.getCompetitor(o2).sailID); + return competitorFetcher.getCompetitor(o1).getSailID() == null ? competitorFetcher.getCompetitor(o2).getSailID() == null ? 0 : -1 + : competitorFetcher.getCompetitor(o2).getSailID() == null ? 1 : Collator.getInstance().compare( + competitorFetcher.getCompetitor(o1).getSailID(), competitorFetcher.getCompetitor(o2).getSailID()); } }; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExplicitRaceColumnSelection.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExplicitRaceColumnSelection.java index aa9e293be91..8b22a501a63 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExplicitRaceColumnSelection.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExplicitRaceColumnSelection.java @@ -75,7 +75,7 @@ public class ExplicitRaceColumnSelection extends AbstractRaceColumnSelection imp @Override public void autoUpdateRaceColumnSelectionForUpdatedLeaderboard(LeaderboardDTO oldLeaderboard, LeaderboardDTO newLeaderboard) { for (RaceColumnDTO selectedRaceColumn : getRaceColumnsToAddImplicitly(newLeaderboard, oldLeaderboard)) { - requestRaceColumnSelection(selectedRaceColumn.name, selectedRaceColumn); + requestRaceColumnSelection(selectedRaceColumn.getName(), selectedRaceColumn); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LastNRacesColumnSelection.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LastNRacesColumnSelection.java index 7743e01dc87..588367a1980 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LastNRacesColumnSelection.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LastNRacesColumnSelection.java @@ -111,7 +111,7 @@ public class LastNRacesColumnSelection extends AbstractRaceColumnSelection imple private boolean hasScoreCorrections(LeaderboardDTO leaderboard, RaceColumnDTO column) { for (Map.Entry e : leaderboard.rows.entrySet()) { - LeaderboardEntryDTO entry = e.getValue().fieldsByRaceColumnName.get(column.name); + LeaderboardEntryDTO entry = e.getValue().fieldsByRaceColumnName.get(column.getName()); if (entry != null && entry.hasScoreCorrection()) { return true; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java index 1bf121a96fd..e839502c08e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java @@ -399,7 +399,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta for (String nameOfRaceColumnToShow : newSettings.getNamesOfRaceColumnsToShow()) { RaceColumnDTO raceColumnToShow = getRaceByColumnName(nameOfRaceColumnToShow); if (raceColumnToShow != null) { - raceColumnSelection.requestRaceColumnSelection(raceColumnToShow.name, raceColumnToShow); + raceColumnSelection.requestRaceColumnSelection(raceColumnToShow.getName(), raceColumnToShow); } } } else { @@ -413,7 +413,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta for (String nameOfRaceToShow : newSettings.getNamesOfRacesToShow()) { RaceColumnDTO raceColumnToShow = getRaceByName(nameOfRaceToShow); if (raceColumnToShow != null) { - raceColumnSelection.requestRaceColumnSelection(raceColumnToShow.name, raceColumnToShow); + raceColumnSelection.requestRaceColumnSelection(raceColumnToShow.getName(), raceColumnToShow); } } } @@ -613,9 +613,9 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta return new InvertibleComparatorAdapter() { @Override public int compare(T o1, T o2) { - return competitorFetcher.getCompetitor(o1).sailID == null ? competitorFetcher.getCompetitor(o2).sailID == null ? 0 : -1 - : competitorFetcher.getCompetitor(o2).sailID == null ? 1 : Collator.getInstance().compare( - competitorFetcher.getCompetitor(o1).sailID, competitorFetcher.getCompetitor(o2).sailID); + return competitorFetcher.getCompetitor(o1).getSailID() == null ? competitorFetcher.getCompetitor(o2).getSailID() == null ? 0 : -1 + : competitorFetcher.getCompetitor(o2).getSailID() == null ? 1 : Collator.getInstance().compare( + competitorFetcher.getCompetitor(o1).getSailID(), competitorFetcher.getCompetitor(o2).getSailID()); } }; } @@ -628,7 +628,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta @Override public void render(Context context, T object, SafeHtmlBuilder sb) { ImageResourceRenderer renderer = new ImageResourceRenderer(); - final String twoLetterIsoCountryCode = competitorFetcher.getCompetitor(object).twoLetterIsoCountryCode; + final String twoLetterIsoCountryCode = competitorFetcher.getCompetitor(object).getTwoLetterIsoCountryCode(); final ImageResource flagImageResource; if (twoLetterIsoCountryCode==null || twoLetterIsoCountryCode.isEmpty()) { flagImageResource = FlagImageResolver.getEmptyFlagImageResource(); @@ -639,12 +639,12 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta sb.append(renderer.render(flagImageResource)); sb.appendHtmlConstant(" "); } - sb.appendEscaped(competitorFetcher.getCompetitor(object).sailID); + sb.appendEscaped(competitorFetcher.getCompetitor(object).getSailID()); } @Override public String getValue(T object) { - return competitorFetcher.getCompetitor(object).sailID; + return competitorFetcher.getCompetitor(object).getSailID(); } } @@ -1916,7 +1916,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta */ private void updateRaceColumnDTOsToRaceColumns(LeaderboardDTO leaderboard) { for (RaceColumnDTO newRace : leaderboard.getRaceList()) { - RaceColumn raceColumn = getRaceColumnByRaceColumnName(newRace.name); + RaceColumn raceColumn = getRaceColumnByRaceColumnName(newRace.getName()); if (raceColumn != null) { raceColumn.setRace(newRace); } @@ -2245,7 +2245,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta for (int selectedRaceCount = 0; selectedRaceCount < Util.size(correctedOrderSelectedRaces); selectedRaceCount++) { RaceColumnDTO selectedRaceColumn = Util.get(correctedOrderSelectedRaces, selectedRaceCount); final RaceColumn raceColumn = selectedRaceColumn == null ? null - : getRaceColumnByRaceColumnName(selectedRaceColumn.name); + : getRaceColumnByRaceColumnName(selectedRaceColumn.getName()); if (raceColumn != null) { // remove all raceColumns, starting at a specific selectedRaceCount, up to but excluding the selected // raceName with the result that selectedRace is at position selectedRaceCount afterwards diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardUrlConfigurationDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardUrlConfigurationDialog.java index bd69c206ceb..ac28b0ffba2 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardUrlConfigurationDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardUrlConfigurationDialog.java @@ -89,7 +89,7 @@ public class LeaderboardUrlConfigurationDialog extends SettingsDialog raceList = leaderboard.getRaceList(); List namesOfRaceColumnsToShow = new ArrayList(); for (RaceColumnDTO raceColumn : raceList) { - namesOfRaceColumnsToShow.add(raceColumn.name); + namesOfRaceColumnsToShow.add(raceColumn.getName()); } LeaderboardSettings settings = LeaderboardSettingsFactory.getInstance().createNewDefaultSettings( namesOfRaceColumnsToShow, /* namesOfRacesToShow */null, /* nameOfRaceToSort */null, /* autoExpandPreSelectedRace */ diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditableLeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditableLeaderboardPanel.java index 86623a00535..ddb9a45b094 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditableLeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditableLeaderboardPanel.java @@ -96,13 +96,13 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { setFieldUpdater(new FieldUpdater() { @Override public void update(final int rowIndex, final LeaderboardRowDTO row, final String value) { - getSailingService().updateLeaderboardCarryValue(getLeaderboardName(), row.competitor.idAsString, + getSailingService().updateLeaderboardCarryValue(getLeaderboardName(), row.competitor.getIdAsString(), value == null || value.length() == 0 ? null : Double.valueOf(value.trim()), new AsyncCallback() { @Override public void onFailure(Throwable t) { EditableLeaderboardPanel.this.getErrorReporter().reportError("Error trying to update carry value for competitor "+ - row.competitor.name+" in leaderboard "+getLeaderboardName()+": "+t.getMessage()+ + row.competitor.getName()+" in leaderboard "+getLeaderboardName()+": "+t.getMessage()+ "\nYou may have to refresh your view."); } @@ -144,7 +144,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { return new InvertibleComparatorAdapter() { @Override public int compare(CompetitorDTO o1, CompetitorDTO o2) { - return Collator.getInstance().compare(o1.sailID, o2.sailID); + return Collator.getInstance().compare(o1.getSailID(), o2.getSailID()); } }; } @@ -157,7 +157,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { @Override public void render(Context context, CompetitorDTO object, SafeHtmlBuilder sb) { ImageResourceRenderer renderer = new ImageResourceRenderer(); - final String twoLetterIsoCountryCode = object.twoLetterIsoCountryCode; + final String twoLetterIsoCountryCode = object.getTwoLetterIsoCountryCode(); final ImageResource flagImageResource; if (twoLetterIsoCountryCode==null || twoLetterIsoCountryCode.isEmpty()) { flagImageResource = FlagImageResolver.getEmptyFlagImageResource(); @@ -168,12 +168,12 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { sb.append(renderer.render(flagImageResource)); sb.appendHtmlConstant(" "); } - sb.appendEscaped(object.sailID); + sb.appendEscaped(object.getSailID()); } @Override public String getValue(CompetitorDTO object) { - return object.sailID; + return object.getSailID(); } } @@ -211,13 +211,13 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { return new FieldUpdater() { @Override public void update(final int rowIndex, final LeaderboardRowDTO row, final String value) { - getSailingService().updateCompetitorDisplayNameInLeaderboard(getLeaderboardName(), row.competitor.idAsString, + getSailingService().updateCompetitorDisplayNameInLeaderboard(getLeaderboardName(), row.competitor.getIdAsString(), value == null || value.length() == 0 ? null : value.trim(), new AsyncCallback() { @Override public void onFailure(Throwable t) { EditableLeaderboardPanel.this.getErrorReporter().reportError("Error trying to update display name for competitor "+ - row.competitor.name+" in leaderboard "+getLeaderboardName()+": "+t.getMessage()+ + row.competitor.getName()+" in leaderboard "+getLeaderboardName()+": "+t.getMessage()+ "\nYou may have to refresh your view."); } @@ -329,7 +329,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { EditableLeaderboardPanel.this.getData()); getWhiteboardOwner().whiteboardProduced(whiteboard); getBusyIndicator().setBusy(true); - getSailingService().updateLeaderboardMaxPointsReason(getLeaderboardName(), row.competitor.idAsString, + getSailingService().updateLeaderboardMaxPointsReason(getLeaderboardName(), row.competitor.getIdAsString(), raceColumnName, value == null || value.trim().length() == 0 ? null : MaxPointsReason.valueOf(value.trim()), getLeaderboardDisplayDate(), new AsyncCallback>() { @Override @@ -337,7 +337,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { getBusyIndicator().setBusy(false); getErrorReporter().reportError( "Error trying to update max points reason for competitor " - + row.competitor.name + " in leaderboard " + getLeaderboardName() + + row.competitor.getName() + " in leaderboard " + getLeaderboardName() + ": " + t.getMessage() + "\nYou may have to refresh your view."); } @@ -425,14 +425,14 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { EditableLeaderboardPanel.this.getData()); getWhiteboardOwner().whiteboardProduced(whiteboard); getBusyIndicator().setBusy(true); - getSailingService().updateLeaderboardScoreCorrection(getLeaderboardName(), row.competitor.idAsString, raceColumnName, + getSailingService().updateLeaderboardScoreCorrection(getLeaderboardName(), row.competitor.getIdAsString(), raceColumnName, value == null || value.trim().length() == 0 ? null : Double.valueOf(value.trim()), getLeaderboardDisplayDate(), new AsyncCallback>() { @Override public void onFailure(Throwable t) { getBusyIndicator().setBusy(false); getErrorReporter().reportError("Error trying to update score correction for competitor "+ - row.competitor.name+" in leaderboard "+getLeaderboardName()+ + row.competitor.getName()+" in leaderboard "+getLeaderboardName()+ " for race "+raceColumnName+": "+t.getMessage()+ "\nYou may have to refresh your view."); } @@ -497,34 +497,34 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { final RowUpdateWhiteboard whiteboard = new RowUpdateWhiteboard( EditableLeaderboardPanel.this.getData()); getWhiteboardOwner().whiteboardProduced(whiteboard); - new EditScoreDialog(stringMessages, row.competitor.name, raceColumnName, + new EditScoreDialog(stringMessages, row.competitor.getName(), raceColumnName, row.fieldsByRaceColumnName.get(raceColumnName).reasonForMaxPoints, row.fieldsByRaceColumnName.get(raceColumnName).netPoints, new DialogCallback>() { @Override public void ok(final Pair editedObject) { getBusyIndicator().setBusy(true); - getSailingService().updateLeaderboardScoreCorrection(getLeaderboardName(), row.competitor.idAsString, raceColumnName, + getSailingService().updateLeaderboardScoreCorrection(getLeaderboardName(), row.competitor.getIdAsString(), raceColumnName, editedObject.getB(), getLeaderboardDisplayDate(), new AsyncCallback>() { @Override public void onFailure(Throwable t) { getBusyIndicator().setBusy(false); getErrorReporter().reportError("Error trying to update score correction for competitor "+ - row.competitor.name+" in leaderboard "+getLeaderboardName()+ + row.competitor.getName()+" in leaderboard "+getLeaderboardName()+ " for race "+raceColumnName+": "+t.getMessage()+ "\nYou may have to refresh your view."); } @Override public void onSuccess(Triple newNetAndTotalPointsAndIsCorrected) { - getSailingService().updateLeaderboardMaxPointsReason(getLeaderboardName(), row.competitor.idAsString, raceColumnName, + getSailingService().updateLeaderboardMaxPointsReason(getLeaderboardName(), row.competitor.getIdAsString(), raceColumnName, editedObject.getA(), getLeaderboardDisplayDate(), new AsyncCallback>() { @Override public void onFailure(Throwable t) { getBusyIndicator().setBusy(false); getErrorReporter().reportError("Error trying to update score correction for competitor "+ - row.competitor.name+" in leaderboard "+getLeaderboardName()+ + row.competitor.getName()+" in leaderboard "+getLeaderboardName()+ " for race "+raceColumnName+": "+t.getMessage()+ "\nYou may have to refresh your view."); } @@ -653,15 +653,15 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { unsuppressButtonColumn.setFieldUpdater(new FieldUpdater() { @Override public void update(int index, final CompetitorDTO object, String value) { - getSailingService().suppressCompetitorInLeaderboard(getLeaderboardName(), object.idAsString, + getSailingService().suppressCompetitorInLeaderboard(getLeaderboardName(), object.getIdAsString(), /* suppressed */ false, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - getErrorReporter().reportError("Error trying to unsuppress competitor "+object.name); + getErrorReporter().reportError("Error trying to unsuppress competitor "+object.getName()); } @Override public void onSuccess(Void result) { - Window.setStatus("Successfully unsuppressed competitor "+object.name); + Window.setStatus("Successfully unsuppressed competitor "+object.getName()); // force a reload of the entire editable leaderboard to hide the now suppressed competitor timeChanged(getLeaderboardDisplayDate()); } @@ -706,7 +706,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { for (Entry>> e : scp.getHasResultsForBoatClassFromDateByEventName().entrySet()) { for (Pair se : e.getValue()) { providerNameAndEventNameBoatClassNameCapturedWhen.add(new Triple>( - scp.name, e.getKey(), se)); + scp.getName(), e.getKey(), se)); } } } @@ -720,7 +720,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { final Set boatClasses = getLeaderboard().getBoatClasses(); final Set lowercaseBoatClassNames = new HashSet(); for (BoatClassDTO boatClass : boatClasses) { - lowercaseBoatClassNames.add(boatClass.name.toLowerCase()); + lowercaseBoatClassNames.add(boatClass.getName().toLowerCase()); } Collections.sort(providerNameAndEventNameBoatClassNameCapturedWhen, new Comparator>>() { @Override @@ -787,12 +787,12 @@ public class EditableLeaderboardPanel extends LeaderboardPanel { return new FieldUpdater() { @Override public void update(int index, final LeaderboardRowDTO row, String value) { - getSailingService().suppressCompetitorInLeaderboard(getLeaderboardName(), row.competitor.idAsString, + getSailingService().suppressCompetitorInLeaderboard(getLeaderboardName(), row.competitor.getIdAsString(), /* suppressed */ true, new AsyncCallback() { @Override public void onFailure(Throwable caught) { - getErrorReporter().reportError("Error trying to suppress competitor "+row.competitor.name+ + getErrorReporter().reportError("Error trying to suppress competitor "+row.competitor.getName()+ " in leaderboard "+getLeaderboardName()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/MatchAndApplyScoreCorrectionsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/MatchAndApplyScoreCorrectionsDialog.java index e66f83d9b45..d5206862355 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/MatchAndApplyScoreCorrectionsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/MatchAndApplyScoreCorrectionsDialog.java @@ -229,7 +229,7 @@ public class MatchAndApplyScoreCorrectionsDialog extends DataEntryDialog canonicalizeLeaderboardSailIDs(LeaderboardDTO leaderboard) { Map result = new HashMap(); for (CompetitorDTO competitor : leaderboard.competitors) { - String canonicalizedSailID = canonicalizeSailID(competitor.sailID.trim(), competitor.threeLetterIocCountryCode.trim()); + String canonicalizedSailID = canonicalizeSailID(competitor.getSailID().trim(), competitor.getThreeLetterIocCountryCode().trim()); if (canonicalizedSailID != null) { result.put(canonicalizedSailID, competitor); } @@ -286,7 +286,7 @@ public class MatchAndApplyScoreCorrectionsDialog extends DataEntryDialog regattas) { for (RegattaDTO regattaDTO : regattas) { - if (regattaDTO.name.equals(regattaName)) { + if (regattaDTO.getName().equals(regattaName)) { for (RaceDTO raceDTO : regattaDTO.races) { - if (raceDTO.name.equals(raceName)) { + if (raceDTO.getName().equals(raceName)) { return raceDTO; } } @@ -192,7 +192,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint { private FlowPanel createLogoAndTitlePanel(RaceBoardPanel raceBoardPanel) { globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, leaderboardName, leaderboardGroupName); - LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(regattaName, selectedRace.name, stringMessages, this) { + LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(regattaName, selectedRace.getName(), stringMessages, this) { @Override public void onResize() { super.onResize(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RaceCourseComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RaceCourseComposite.java index 020b9a3bf2f..b801c2fac20 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RaceCourseComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RaceCourseComposite.java @@ -60,7 +60,7 @@ public class RaceCourseComposite extends Composite { TextColumn waypointNameColumn = new TextColumn() { @Override public String getValue(WaypointDTO waypointDTO) { - String result = waypointDTO.name; + String result = waypointDTO.getName(); result += (waypointDTO.passingSide == null) ? "" : ", to " + getNauticalSideAsText(waypointDTO.passingSide); return result; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java index 8d369db07ef..21742edc7f3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java @@ -253,8 +253,8 @@ public class RegattaOverviewPanel extends SimplePanel implements RegattaOverview } private void fillEventAndVenueName() { - eventNameLabel.setText(eventDTO.name); - venueNameLabel.setText(eventDTO.venue.name); + eventNameLabel.setText(eventDTO.getName()); + venueNameLabel.setText(eventDTO.venue.getName()); } @Override 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 b67c6b6a403..39bb0815b66 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 @@ -63,7 +63,7 @@ public class RegattaRaceStatesSettingsDialogComponent implements SettingsDialogC courseAreaPanel.add(courseAreaGrid); for (CourseAreaDTO courseAreaDTO : courseAreas) { - CheckBox checkBox = dialog.createCheckbox(courseAreaDTO.name); + CheckBox checkBox = dialog.createCheckbox(courseAreaDTO.getName()); checkBox.setValue(Util.contains(initialSettings.getVisibleCourseAreas(), courseAreaDTO.id)); courseAreaCheckBoxMap.put(courseAreaDTO.id, checkBox); 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 c633e7ef920..78d93c38ae7 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 @@ -2,6 +2,7 @@ package com.sap.sailing.gwt.ui.server; import java.io.BufferedReader; import java.io.File; +import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.ObjectOutputStream; @@ -471,12 +472,12 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S } // Un-comment the following lines if you need to update the file used by LeaderboardDTODiffingTest, set a breakpoint // and toggle the storeLeaderboardForTesting flag if you found a good version. See also bug 1417. -// boolean storeLeaderboardForTesting = false; -// if (storeLeaderboardForTesting) { -// ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(new File("c:/data/SAP/sailing/workspace/java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser"))); -// oos.writeObject(leaderboardDTO); -// oos.close(); -// } + boolean storeLeaderboardForTesting = false; + if (storeLeaderboardForTesting) { + ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(new File("c:/data/SAP/sailing/workspace/java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser"))); + oos.writeObject(leaderboardDTO); + oos.close(); + } final IncrementalLeaderboardDTO cachedDiff; if (previousLeaderboardId != null) { synchronized (leaderboardDifferenceCacheByIdPair) { @@ -578,7 +579,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S List raceColumns = new ArrayList(); for (RaceColumnInSeries raceColumn : series.getRaceColumns()) { RaceColumnDTO raceColumnDTO = new RaceColumnDTO(/* isValidInTotalScore not relevant here because no scores conveyed */ null); - raceColumnDTO.name = raceColumn.getName(); + raceColumnDTO.setName(raceColumn.getName()); raceColumnDTO.setMedalRace(raceColumn.isMedalRace()); raceColumnDTO.setExplicitFactor(raceColumn.getExplicitFactor()); raceColumns.add(raceColumnDTO); @@ -1127,8 +1128,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S List fixesForCompetitor = new ArrayList(); result.put(competitorDTO, fixesForCompetitor); GPSFixTrack track = trackedRace.getTrack(competitor); - TimePoint fromTimePoint = new MillisecondsTimePoint(fromPerCompetitorIdAsString.get(competitorDTO.idAsString)); - TimePoint toTimePointExcluding = new MillisecondsTimePoint(toPerCompetitorIdAsString.get(competitorDTO.idAsString)); + TimePoint fromTimePoint = new MillisecondsTimePoint(fromPerCompetitorIdAsString.get(competitorDTO.getIdAsString())); + TimePoint toTimePointExcluding = new MillisecondsTimePoint(toPerCompetitorIdAsString.get(competitorDTO.getIdAsString())); // copy the fixes into a list while holding the monitor; then release the monitor to avoid deadlocks // during wind estimations required for tack determination List fixes = new ArrayList(); @@ -1185,7 +1186,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S Wind wind2 = trackedRace.getWind(position, toTimePointExcluding); WindDTO windDTO2 = createWindDTOFromAlreadyAveraged(wind2, trackedRace.getOrCreateWindTrack(windSource), toTimePointExcluding); GPSFixDTO extrapolated = new GPSFixDTO( - toPerCompetitorIdAsString.get(competitorDTO.idAsString), + toPerCompetitorIdAsString.get(competitorDTO.getIdAsString()), position==null?null:new PositionDTO(position.getLatDeg(), position.getLngDeg()), speedWithBearing==null?null:createSpeedWithBearingDTO(speedWithBearing), windDTO2, tack2, legType2, /* extrapolated */ true); @@ -1243,7 +1244,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S } else if (wayPointNumber == numberOfWaypoints) { name = "F"; } - markPassingTimesDTO.name = name; + markPassingTimesDTO.setName(name); Pair timesPair = markPassingTimes.getB(); TimePoint firstPassingTime = timesPair.getA(); TimePoint lastPassingTime = timesPair.getB(); @@ -1259,7 +1260,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S int legNumber = 1; for (TrackedLeg trackedLeg : trackedLegs) { LegInfoDTO legInfoDTO = new LegInfoDTO(legNumber); - legInfoDTO.name = "L" + legNumber; + legInfoDTO.setName("L" + legNumber); try { MarkPassingTimesDTO markPassingTimesDTO = markPassingTimesDTOs.get(legNumber - 1); if (markPassingTimesDTO.firstPassingDate != null) { @@ -1426,12 +1427,12 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S } else { id = gateDTO.getIdAsString(); } - Mark left = baseDomainFactory.getOrCreateMark(gateDTO.getLeft().getIdAsString(), gateDTO.getLeft().name); - Mark right = baseDomainFactory.getOrCreateMark(gateDTO.getRight().getIdAsString(), gateDTO.getRight().name); - newControlPoint = baseDomainFactory.createGate(id, left, right, gateDTO.name); + Mark left = baseDomainFactory.getOrCreateMark(gateDTO.getLeft().getIdAsString(), gateDTO.getLeft().getName()); + Mark right = baseDomainFactory.getOrCreateMark(gateDTO.getRight().getIdAsString(), gateDTO.getRight().getName()); + newControlPoint = baseDomainFactory.createGate(id, left, right, gateDTO.getName()); newControlPoints.add(new Pair(newControlPoint, null)); } else { - newControlPoint = baseDomainFactory.getOrCreateMark(controlPointDTO.getIdAsString(), controlPointDTO.name); + newControlPoint = baseDomainFactory.getOrCreateMark(controlPointDTO.getIdAsString(), controlPointDTO.getName()); NauticalSide nauticalSide = controlPointAndPassingSide.getB(); newControlPoints.add(new Pair(newControlPoint, nauticalSide)); } @@ -1651,7 +1652,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S TrackedRace trackedRace = raceInLeaderboard.getTrackedRace(fleet); if (trackedRace != null) { RaceDefinition trackedRaceDef = trackedRace.getRace(); - if (trackedRaceDef.getName().equals(race.name)) { + if (trackedRaceDef.getName().equals(race.getName())) { results.add(createStrippedLeaderboardDTO(leaderboard, false)); break; } @@ -2106,7 +2107,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S @Override public CompetitorRaceDataDTO call() throws NoWindException { Competitor competitor = getCompetitorById(trackedRace.getRace().getCompetitors(), - competitorDTO.idAsString); + competitorDTO.getIdAsString()); ArrayList> markPassingsData = new ArrayList>(); ArrayList> raceData = new ArrayList>(); // Filling the mark passings @@ -2149,10 +2150,10 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S competitorData = e.getValue().get(); } catch (InterruptedException e1) { competitorData = null; - logger.log(Level.SEVERE, "Exception while trying to compute competitor data "+detailType+" for competitor "+e.getKey().name, e1); + logger.log(Level.SEVERE, "Exception while trying to compute competitor data "+detailType+" for competitor "+e.getKey().getName(), e1); } catch (ExecutionException e1) { competitorData = null; - logger.log(Level.SEVERE, "Exception while trying to compute competitor data "+detailType+" for competitor "+e.getKey().name, e1); + logger.log(Level.SEVERE, "Exception while trying to compute competitor data "+detailType+" for competitor "+e.getKey().getName(), e1); } result.setCompetitorData(e.getKey(), competitorData); } @@ -2340,7 +2341,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S private LeaderboardGroupDTO convertToLeaderboardGroupDTO(LeaderboardGroup leaderboardGroup, boolean withGeoLocationData) { LeaderboardGroupDTO groupDTO = new LeaderboardGroupDTO(); - groupDTO.name = leaderboardGroup.getName(); + groupDTO.setName(leaderboardGroup.getName()); groupDTO.description = leaderboardGroup.getDescription(); groupDTO.displayLeaderboardsInReverseOrder = leaderboardGroup.isDisplayGroupsInReverseOrder(); for (Leaderboard leaderboard : leaderboardGroup.getLeaderboards()) { @@ -2427,7 +2428,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S @Override public void updateEvent(String eventName, String eventIdAsString, VenueDTO venue, String publicationUrl, boolean isPublic, List regattaNames) { UUID eventUuid = convertIdentifierStringToUuid(eventIdAsString); - getService().apply(new UpdateEvent(eventUuid, eventName, venue.name, publicationUrl, isPublic, regattaNames)); + getService().apply(new UpdateEvent(eventUuid, eventName, venue.getName(), publicationUrl, isPublic, regattaNames)); } @Override @@ -2492,14 +2493,14 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S private EventDTO convertToEventDTO(Event event) { EventDTO eventDTO = new EventDTO(event.getName()); eventDTO.venue = new VenueDTO(); - eventDTO.venue.name = event.getVenue() != null ? event.getVenue().getName() : null; + eventDTO.venue.setName(event.getVenue() != null ? event.getVenue().getName() : null); eventDTO.publicationUrl = event.getPublicationUrl(); eventDTO.isPublic = event.isPublic(); eventDTO.id = event.getId().toString(); eventDTO.regattas = new ArrayList(); for (Regatta regatta: event.getRegattas()) { RegattaDTO regattaDTO = new RegattaDTO(); - regattaDTO.name = regatta.getName(); + regattaDTO.setName(regatta.getName()); eventDTO.regattas.add(regattaDTO); } eventDTO.venue.setCourseAreas(new ArrayList()); @@ -2569,7 +2570,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S private RaceColumnInSeriesDTO convertToRaceColumnInSeriesDTO(RaceColumnInSeries raceColumnInSeries) { RaceColumnInSeriesDTO raceColumnInSeriesDTO = new RaceColumnInSeriesDTO(raceColumnInSeries.getSeries().getName(), raceColumnInSeries.getRegatta().getName()); - raceColumnInSeriesDTO.name = raceColumnInSeries.getName(); + raceColumnInSeriesDTO.setName(raceColumnInSeries.getName()); raceColumnInSeriesDTO.setMedalRace(raceColumnInSeries.isMedalRace()); return raceColumnInSeriesDTO; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java index e58e3cad0b5..7aad3b9c27a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java @@ -230,7 +230,7 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula @Override public WindPatternDisplay getWindPatternDisplay(WindPatternDTO pattern) { - WindPatternDisplay display = wpDisplayManager.getDisplay(WindPattern.valueOf(pattern.name)); + WindPatternDisplay display = wpDisplayManager.getDisplay(WindPattern.valueOf(pattern.getName())); try { return display; } catch (Exception e) { @@ -283,7 +283,7 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula RaceMapDataDTO rcDTO = simulatedPaths.raceMapDataDTO; for (PathDTO path : pathDTOs) { - if (path.name.equals(POLYLINE_PATH_NAME)) { + if (path.getName().equals(POLYLINE_PATH_NAME)) { continue; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/BulkScoreCorrectionDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/BulkScoreCorrectionDTO.java index fa79b949b49..933c9fe8c0a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/BulkScoreCorrectionDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/BulkScoreCorrectionDTO.java @@ -29,21 +29,21 @@ public class BulkScoreCorrectionDTO implements IsSerializable { } public void addScoreUpdate(CompetitorDTO competitor, RaceColumnDTO raceColumn, double newScore) { - Map map = scoreUpdatesForRaceColumnByCompetitorIdAsString.get(competitor.idAsString); + Map map = scoreUpdatesForRaceColumnByCompetitorIdAsString.get(competitor.getIdAsString()); if (map == null) { map = new HashMap(); - scoreUpdatesForRaceColumnByCompetitorIdAsString.put(competitor.idAsString, map); + scoreUpdatesForRaceColumnByCompetitorIdAsString.put(competitor.getIdAsString(), map); } - map.put(raceColumn.name, newScore); + map.put(raceColumn.getName(), newScore); } public void addMaxPointsReasonUpdate(CompetitorDTO competitor, RaceColumnDTO raceColumn, MaxPointsReason newReason) { - Map map = maxPointsUpdatesForRaceColumnByCompetitorIdAsString.get(competitor.idAsString); + Map map = maxPointsUpdatesForRaceColumnByCompetitorIdAsString.get(competitor.getIdAsString()); if (map == null) { map = new HashMap(); - maxPointsUpdatesForRaceColumnByCompetitorIdAsString.put(competitor.idAsString, map); + maxPointsUpdatesForRaceColumnByCompetitorIdAsString.put(competitor.getIdAsString(), map); } - map.put(raceColumn.name, newReason); + map.put(raceColumn.getName(), newReason); } public Map> getMaxPointsUpdatesForRaceColumnByCompetitorIdAsString() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CompactRaceMapDataDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CompactRaceMapDataDTO.java index 59ac1ed5295..091adaae904 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CompactRaceMapDataDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CompactRaceMapDataDTO.java @@ -30,11 +30,11 @@ public class CompactRaceMapDataDTO implements IsSerializable { List quickRanks) { this.boatPositionsByCompetitorIdAsString = new HashMap>(); for (Map.Entry> e : boatPositions.entrySet()) { - this.boatPositionsByCompetitorIdAsString.put(e.getKey().idAsString, e.getValue()); + this.boatPositionsByCompetitorIdAsString.put(e.getKey().getIdAsString(), e.getValue()); } this.quickRanks = new ArrayList(quickRanks.size()); for (QuickRankDTO quickRank : quickRanks) { - this.quickRanks.add(new CompactQuickRankDTO(quickRank.competitor.idAsString, quickRank.rank, quickRank.legNumber)); + this.quickRanks.add(new CompactQuickRankDTO(quickRank.competitor.getIdAsString(), quickRank.rank, quickRank.legNumber)); } this.coursePositions = coursePositions; } @@ -42,7 +42,7 @@ public class CompactRaceMapDataDTO implements IsSerializable { public RaceMapDataDTO getRaceMapDataDTO(Iterable competitors) { Map competitorsByIdAsString = new HashMap(); for (CompetitorDTO competitor : competitors) { - competitorsByIdAsString.put(competitor.idAsString, competitor); + competitorsByIdAsString.put(competitor.getIdAsString(), competitor); } RaceMapDataDTO result = new RaceMapDataDTO(); result.quickRanks = new ArrayList(this.quickRanks.size()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegInfoDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegInfoDTO.java index 5fcae4e263c..37a0b7fdfc9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegInfoDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegInfoDTO.java @@ -20,7 +20,7 @@ public class LegInfoDTO extends NamedDTO { @Override public String toString() { - return "LegInfoDTO [name=" + name + ", legNumber=" + legNumber + return "LegInfoDTO [name=" + getName() + ", legNumber=" + legNumber + ", legType=" + legType + ", legBearingInDegrees=" + legBearingInDegrees + "]"; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkPassingTimesDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkPassingTimesDTO.java index d1cab5d3a84..840bb70ae84 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkPassingTimesDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkPassingTimesDTO.java @@ -19,12 +19,12 @@ public class MarkPassingTimesDTO extends NamedDTO { } public MarkPassingTimesDTO(String name) { - this.name = name; + this.setName(name); } @Override public String toString() { return "MarkPassingTimesDTO [firstPassingDate=" + firstPassingDate + ", lastPassingDate=" + lastPassingDate - + ", name=" + name + "]"; + + ", name=" + getName() + "]"; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceCourseDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceCourseDTO.java index bbb1b78bc67..935d72762ac 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceCourseDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceCourseDTO.java @@ -29,8 +29,8 @@ public class RaceCourseDTO implements IsSerializable { Map marks = new HashMap(); for(WaypointDTO waypoint: waypoints) { for(MarkDTO mark: waypoint.marks) { - if(!marks.containsKey(mark.name)) { - marks.put(mark.name, mark); + if(!marks.containsKey(mark.getName())) { + marks.put(mark.getName(), mark); } } } 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 cb7e0663fe0..af16ef87d01 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 @@ -30,7 +30,7 @@ public class RegattaDTO extends NamedDTO { } public RegattaIdentifier getRegattaIdentifier() { - return new RegattaName(name); + return new RegattaName(getName()); } /** @@ -72,7 +72,7 @@ public class RegattaDTO extends NamedDTO { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((scoringScheme == null) ? 0 : scoringScheme.hashCode()); return result; } @@ -86,10 +86,10 @@ public class RegattaDTO extends NamedDTO { if (getClass() != obj.getClass()) return false; RegattaDTO other = (RegattaDTO) obj; - if (name == null) { - if (other.name != null) + if (getName() == null) { + if (other.getName() != null) return false; - } else if (!name.equals(other.name)) + } else if (!getName().equals(other.getName())) return false; if (scoringScheme != other.scoringScheme) return false; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WaypointDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WaypointDTO.java index cba6eed1cf4..f9e16e24d73 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WaypointDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WaypointDTO.java @@ -18,7 +18,7 @@ public class WaypointDTO extends NamedDTO { public WaypointDTO(String name, ControlPointDTO controlPoint, List marks, NauticalSide passingSide) { super(name); - this.name = name; + this.setName(name); this.marks = marks; this.controlPoint = controlPoint; this.passingSide = passingSide; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java index 0f60fadde86..cfc8193f86d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java @@ -374,7 +374,7 @@ public class SimulatorMainPanel extends SimplePanel { @Override public void onSuccess(List patterns) { for (WindPatternDTO p : patterns) { - if ((mode != SailingSimulatorUtil.freestyle)||(!p.name.equals("MEASURED"))) { + if ((mode != SailingSimulatorUtil.freestyle)||(!p.getName().equals("MEASURED"))) { patternSelector.addItem(p.getDisplayName()); patternNameDTOMap.put(p.getDisplayName(), p); } @@ -710,7 +710,7 @@ public class SimulatorMainPanel extends SimplePanel { } boatClasses = boatClassesAndMsg.getBoatClassDTOs(); - chart.setChartTitleText(boatClasses[selectedBoatClass].name); + chart.setChartTitleText(boatClasses[selectedBoatClass].getName()); } }); @@ -1046,7 +1046,7 @@ public class SimulatorMainPanel extends SimplePanel { boatClasses = response.getBoatClassDTOs(); for (int i = 0; i < boatClasses.length; ++i) { - boatClassSelector.addItem(boatClasses[i].name); + boatClassSelector.addItem(boatClasses[i].getName()); } boatClassSelector.setItemSelected(3, true); // polar diagram 49er STG loadPolarDiagramData(3); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java index 5715f1bd23c..4b608e325ec 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java @@ -121,7 +121,7 @@ public class SimulatorMap extends AbsolutePanel implements RequiresDataInitializ for (int index = 0; index < noOfPaths; ++index) { currentPath = paths[index]; - pathName = currentPath.name; + pathName = currentPath.getName(); color = colorPalette.getColor(noOfPaths - 1 - index); if (pathName.equals("Polyline")) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java index 3cea7d5dd57..f93a2e02130 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java @@ -214,10 +214,10 @@ public class EventOverviewPanel extends FormPanel { if (event.publicationUrl != null && !event.publicationUrl.isEmpty() && event.isPublic) { String link = URLEncoder.encode(event.publicationUrl + (debugParam != null && !debugParam.isEmpty() ? "?gwt.codesvr=" + debugParam : "")); - return ANCHORTEMPLATE.anchor(link, event.name); + return ANCHORTEMPLATE.anchor(link, event.getName()); } else { SafeHtmlBuilder builder = new SafeHtmlBuilder(); - builder.appendHtmlConstant(event.name); + builder.appendHtmlConstant(event.getName()); return builder.toSafeHtml(); } } @@ -227,7 +227,7 @@ public class EventOverviewPanel extends FormPanel { TextColumn eventVenueColumn = new TextColumn() { @Override public String getValue(EventDTO event) { - return event.venue.name; + return event.venue.getName(); } }; eventVenueColumn.setSortable(true); @@ -291,13 +291,13 @@ public class EventOverviewPanel extends FormPanel { eventsListHandler.setComparator(eventNameColumn, new Comparator() { @Override public int compare(EventDTO e1, EventDTO e2) { - return e1.name.compareTo(e2.name); + return e1.getName().compareTo(e2.getName()); } }); eventsListHandler.setComparator(eventVenueColumn, new Comparator() { @Override public int compare(EventDTO e1, EventDTO e2) { - return e1.venue.name.compareTo(e2.venue.name); + return e1.venue.getName().compareTo(e2.venue.getName()); } }); eventsListHandler.setComparator(eventStartDateColumn, new Comparator() { @@ -360,7 +360,7 @@ public class EventOverviewPanel extends FormPanel { String debugParam = Window.Location.getParameter("gwt.codesvr"); String link = URLEncoder.encode("/gwt/Leaderboard.html?name=" + leaderboard.name + (showRaceDetails ? "&showRaceDetails=true" : "") - + "&leaderboardGroupName=" + selectedGroup.name + "&root=overview" + + "&leaderboardGroupName=" + selectedGroup.getName() + "&root=overview" + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); return ANCHORTEMPLATE.anchor(link, leaderboard.name); } @@ -453,7 +453,7 @@ public class EventOverviewPanel extends FormPanel { String debugParam = Window.Location.getParameter("gwt.codesvr"); String link = URLEncoder.encode("/gwt/RaceBoard.html?leaderboardName=" + selectedLeaderboard.name + "&raceName=" + raceId.getRaceName() + "®attaName=" - + raceId.getRegattaName() + "&leaderboardGroupName=" + selectedGroup.name + + raceId.getRegattaName() + "&leaderboardGroupName=" + selectedGroup.getName() + "&root=overview" + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); name = ANCHORTEMPLATE.anchor(link, raceDisplayName); @@ -608,7 +608,7 @@ public class EventOverviewPanel extends FormPanel { location.split("\\s")); } if (result && name != null && name.length() > 0) { - result = textContainsStringsToCheck(event.name, name.split("\\s")); + result = textContainsStringsToCheck(event.getName(), name.split("\\s")); } if (result && onlyLiveCheckBox.getValue()) { result = event.leaderboardGroup.hasLiveRace(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java index 851760c29d6..b3e72d6e77a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java @@ -225,9 +225,9 @@ public class LeaderboardGroupOverviewPanel extends FormPanel { String debugParam = Window.Location.getParameter("gwt.codesvr"); String link = URLEncoder.encode("/gwt/Spectator.html?"+ (showRaceDetails ? "showRaceDetails=true&" : "") + - "leaderboardGroupName=" + group.name + "&root=overview" + "leaderboardGroupName=" + group.getName() + "&root=overview" + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); - return ANCHORTEMPLATE.anchor(link, group.name); + return ANCHORTEMPLATE.anchor(link, group.getName()); } }; groupsNameColumn.setSortable(true); @@ -291,7 +291,7 @@ public class LeaderboardGroupOverviewPanel extends FormPanel { groupsListHandler.setComparator(groupsNameColumn, new Comparator() { @Override public int compare(LeaderboardGroupDTO g1, LeaderboardGroupDTO g2) { - return g1.name.compareTo(g2.name); + return g1.getName().compareTo(g2.getName()); } }); groupsListHandler.setComparator(groupsStartDateColumn, new Comparator() { @@ -354,7 +354,7 @@ public class LeaderboardGroupOverviewPanel extends FormPanel { String debugParam = Window.Location.getParameter("gwt.codesvr"); String link = URLEncoder.encode("/gwt/Leaderboard.html?name=" + leaderboard.name + (showRaceDetails ? "&showRaceDetails=true" : "") - + "&leaderboardGroupName=" + selectedGroup.name + "&root=overview" + + "&leaderboardGroupName=" + selectedGroup.getName() + "&root=overview" + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); return ANCHORTEMPLATE.anchor(link, leaderboard.name); } @@ -447,7 +447,7 @@ public class LeaderboardGroupOverviewPanel extends FormPanel { String debugParam = Window.Location.getParameter("gwt.codesvr"); String link = URLEncoder.encode("/gwt/RaceBoard.html?leaderboardName=" + selectedLeaderboard.name + "&raceName=" + raceId.getRaceName() + "®attaName=" - + raceId.getRegattaName() + "&leaderboardGroupName=" + selectedGroup.name + + raceId.getRegattaName() + "&leaderboardGroupName=" + selectedGroup.getName() + "&root=overview" + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); name = ANCHORTEMPLATE.anchor(link, raceDisplayName); @@ -608,7 +608,7 @@ public class LeaderboardGroupOverviewPanel extends FormPanel { location.split("\\s")); } if (result && name != null && name.length() > 0) { - result = textContainsStringsToCheck(forGroup.name, name.split("\\s")); + result = textContainsStringsToCheck(forGroup.getName(), name.split("\\s")); } if (result && onlyLiveCheckBox.getValue()) { result = forGroup.hasLiveRace(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java index 58e16ba7465..2f6655d7a64 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java @@ -135,7 +135,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg @Override public void onSuccess(List regattaDTOs) { for(RegattaDTO regattaDTO: regattaDTOs) { - regattasByName.put(regattaDTO.name, regattaDTO); + regattasByName.put(regattaDTO.getName(), regattaDTO); } createPageContent(); } @@ -161,7 +161,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg private void createPageContent() { if (!isEmbedded) { - Label groupNameLabel = new Label(leaderboardGroup.name + ":"); + Label groupNameLabel = new Label(leaderboardGroup.getName() + ":"); groupNameLabel.setStyleName(STYLE_NAME_PREFIX + "GroupName"); mainPanel.add(groupNameLabel); // Using HTML to display the line breaks in the description @@ -190,11 +190,11 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg if (leaderboardGroup.hasOverallLeaderboard()) { String debugParam = Window.Location.getParameter("gwt.codesvr"); - String link = URLEncoder.encode("/gwt/Leaderboard.html?name=" + leaderboardGroup.name+" "+LeaderboardNameConstants.OVERALL + String link = URLEncoder.encode("/gwt/Leaderboard.html?name=" + leaderboardGroup.getName()+" "+LeaderboardNameConstants.OVERALL + (showRaceDetails ? "&showRaceDetails=true" : "") + (isEmbedded ? "&embedded=true" : "") + "&displayName=" + stringMessages.overallStandings() - + "&leaderboardGroupName=" + leaderboardGroup.name + "&root=" + root + + "&leaderboardGroupName=" + leaderboardGroup.getName() + "&root=" + root + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); Anchor overallStandingsLink = new Anchor(stringMessages.overallStandings(), true, link); overallStandingsLink.setStyleName(STYLE_ACTIVE_LEADERBOARD); @@ -224,7 +224,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg + (showRaceDetails ? "&showRaceDetails=true" : "") + (leaderboard.displayName != null ? "&displayName="+leaderboard.displayName : "") + (isEmbedded ? "&embedded=true" : "") - + "&leaderboardGroupName=" + leaderboardGroup.name + "&root=" + root + + "&leaderboardGroupName=" + leaderboardGroup.getName() + "&root=" + root + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : "")); return getAnchor(link, stringMessages.leaderboard(), STYLE_ACTIVE_LEADERBOARD); } @@ -303,7 +303,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg boolean hasMultipleFleets = series.getFleets().size() > 1; b.appendHtmlConstant("
"); if(renderSeriesName) { - b.append(TEXTTEMPLATE.textWithClass(series.name, 50, STYLE_TABLE_TEXT)); + b.append(TEXTTEMPLATE.textWithClass(series.getName(), 50, STYLE_TABLE_TEXT)); } b.appendHtmlConstant("
"); b.appendHtmlConstant("
"); @@ -316,10 +316,10 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg if(color != null) { b.append(COLORBOXTEMPLATE.colorBox(color.getAsHtml(), STYLE_COLORBOX)); } - b.append(TEXTTEMPLATE.textWithClass(fleet.name, 50, STYLE_TABLE_TEXT)); + b.append(TEXTTEMPLATE.textWithClass(fleet.getName(), 50, STYLE_TABLE_TEXT)); } else { - String displayName = fleet.name; - if (! "Default".equals(fleet.name)) { + String displayName = fleet.getName(); + if (! "Default".equals(fleet.getName())) { b.append(TEXTTEMPLATE.textWithClass(displayName, 50, STYLE_TABLE_TEXT)); } } @@ -360,7 +360,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg String link = URLEncoder.encode("/gwt/RaceBoard.html?leaderboardName=" + leaderboardName + "&raceName=" + raceIdentifier.getRaceName() + "&root=" + root + (canReplayDuringLiveRaces ? "&"+RaceBoardViewConfiguration.PARAM_CAN_REPLAY_DURING_LIVE_RACES+"=true" : "") - + "®attaName=" + raceIdentifier.getRegattaName() + "&leaderboardGroupName=" + leaderboardGroup.name); + + "®attaName=" + raceIdentifier.getRegattaName() + "&leaderboardGroupName=" + leaderboardGroup.getName()); if (debugParam != null && !debugParam.isEmpty()) { link += "&gwt.codesvr=" + debugParam; }