little fix in design of StandingsView

xcpcio · Mar 21, 2016 · f4318db · f4318db
1 parent 6bd2c88
commit f4318db
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/src/main/java/ru/ifmo/acm/mainscreen/MainScreenStandingsView.java b/src/main/java/ru/ifmo/acm/mainscreen/MainScreenStandingsView.java
@@ -35,18 +35,6 @@ public Component getClockController() {
         return panel;
     }
 
-    public Component getStandingsTypeController() {
-        standingsOptimismLevel = new OptionGroup();
-        for (StandingsData.OptimismLevel type: StandingsData.OptimismLevel.values()) {
-            standingsOptimismLevel.addItem(type);
-        }
-        standingsOptimismLevel.setValue(StandingsData.OptimismLevel.NORMAL);
-        VerticalLayout panel = new VerticalLayout(standingsOptimismLevel);
-        setPanelDefaults(panel);
-
-        return panel;
-    }
-
     public String getClockStatus() {
         boolean status = mainScreenData.clockData.isClockVisible();
         return status ? clockStatuses[0] : clockStatuses[1];
@@ -140,9 +128,15 @@ public Component getStandingsController() {
         standingsShowAllBig = createStandingsControllerButton("Show all pages. Big standings", true, StandingsData.StandingsType.ALL_PAGES, true);
 
         CssLayout group = createGroupLayout(standingsShowTop1, standingsShowTop2, standingsShowAll, standingsShowTop1Big, standingsShowTop2Big, standingsShowAllBig, standingsHide);
+        standingsOptimismLevel = new OptionGroup();
+        for (StandingsData.OptimismLevel type: StandingsData.OptimismLevel.values()) {
+            standingsOptimismLevel.addItem(type);
+        }
+        standingsOptimismLevel.setValue(StandingsData.OptimismLevel.NORMAL);
 
         VerticalLayout panel = new VerticalLayout(
                 standingsStatus,
+                standingsOptimismLevel,
                 group
         );
         setPanelDefaults(panel);
@@ -188,10 +182,9 @@ public MainScreenStandingsView() {
 
         Component clockController = getClockController();
         Component standingsController = getStandingsController();
-        Component standingsTypeController = getStandingsTypeController();
         Component breakingNewsController = getBreakingNewsController();
 
-        VerticalLayout mainPanel = new VerticalLayout(clockController, standingsTypeController, standingsController, breakingNewsController);
+        VerticalLayout mainPanel = new VerticalLayout(clockController, standingsController, breakingNewsController);
         mainPanel.setSizeFull();
         setCompositionRoot(mainPanel);
     }