Merge branch 'master' into bug3265

This commit is contained in:
Axel Uhl committed 2015-09-21 14:52:44 +02:00
commit 0b16be7215
2 files changed
+12 -1

No files matched your search

@@ -212,7 +212,7 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
raceSelectionProvider = new RaceSelectionModel();
trackedRacesListComposite = new TrackedRacesListComposite(sailingService, errorReporter, regattaRefresher,
raceSelectionProvider, stringMessages, /* multiselection */false, /* actionButtonsEnabled */ false);
raceSelectionProvider, stringMessages, /* multiselection */false, isActionButtonsEnabled());
trackedRacesListComposite.ensureDebugId("TrackedRacesListComposite");
trackedRacesPanel.add(trackedRacesListComposite);
trackedRacesListComposite.addTrackedRaceChangeListener(this);
@@ -253,6 +253,10 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
addSelectedLeaderboardRacesControls(selectedLeaderboardRaceButtonPanel);
}
protected boolean isActionButtonsEnabled() {
return /* actionButtonsEnabled */ false;
}
protected abstract void addLeaderboardControls(Panel controlsPanel);
protected abstract void addSelectedLeaderboardRacesControls(Panel racesPanel);
@@ -70,6 +70,13 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf
importContent.add(deviceIdentifierTable);
}
/**
* When doing race log tracking, the Remove and Stop Tracking buttons are required.
*/
protected boolean isActionButtonsEnabled() {
return /* actionButtonsEnabled */ true;
}
@Override
protected void addColumnsToLeaderboardTableAndSetSelectionModel(CellTable<StrippedLeaderboardDTO> leaderboardTable, AdminConsoleTableResources tableResources) {
ListHandler<StrippedLeaderboardDTO> leaderboardColumnListHandler = new ListHandler<StrippedLeaderboardDTO>(