Fixing bug 1497 by not adding the toolbar panel to the main panel in all cases

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java

@@ -225,8 +225,6 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl implements
         // in this case, create a default regatta based on the TracTrac event data
         this.regatta = effectiveRegatta == null ? domainFactory.getOrCreateDefaultRegatta(raceLogStore, tractracEvent, trackedRegattaRegistry) : effectiveRegatta;
         trackedRegatta = trackedRegattaRegistry.getOrCreateTrackedRegatta(this.regatta);
-        // Read event data from configuration file
-        controlPointPositionPoller = scheduleClientParamsPHPPoller(paramURL, simulator, tracTracUpdateURI, delayToLiveInMillis, tracTracUsername, tracTracPassword);
         receivers = new HashSet<Receiver>();
         Set<TypeController> typeControllers = new HashSet<TypeController>();
         for (Receiver receiver : domainFactory.getUpdateReceivers(getTrackedRegatta(), tractracEvent, startOfTracking,
@@ -237,6 +235,8 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl implements
             }
         }
         addListenersForStoredDataAndStartController(typeControllers);
+        // Read event data from configuration file
+        controlPointPositionPoller = scheduleClientParamsPHPPoller(paramURL, simulator, tracTracUpdateURI, delayToLiveInMillis, tracTracUsername, tracTracPassword);
     }
 
     @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java

@@ -221,7 +221,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
         }
         FlowPanel logoAndTitlePanel = createLogoAndTitlePanel(raceBoardPanel);
         FlowPanel timePanel = createTimePanel(raceBoardPanel);
-        p.addNorth(logoAndTitlePanel, 68);        
+        p.addNorth(logoAndTitlePanel, 68);
         p.addNorth(toolbarPanel, 40);
         p.addSouth(timePanel, 90);                     
         p.add(raceBoardPanel);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java

@@ -160,7 +160,6 @@ public class RaceBoardPanel extends SimplePanel implements RegattaDisplayer, Rac
                 
         toolbarPanel = new FlowPanel();
         toolbarPanel.setWidth("100%");
-        mainPanel.add(toolbarPanel);
         componentControlsPanel = new FlowPanel();
         componentControlsPanel.addStyleName("raceBoardNavigation");
         toolbarPanel.add(componentControlsPanel);
@@ -181,7 +180,7 @@ public class RaceBoardPanel extends SimplePanel implements RegattaDisplayer, Rac
         }
         
         CompetitorsFilterSets loadedCompetitorsFilterSets = loadCompetitorsFilterSets();
-        if(loadedCompetitorsFilterSets != null) {
+        if (loadedCompetitorsFilterSets != null) {
             competitorsFilterSets = loadedCompetitorsFilterSets;
             insertSelectedCompetitorsFilter(competitorsFilterSets);
         } else {
@@ -190,9 +189,9 @@ public class RaceBoardPanel extends SimplePanel implements RegattaDisplayer, Rac
         }
         
         // in case the URL configuration contains the name of a competitors filter set we try to activate it  
-        if(raceboardViewConfiguration.getActiveCompetitorsFilterSetName() != null) {
-            for(FilterSet<CompetitorDTO, FilterWithUI<CompetitorDTO>> filterSet: competitorsFilterSets.getFilterSets()) {
-                if(filterSet.getName().equals(raceboardViewConfiguration.getActiveCompetitorsFilterSetName())) {
+        if (raceboardViewConfiguration.getActiveCompetitorsFilterSetName() != null) {
+            for (FilterSet<CompetitorDTO, FilterWithUI<CompetitorDTO>> filterSet: competitorsFilterSets.getFilterSets()) {
+                if (filterSet.getName().equals(raceboardViewConfiguration.getActiveCompetitorsFilterSetName())) {
                     competitorsFilterSets.setActiveFilterSet(filterSet);
                     break;
                 }
@@ -461,7 +460,7 @@ public class RaceBoardPanel extends SimplePanel implements RegattaDisplayer, Rac
     
     private <SettingsType> void addComponentToNavigationMenu(final ComponentViewer componentViewer,
             final Component<SettingsType> component, boolean isToogleCheckboxEnabled) {
-        final CheckBox checkBox= new CheckBox(component.getLocalizedShortName());
+        final CheckBox checkBox = new CheckBox(component.getLocalizedShortName());
         checkBox.getElement().getStyle().setFloat(Style.Float.LEFT);
 
         checkBox.setEnabled(isToogleCheckboxEnabled);
@@ -489,7 +488,7 @@ public class RaceBoardPanel extends SimplePanel implements RegattaDisplayer, Rac
 
         componentControlsPanel.add(checkBox);
 
-        if(component.hasSettings()) {
+        if (component.hasSettings()) {
             Button settingsButton = new Button("");
             settingsButton.addClickHandler(new ClickHandler() {
                 @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java

@@ -169,7 +169,7 @@ public class TVViewController implements RaceTimesInfoProviderListener {
             ScrollPanel leaderboardContentPanel = new ScrollPanel();
             leaderboardContentPanel.add(leaderboardPanel);
             dockPanel.add(leaderboardContentPanel);
-            if(logoAndTitlePanel != null) {
+            if (logoAndTitlePanel != null) {
                 logoAndTitlePanel.setSubTitle(leaderboardName);
             }
             currentLiveRace = null;
@@ -180,7 +180,7 @@ public class TVViewController implements RaceTimesInfoProviderListener {
     }
     
     private void showRaceBoard() {
-        if(activeTvView != TVViews.Raceboard) {
+        if (activeTvView != TVViews.Raceboard) {
             clearContentPanels();
             RaceBoardPanel raceBoardPanel = createRaceBoardPanel(leaderboardName, currentLiveRace);
             raceBoardPanel.setSize("100%", "100%");