Merge branch 'master' into bug4375

Change-Id: Iefeaddd9be158c60186044a55f998579f52e922a
This commit is contained in:
Axel Uhl committed 2017-11-27 15:25:39 +01:00
commit abf6e7928d
2 files changed
+2 -9

No files matched your search

@@ -1933,7 +1933,7 @@ currentDepthInMeters=Wassertiefe
currentDriftInDegrees=Abdrift
currentLeewayInDegrees=Leeway (???)
currentRudderInDegrees=Ruder
currentSet=Set (???)
currentSet=Stromversatz
currentTackAngleInDegrees=Wendewinkel
currentDeflectorInMillimeters=Vorstags-Deflektor Abstand
currentDeflectorPercentage=Vorstags-Deflektor Anteil
@@ -671,8 +671,6 @@ public abstract class LeaderboardPanel<LS extends LeaderboardSettings> extends A
public void updateSettings(final LS newSettings) {
this.currentSettings = newSettings;
boolean oldShallAddOverallDetails = shallAddOverallDetails();
if (newSettings.getOverallDetailsToShow() != null) {
setValuesWithReferenceOrder(newSettings.getOverallDetailsToShow(), getAvailableOverallDetailColumnTypes(),
selectedOverallDetailColumns);
@@ -697,17 +695,14 @@ public abstract class LeaderboardPanel<LS extends LeaderboardSettings> extends A
}
}
}
applyDetailSettings(newSettings);
addBusyTask();
Runnable doWhenNecessaryDetailHasBeenLoaded = new Runnable() {
@Override
public void run() {
try {
// avoid expansion during updateLeaderboard(...); will expand
// later
// if it was expanded before
// later if it was expanded before
applyRaceSelection(newSettings);
updateLeaderboard(leaderboard);
postApplySettings(newSettings, columnsToExpandAgain);
@@ -715,8 +710,6 @@ public abstract class LeaderboardPanel<LS extends LeaderboardSettings> extends A
removeBusyTask();
}
}
};
boolean newShallAddOverallDetails = shallAddOverallDetails();
GWT.debugger();