added the new breadcrumb to the raceboardPanel

This commit is contained in:
fmittag committed 2012-02-02 18:33:57 +01:00
1 parent 89a35cc357
commit 0363789f2e
2 files changed
+19 -20

No files matched your search

@@ -114,7 +114,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
return; return;
} }
createRaceBoardPanel(selectedRace, events, eventName, leaderboardName); createRaceBoardPanel(selectedRace, events, leaderboardGroup);
} }
private RaceDTO findRace(String eventName, String raceName, List<EventDTO> events) { private RaceDTO findRace(String eventName, String raceName, List<EventDTO> events) {
@@ -132,13 +132,13 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
return null; return null;
} }
private void createRaceBoardPanel(RaceDTO selectedRace, List<EventDTO> events, String eventName, String leaderboardName) { private void createRaceBoardPanel(RaceDTO selectedRace, List<EventDTO> events, LeaderboardGroupDTO leaderboardGroup) {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages); LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages);
logoAndTitlePanel.addStyleName("LogoAndTitlePanel"); logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
RaceSelectionModel raceSelectionModel = new RaceSelectionModel(); RaceSelectionModel raceSelectionModel = new RaceSelectionModel();
List<RaceIdentifier> singletonList = Collections.singletonList(selectedRace.getRaceIdentifier()); List<RaceIdentifier> singletonList = Collections.singletonList(selectedRace.getRaceIdentifier());
raceSelectionModel.setSelection(singletonList); raceSelectionModel.setSelection(singletonList);
raceBoardPanel = new RaceBoardPanel(sailingService, raceSelectionModel, leaderboardName, raceBoardPanel = new RaceBoardPanel(sailingService, raceSelectionModel, leaderboardName, leaderboardGroup,
RaceBoardEntryPoint.this, stringMessages); RaceBoardEntryPoint.this, stringMessages);
raceBoardPanel.fillEvents(events); raceBoardPanel.fillEvents(events);
@@ -146,7 +146,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
FlowPanel raceBoardHeaderPanel = new FlowPanel(); FlowPanel raceBoardHeaderPanel = new FlowPanel();
raceBoardHeaderPanel.addStyleName("RaceBoardHeaderPanel"); raceBoardHeaderPanel.addStyleName("RaceBoardHeaderPanel");
raceBoardHeaderPanel.add(raceBoardPanel.getHeaderWidget()); raceBoardHeaderPanel.add(raceBoardPanel.getBreadcrumbWidget());
FlowPanel contentOuterPanel = new FlowPanel(); // outer div which centered page content FlowPanel contentOuterPanel = new FlowPanel(); // outer div which centered page content
contentOuterPanel.addStyleName("contentOuterPanel"); contentOuterPanel.addStyleName("contentOuterPanel");
@@ -9,14 +9,14 @@ import java.util.Map;
import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.FormPanel; import com.google.gwt.user.client.ui.FormPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.RaceIdentifier;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.gwt.ui.adminconsole.RaceMap; import com.sap.sailing.gwt.ui.adminconsole.RaceMap;
import com.sap.sailing.gwt.ui.adminconsole.RaceMapSettings; import com.sap.sailing.gwt.ui.adminconsole.RaceMapSettings;
import com.sap.sailing.gwt.ui.adminconsole.WindChart; import com.sap.sailing.gwt.ui.adminconsole.WindChart;
@@ -34,9 +34,11 @@ import com.sap.sailing.gwt.ui.client.Timer.PlayModes;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;
import com.sap.sailing.gwt.ui.shared.EventDTO; import com.sap.sailing.gwt.ui.shared.EventDTO;
import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
import com.sap.sailing.gwt.ui.shared.RaceDTO; import com.sap.sailing.gwt.ui.shared.RaceDTO;
import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sailing.gwt.ui.shared.RegattaDTO;
import com.sap.sailing.gwt.ui.shared.components.ComponentViewer; import com.sap.sailing.gwt.ui.shared.components.ComponentViewer;
import com.sap.sailing.gwt.ui.shared.panels.BreadcrumbPanel;
/** /**
* A panel showing a list of components visualizing a race from the events announced by calls to {@link #fillEvents(List)}. * A panel showing a list of components visualizing a race from the events announced by calls to {@link #fillEvents(List)}.
@@ -58,15 +60,14 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
private final Map<RaceIdentifier, RaceDTO> racesByIdentifier; private final Map<RaceIdentifier, RaceDTO> racesByIdentifier;
private final List<CollapsableComponentViewer<?>> collapsableViewers; private final List<CollapsableComponentViewer<?>> collapsableViewers;
private final HorizontalPanel componentsHeaderPanel;
private final FlowPanel componentsNavigationPanel; private final FlowPanel componentsNavigationPanel;
private final HorizontalPanel componentsHeaderNamePanel; private final BreadcrumbPanel breadcrumbPanel;
private final TimePanel timePanel; private final TimePanel timePanel;
private final Timer timer; private final Timer timer;
private final RaceSelectionProvider raceSelectionProvider; private final RaceSelectionProvider raceSelectionProvider;
public RaceBoardPanel(SailingServiceAsync sailingService, RaceSelectionProvider raceSelectionProvider, String leaderboardName, public RaceBoardPanel(SailingServiceAsync sailingService, RaceSelectionProvider raceSelectionProvider, String leaderboardName,
ErrorReporter errorReporter, final StringMessages stringMessages) { LeaderboardGroupDTO leaderboardGroup, ErrorReporter errorReporter, final StringMessages stringMessages) {
this.sailingService = sailingService; this.sailingService = sailingService;
this.raceSelectionProvider = raceSelectionProvider; this.raceSelectionProvider = raceSelectionProvider;
raceSelectionProvider.addRaceSelectionChangeListener(this); raceSelectionProvider.addRaceSelectionChangeListener(this);
@@ -82,17 +83,15 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
collapsableViewers = new ArrayList<CollapsableComponentViewer<?>>(); collapsableViewers = new ArrayList<CollapsableComponentViewer<?>>();
CompetitorSelectionModel competitorSelectionModel = new CompetitorSelectionModel(/* hasMultiSelection */ true); CompetitorSelectionModel competitorSelectionModel = new CompetitorSelectionModel(/* hasMultiSelection */ true);
componentsHeaderPanel = new HorizontalPanel(); String debugParam = Window.Location.getParameter("gwt.codesvr");
componentsHeaderPanel.addStyleName("raceBoardPanelHeader"); String link = "/gwt/Spectator.html" + (debugParam != null && !debugParam.isEmpty() ? "?gwt.codesvr=" + debugParam : "");
mainPanel.add(componentsHeaderPanel); ArrayList<Pair<String, String>> breadcrumbLinksData = new ArrayList<Pair<String, String>>();
breadcrumbLinksData.add(new Pair<String, String>(link, stringMessages.home()));
breadcrumbPanel = new BreadcrumbPanel(breadcrumbLinksData, selectedRaceIdentifier.getRaceName());
mainPanel.add(breadcrumbPanel);
componentsNavigationPanel = new FlowPanel(); componentsNavigationPanel = new FlowPanel();
componentsNavigationPanel.addStyleName("raceBoardNavigation"); componentsNavigationPanel.addStyleName("raceBoardNavigation");
componentsHeaderNamePanel = new HorizontalPanel();
componentsHeaderPanel.add(componentsHeaderNamePanel);
Label eventNameLabel = new Label(selectedRaceIdentifier.getRaceName());
eventNameLabel.setStyleName("raceBoardPanelHeader-name");
componentsHeaderNamePanel.add(eventNameLabel);
// create the default leaderboard and select the right race // create the default leaderboard and select the right race
LeaderboardPanel leaderboardPanel = new LeaderboardPanel(sailingService, selectedRaceIdentifier, competitorSelectionModel, LeaderboardPanel leaderboardPanel = new LeaderboardPanel(sailingService, selectedRaceIdentifier, competitorSelectionModel,
@@ -146,8 +145,8 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
return componentsNavigationPanel; return componentsNavigationPanel;
} }
public Widget getHeaderWidget() { public Widget getBreadcrumbWidget() {
return componentsHeaderPanel; return breadcrumbPanel;
} }
public Widget getTimeWidget() { public Widget getTimeWidget() {