Timeflow clean-up.

Normand Briere

2018-12-17 86f4e9c75951153ae9825f4772633e45698cb602

 timeflow/app/ui/GlobalDisplayPanel.java
..
..
@@ -21,7 +21,7 @@
21
21
         JPanel globalControls = new JPanel();
22
22
         CardLayout localCards = new CardLayout();
23
23
 
24
-        public GlobalDisplayPanel(TFModel model, FilterControlPanel filterControls)
24
+        public GlobalDisplayPanel(TimeflowModel model, FilterControlPanel filterControls)
25
25
         {
26
26
                 super(model);
27
27
                 setBackground(Color.white);
..
..
@@ -56,12 +56,12 @@
56
56
                 };
57
57
                 label.setBackground(Color.lightGray);
58
58
                 label.setForeground(Color.darkGray);
59
-                globalLabel.add(label, BorderLayout.CENTER);
59
+                //globalLabel.add(label, BorderLayout.CENTER);
60
60
                 p.add(globalLabel, BorderLayout.NORTH);
61
61
 
62
62
                 JPanel global = new JPanel();
63
63
                 global.setLayout(new BorderLayout());
64
-                global.add(new StatusPanel(model, filterControls), BorderLayout.NORTH);
64
+                //global.add(new StatusPanel(model, filterControls), BorderLayout.NORTH);
65
65
 
66
66
                 encodings.setLayout(new GridLayout(4, 1));
67
67
                 encodings.setBackground(Color.white);
..
..
@@ -74,12 +74,13 @@
74
74
 
75
75
         public void showLocalControl(String name)
76
76
         {
77
-                localCards.show(localControls, name);
77
+                //localCards.show(localControls, name);
78
78
         }
79
79
 
80
80
         public void addLocalControl(String name, JComponent control)
81
81
         {
82
-                localControls.add(control, name);
82
+                if (name.equals("Timeline"))
83
+                        localControls.add(control, name);
83
84
         }
84
85
 
85
86
         void makeEncodingPanel()