unified the positions of the the action buttons and the filter boxes for some admin console panels (Events, Regattas, Leaderboards, LeaderboardGroups)

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java

@@ -150,9 +150,11 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
         VerticalPanel leaderboardsPanel = new VerticalPanel();
         leaderboardsCaptionPanel.add(leaderboardsPanel);
 
-        HorizontalPanel leaderboardConfigControlsPanel = new HorizontalPanel();
+        HorizontalPanel leaderboardControlsPanel = new HorizontalPanel();
         Label lblFilterEvents = new Label(stringMessages.filterLeaderboardsByName() + ": ");
-        leaderboardConfigControlsPanel.setSpacing(5);
+        leaderboardControlsPanel.setSpacing(5);
+        addLeaderboardControls(leaderboardControlsPanel);
+        leaderboardsPanel.add(leaderboardControlsPanel);
 
         AdminConsoleTableResources tableRes = GWT.create(AdminConsoleTableResources.class);
         leaderboardTable = new CellTable<StrippedLeaderboardDTO>(/* pageSize */10000, tableRes);
@@ -166,9 +168,9 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
                 return strings;
             }
         };
-        leaderboardConfigControlsPanel.add(filterLeaderboardPanel);
-        addLeaderboardConfigControls(leaderboardConfigControlsPanel);
-        leaderboardsPanel.add(leaderboardConfigControlsPanel);
+        filterLeaderboardPanel.getTextBox().ensureDebugId("LeaderboardsFilterTextBox");
+
+        leaderboardsPanel.add(filterLeaderboardPanel);
         leaderboardTable.ensureDebugId("AvailableLeaderboardsTable");
         addColumnsToLeaderboardTableAndSetSelectionModel(leaderboardTable, tableRes);
         @SuppressWarnings("unchecked")
@@ -183,10 +185,6 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
         });
         leaderboardList.addDataDisplay(leaderboardTable);
         leaderboardsPanel.add(leaderboardTable);
-        HorizontalPanel leaderboardButtonPanel = new HorizontalPanel();
-        leaderboardButtonPanel.setSpacing(5);
-        leaderboardsPanel.add(leaderboardButtonPanel);
-        addLeaderboardCreateControls(leaderboardButtonPanel);
         mainPanel.add(new Grid(1, 1));
 
         // caption panels for the selected leaderboard and tracked races
@@ -256,8 +254,7 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
         addSelectedLeaderboardRacesControls(selectedLeaderboardRaceButtonPanel);
     }
     
-    protected abstract void addLeaderboardConfigControls(Panel configPanel);
-    protected abstract void addLeaderboardCreateControls(Panel createPanel);
+    protected abstract void addLeaderboardControls(Panel controlsPanel);
     protected abstract void addSelectedLeaderboardRacesControls(Panel racesPanel);
     protected abstract void addColumnsToLeaderboardTableAndSetSelectionModel(CellTable<StrippedLeaderboardDTO> leaderboardTable, AdminConsoleTableResources tableRes);
     protected abstract void addColumnsToRacesTable(CellTable<RaceColumnDTOAndFleetDTOWithNameBasedEquality> racesTable);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java

@@ -164,7 +164,6 @@ public class EventListComposite extends Composite implements EventsRefresher, Le
             }
         });
         
-        panel.add(eventTable);
         filterTextbox = new LabeledAbstractFilterablePanel<EventDTO>(new Label(stringMessages.filterEventsByName()), allEvents,
                 eventTable, eventListDataProvider) {
             @Override
@@ -181,7 +180,8 @@ public class EventListComposite extends Composite implements EventsRefresher, Le
                 return result;
             }
         };
-        eventControlsPanel.add(filterTextbox);
+        panel.add(filterTextbox);
+        panel.add(eventTable);
         
         noEventsLabel = new Label("No events defined yet.");
         noEventsLabel.ensureDebugId("NoRegattasLabel");

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java

@@ -65,9 +65,7 @@ TrackedRaceChangedListener, LeaderboardsDisplayer {
     private final boolean showRaceDetails;
 
     private Button leaderboardRemoveButton;
-
     private Button addRaceColumnsButton;
-
     private Button columnMoveUpButton;
     private Button columnMoveDownButton;
 
@@ -93,8 +91,26 @@ TrackedRaceChangedListener, LeaderboardsDisplayer {
     }
     
     @Override
-    protected void addLeaderboardConfigControls(Panel configPanel) {
-        filterLeaderboardPanel.getTextBox().ensureDebugId("LeaderboardsFilterTextBox");
+    protected void addLeaderboardControls(Panel controlsPanel) {
+        Button createFlexibleLeaderboardBtn = new Button(stringMessages.createFlexibleLeaderboard() + "...");
+        createFlexibleLeaderboardBtn.ensureDebugId("CreateFlexibleLeaderboardButton");
+        controlsPanel.add(createFlexibleLeaderboardBtn);
+        createFlexibleLeaderboardBtn.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent clickEvent) {
+                createFlexibleLeaderboard();
+            }
+        });
+
+        Button createRegattaLeaderboardBtn = new Button(stringMessages.createRegattaLeaderboard() + "...");
+        createRegattaLeaderboardBtn.ensureDebugId("CreateRegattaLeaderboardButton");
+        controlsPanel.add(createRegattaLeaderboardBtn);
+        createRegattaLeaderboardBtn.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent clickEvent) {
+                createRegattaLeaderboard();
+            }
+        });
         
         leaderboardRemoveButton = new Button(stringMessages.remove());
         leaderboardRemoveButton.ensureDebugId("LeaderboardsRemoveButton");
@@ -107,7 +123,7 @@ TrackedRaceChangedListener, LeaderboardsDisplayer {
                 }
             }
         });
-        configPanel.add(leaderboardRemoveButton);
+        controlsPanel.add(leaderboardRemoveButton);
     }
     
     @Override
@@ -331,28 +347,6 @@ TrackedRaceChangedListener, LeaderboardsDisplayer {
         leaderboardTable.addColumnSortHandler(leaderboardColumnListHandler);
         leaderboardTable.setSelectionModel(selectionCheckboxColumn.getSelectionModel(), selectionCheckboxColumn.getSelectionManager());
     }
-
-    protected void addLeaderboardCreateControls(Panel createPanel) {
-        Button createFlexibleLeaderboardBtn = new Button(stringMessages.createFlexibleLeaderboard() + "...");
-        createFlexibleLeaderboardBtn.ensureDebugId("CreateFlexibleLeaderboardButton");
-        createPanel.add(createFlexibleLeaderboardBtn);
-        createFlexibleLeaderboardBtn.addClickHandler(new ClickHandler() {
-            @Override
-            public void onClick(ClickEvent clickEvent) {
-                createFlexibleLeaderboard();
-            }
-        });
-
-        Button createRegattaLeaderboardBtn = new Button(stringMessages.createRegattaLeaderboard() + "...");
-        createRegattaLeaderboardBtn.ensureDebugId("CreateRegattaLeaderboardButton");
-        createPanel.add(createRegattaLeaderboardBtn);
-        createRegattaLeaderboardBtn.addClickHandler(new ClickHandler() {
-            @Override
-            public void onClick(ClickEvent clickEvent) {
-                createRegattaLeaderboard();
-            }
-        });
-    }
     
     @Override
     protected void addColumnsToRacesTable(CellTable<RaceColumnDTOAndFleetDTOWithNameBasedEquality> racesTable) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java

@@ -422,16 +422,15 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
     private Widget createLeaderboardGroupsGUI(Resources tableRes) {
         CaptionPanel leaderboardGroupsCaptionPanel = new CaptionPanel(stringMessages.leaderboardGroups());
 
-        VerticalPanel leaderboardsGroupPanel = new VerticalPanel();
-        leaderboardGroupsCaptionPanel.add(leaderboardsGroupPanel);
+        VerticalPanel leaderboardGroupsContentPanel = new VerticalPanel();
+        leaderboardGroupsCaptionPanel.add(leaderboardGroupsContentPanel);
 
         // Create functional elements for the leaderboard groups
-        HorizontalPanel leaderboardGroupsFunctionPanel = new HorizontalPanel();
-        leaderboardGroupsFunctionPanel.setSpacing(5);
-        leaderboardsGroupPanel.add(leaderboardGroupsFunctionPanel);
+        HorizontalPanel leaderboardGroupsControlsPanel = new HorizontalPanel();
+        leaderboardGroupsControlsPanel.setSpacing(5);
+        leaderboardGroupsContentPanel.add(leaderboardGroupsControlsPanel);
 
         Label filterLeaderboardGroupsLbl = new Label(stringMessages.filterLeaderboardGroupsByName() + ":");
-        leaderboardGroupsFunctionPanel.add(filterLeaderboardGroupsLbl);
 
         //Create table for leaderboard groups
         groupsProvider = new ListDataProvider<LeaderboardGroupDTO>();
@@ -447,7 +446,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
             }
         };
         groupsFilterablePanel.getTextBox().ensureDebugId("LeaderboardGroupsFilterTextBox");
-        leaderboardGroupsFunctionPanel.add(groupsFilterablePanel);
+        leaderboardGroupsContentPanel.add(groupsFilterablePanel);
         
         Button createGroupButton = new Button(stringMessages.createNewLeaderboardGroup());
         createGroupButton.ensureDebugId("CreateLeaderboardGroupButton");
@@ -457,7 +456,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                 addNewGroup();
             }
         });
-        leaderboardGroupsFunctionPanel.add(createGroupButton);
+        leaderboardGroupsControlsPanel.add(createGroupButton);
         
         removeButton = new Button(stringMessages.remove());
         removeButton.ensureDebugId("RemoveLeaderboardButton");
@@ -475,7 +474,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                 }
             }
         });
-        leaderboardGroupsFunctionPanel.add(removeButton);
+        leaderboardGroupsControlsPanel.add(removeButton);
         Button refreshButton = new Button(stringMessages.refresh());
         refreshButton.ensureDebugId("RefreshLeaderboardGroupsButton");
         refreshButton.addClickHandler(new ClickHandler() {
@@ -485,7 +484,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                 leaderboardsRefresher.fillLeaderboards();
             }
         });
-        leaderboardGroupsFunctionPanel.add(refreshButton);
+        leaderboardGroupsControlsPanel.add(refreshButton);
         AnchorCell anchorCell = new AnchorCell();
         Column<LeaderboardGroupDTO, SafeHtml> groupNameColumn = new Column<LeaderboardGroupDTO, SafeHtml>(anchorCell) {
             @Override
@@ -580,7 +579,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
         groupsTable.setSelectionModel(groupsSelectionModel);
 
         groupsProvider.addDataDisplay(groupsTable);
-        leaderboardsGroupPanel.add(groupsTable);
+        leaderboardGroupsContentPanel.add(groupsTable);
 
         return leaderboardGroupsCaptionPanel;
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementPanel.java

@@ -301,10 +301,7 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf
     }
 
     @Override
-    protected void addLeaderboardConfigControls(Panel configPanel) {}
-
-    @Override
-    protected void addLeaderboardCreateControls(Panel createPanel) {}
+    protected void addLeaderboardControls(Panel controlsPanel) {}
 
     @Override
     protected void addSelectedLeaderboardRacesControls(Panel racesPanel) {