mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-30 09:26:44 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
+1
-1
@@ -70,7 +70,7 @@ public class RaceColumnInLeaderboardDialog extends DataEntryDialog<RaceColumnInL
|
|||||||
String errorMessage;
|
String errorMessage;
|
||||||
String racename = valueToValidate.getName();
|
String racename = valueToValidate.getName();
|
||||||
Boolean isMedalRace = valueToValidate.isMedalRace();
|
Boolean isMedalRace = valueToValidate.isMedalRace();
|
||||||
boolean isNameNotEmpty = racename != null & racename != "";
|
boolean isNameNotEmpty = racename != null & !racename.isEmpty();
|
||||||
boolean medalRaceNotNull = isMedalRace != null;
|
boolean medalRaceNotNull = isMedalRace != null;
|
||||||
|
|
||||||
boolean unique = true;
|
boolean unique = true;
|
||||||
|
|||||||
+1
-1
@@ -411,7 +411,7 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
|
|||||||
raceList.getList().clear();
|
raceList.getList().clear();
|
||||||
if (text != null && !text.isEmpty()) {
|
if (text != null && !text.isEmpty()) {
|
||||||
for (SwissTimingReplayRaceDTO replayRace : availableSwissTimingRaces) {
|
for (SwissTimingReplayRaceDTO replayRace : availableSwissTimingRaces) {
|
||||||
boolean found = textContainsStringsToCheck(wordsToFilter, replayRace.boat_class, replayRace.flight_number, replayRace.name, replayRace.race_id);
|
boolean found = textContainsStringsToCheck(wordsToFilter, replayRace.boat_class, replayRace.flight_number, replayRace.name, replayRace.race_id, replayRace.rsc);
|
||||||
if (found) {
|
if (found) {
|
||||||
raceList.getList().add(replayRace);
|
raceList.getList().add(replayRace);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -402,10 +402,10 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
|
|||||||
double deltaMax = Math.abs(yMax - y);
|
double deltaMax = Math.abs(yMax - y);
|
||||||
|
|
||||||
double yDown = y - 360;
|
double yDown = y - 360;
|
||||||
double deltaMinDown = Math.abs(yMin - Math.abs(yDown));
|
double deltaMinDown = Math.abs(yMin - yDown);
|
||||||
|
|
||||||
double yUp = y + 360;
|
double yUp = y + 360;
|
||||||
double deltaMaxUp = Math.abs(yMax - Math.abs(yUp));
|
double deltaMaxUp = Math.abs(yMax - yUp);
|
||||||
|
|
||||||
if (!(deltaMin <= deltaMinDown && deltaMin <= deltaMaxUp)
|
if (!(deltaMin <= deltaMinDown && deltaMin <= deltaMaxUp)
|
||||||
&& !(deltaMax <= deltaMinDown && deltaMax <= deltaMaxUp)) {
|
&& !(deltaMax <= deltaMinDown && deltaMax <= deltaMaxUp)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user