Merge remote-tracking branch 'origin/master'

This commit is contained in:
Axel Uhl
2013-01-25 17:51:46 +01:00
3 changed files with 4 additions and 4 deletions
@@ -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;
@@ -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);
} }
@@ -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)) {