reverted a refactoring which tried to avoid the creation of invisible components

This commit is contained in:
fmittag
2016-06-21 18:33:51 +02:00
parent a04f5ea8bf
commit 8809b728c6
2 changed files with 12 additions and 9 deletions
@@ -309,7 +309,7 @@ public class RaceBoardPanel extends AbstractPerspectiveComposite<RaceBoardPerspe
// create the default leaderboard and select the right race
raceTimesInfoProvider.addRaceTimesInfoProviderListener(raceMap);
List<Component<?>> componentsForSideBySideViewer = new ArrayList<Component<?>>();
if (getPerspectiveSettings().isChartSupportEnabled()) {
if (getPerspectiveSettings().isShowChartMarkEditMediaButtonsAndVideo()) {
competitorChart = new MultiCompetitorRaceChart(multiCompetitorRaceChartLifecycle, sailingService, asyncActionsExecutor,
competitorSelectionProvider, selectedRaceIdentifier, timer, timeRangeWithZoomModel, stringMessages,
errorReporter, true, true, leaderboardGroupName, leaderboardName);
@@ -324,18 +324,23 @@ public class RaceBoardPanel extends AbstractPerspectiveComposite<RaceBoardPerspe
windChart.setVisible(false);
windChart.getEntryWidget().setTitle(stringMessages.windChart());
componentsForSideBySideViewer.add(windChart);
editMarkPassingPanel = new EditMarkPassingsPanel(sailingService, selectedRaceIdentifier, stringMessages,
competitorSelectionProvider, errorReporter, timer);
}
editMarkPassingPanel = new EditMarkPassingsPanel(sailingService, selectedRaceIdentifier, stringMessages,
competitorSelectionProvider, errorReporter, timer);
if (getPerspectiveSettings().isShowChartMarkEditMediaButtonsAndVideo()) {
editMarkPassingPanel.setLeaderboard(leaderboardPanel.getLeaderboard());
editMarkPassingPanel.getEntryWidget().setTitle(stringMessages.editMarkPassings());
componentsForSideBySideViewer.add(editMarkPassingPanel);
editMarkPositionPanel = new EditMarkPositionPanel(raceMap, leaderboardPanel, selectedRaceIdentifier, leaderboardName, stringMessages, sailingService, timer, timeRangeWithZoomModel,
asyncActionsExecutor, errorReporter);
}
editMarkPositionPanel = new EditMarkPositionPanel(raceMap, leaderboardPanel, selectedRaceIdentifier, leaderboardName, stringMessages, sailingService, timer, timeRangeWithZoomModel,
asyncActionsExecutor, errorReporter);
if (getPerspectiveSettings().isShowChartMarkEditMediaButtonsAndVideo()) {
editMarkPositionPanel.setLeaderboard(leaderboardPanel.getLeaderboard());
componentsForSideBySideViewer.add(editMarkPositionPanel);
}
mediaPlayerManagerComponent = new MediaPlayerManagerComponent(mediaPlayerLifecycle,
selectedRaceIdentifier, raceTimesInfoProvider, timer, mediaService, userService, stringMessages,
errorReporter, userAgent, this, mediaPlayerSettings);
leaderboardAndMapViewer = new SideBySideComponentViewer(leaderboardPanel, raceMap, mediaPlayerManagerComponent,
@@ -91,9 +91,7 @@ public class SideBySideComponentViewer implements UserStatusEventHandler {
this.mediaManagementButton = createMediaManagementButton(mediaPlayerManagerComponent);
this.markPassingsPanel = markPassingsPanel;
this.markPositionPanel = markPositionPanel;
if (markPositionPanel != null) {
markPositionPanel.setComponentViewer(this);
}
markPositionPanel.setComponentViewer(this);
userService.addUserStatusEventHandler(this);
mediaPlayerManagerComponent.setPlayerChangeListener(new PlayerChangeListener() {
public void notifyStateChange() {