eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Merge branch 'master' into bug4340

Browse Source
This commit is contained in:
Axel Uhl committed 2017-10-18 13:44:34 +02:00
2 parents 2d9d0d9850 9546300b31
commit a88b5166db
1 file changed
+4 -14
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
+4 -14
View File
@@ -182,11 +182,9 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
boolean canRemoveBoatClass = true;
boolean canRemoveLastUpdate = true;
boolean canRemoveProtestTime = true;
boolean first = true;
for (RegattaOverviewEntryDTO loopEntryDTO : allEntries) {
final RaceInfoDTO loopRaceInfo = loopEntryDTO.raceInfo;
if (canRemoveLastUpdate && timePassedInSeconds(loopRaceInfo.lastUpdateTime) <= HIDE_COL_TIME_THRESHOLD) {
canRemoveLastUpdate = false;
}
@@ -194,42 +192,34 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
&& timePassedInSeconds(loopRaceInfo.protestFinishTime) <= HIDE_COL_TIME_THRESHOLD) {
canRemoveProtestTime = false;
}
if (first) {
firstRegattaName = loopEntryDTO.regattaDisplayName;
firstRegattaNameEntry = loopEntryDTO;
firstCourseAreaName = loopEntryDTO.courseAreaName;
firstCourseName = loopRaceInfo.lastCourseName;
firstCourseRegattaOverviewEntry = loopRaceInfo;
lastBoatClass = loopEntryDTO.boatClassName;
} else {
if (canRemoveRegatta && !Util.equalsWithNull(firstRegattaName, loopEntryDTO.regattaDisplayName)) {
canRemoveRegatta = false;
}
if (canRemoveCourseArea && !Util.equalsWithNull(firstCourseAreaName, loopEntryDTO.courseAreaName)) {
canRemoveCourseArea = false;
}
if (canRemoveCourse && !Util.equalsWithNull(firstCourseName, loopRaceInfo.lastCourseName)
&& !Util.equalsWithNull(firstCourseRegattaOverviewEntry.lastCourseDesign,
loopRaceInfo.lastCourseDesign)) {
// a course must be shown individually for a race if its name or its course design differs
if (canRemoveCourse && (!Util.equalsWithNull(firstCourseName, loopRaceInfo.lastCourseName)
|| !Util.equalsWithNull(firstCourseRegattaOverviewEntry.lastCourseDesign,
loopRaceInfo.lastCourseDesign))) {
canRemoveCourse = false;
}
if (canRemoveBoatClass && !Util.equalsWithNull(lastBoatClass, loopEntryDTO.boatClassName)) {
canRemoveBoatClass = false;
}
}
first = false;
}
// final RegattaOverviewEntryDTO entryForRepeatedInfos = firstEntry;
repeatedInfoLabel.clear();
boolean isAppending = false;
RegattaOverviewEntryDTO _firstRegattaNameEntry = firstRegattaNameEntry;
isAppending |= collectRepeatedInfos(stringMessages.regatta(), firstRegattaName, canRemoveRegatta,