Much better AO.

Normand Briere

2018-10-27 d34fd9341c61d13677e029cb187d4dacff5e44ea

 timeflow/app/TimeflowApp.java
..
..
@@ -35,7 +35,8 @@
35
35
         public JMenu filterMenu;
36
36
         JMenuItem save = new JMenuItem("Save");
37
37
         FilterControlPanel filterControlPanel;
38
-        LinkTabPane leftPanel;
38
+        //LinkTabPane
39
+                JTabbedPane leftPanel;
39
40
         TFListener filterMenuMaker = new TFListener()
40
41
         {
41
42
                 @Override
..
..
@@ -68,7 +69,7 @@
68
69
                 }
69
70
         };
70
71
 
71
-        public void TimeFlowWindow(Container container, JFrame frame) throws HeadlessException
72
+        public JMenuBar TimeFlowWindow(Container container) throws HeadlessException
72
73
         {
73
74
                 // read example directory
74
75
                 String[] ex = getVisibleFiles("settings/examples");
..
..
@@ -90,14 +91,15 @@
90
91
 
91
92
                 // left tab area, with vertical gray divider.
92
93
                 JPanel leftHolder = new JPanel();
93
-                container.add(leftHolder, BorderLayout.WEST);
94
+                container.add(leftHolder, BorderLayout.EAST); // WEST);
94
95
 
95
96
                 leftHolder.setLayout(new BorderLayout());
96
97
                 JPanel pad = new Pad(3, 3);
97
98
                 pad.setBackground(Color.gray);
98
99
                 leftHolder.add(pad, BorderLayout.EAST);
99
100
 
100
-                leftPanel = new LinkTabPane();//JTabbedPane();
101
+                leftPanel = new //LinkTabPane();
102
+                                JTabbedPane();
101
103
                 leftHolder.add(leftPanel, BorderLayout.CENTER);
102
104
 
103
105
                 JPanel configPanel = new JPanel();
..
..
@@ -112,9 +114,9 @@
112
114
                 configPanel.add(legend, BorderLayout.CENTER);
113
115
                 legend.add(new SizeLegendPanel(model), BorderLayout.NORTH);
114
116
                 legend.add(new ColorLegendPanel(model), BorderLayout.CENTER);
115
-                leftPanel.addTab(configPanel, "Display", true);
117
+                leftPanel.add(configPanel, "Display"); //, true);
116
118
 
117
-                leftPanel.addTab(filterControlPanel, "Filter", true);
119
+                leftPanel.add(filterControlPanel, "Filter"); //, true);
118
120
 
119
121
                 // center tab area
120
122
 
..
..
@@ -135,18 +137,18 @@
135
137
                 AbstractView[] views =
136
138
                 {
137
139
                         timeline,
138
-                        new CalendarView(model),
140
+                        //new CalendarView(model),
139
141
                         new ListView(model),
140
142
                         new TableView(model),
141
143
                         new BarGraphView(model),
142
-                        intro,
143
-                        new DescriptionView(model),
144
+                        //intro,
144
145
                         new SummaryView(model),
146
+                        new DescriptionView(model),
145
147
                 };
146
148
 
147
149
                 for (int i = 0; i < views.length; i++)
148
150
                 {
149
-                        center.addTab(views[i], views[i].getName(), i < 5);
151
+                        center.addTab(views[i], views[i].getName(), true); // i < 5);
150
152
                         displayPanel.addLocalControl(views[i].getName(), views[i].getControls());
151
153
                 }
152
154
 
..
..
@@ -172,7 +174,8 @@
172
174
                 });
173
175
 
174
176
                 JMenuBar menubar = new JMenuBar();
175
-                frame.setJMenuBar(menubar);
177
+                
178
+                // frame.setJMenuBar(menubar);
176
179
 
177
180
                 JMenu fileMenu = new JMenu("File");
178
181
                 menubar.add(fileMenu);
..
..
@@ -340,7 +343,7 @@
340
343
                 }
341
344
 
342
345
                 JMenu helpMenu = new JMenu("Help");
343
-                menubar.add(helpMenu);
346
+                //menubar.add(helpMenu);
344
347
 
345
348
                 helpMenu.add(new WebDocAction(this));
346
349
 
..
..
@@ -372,6 +375,8 @@
372
375
                                 }
373
376
                         }
374
377
                 });
378
+                
379
+                return menubar;
375
380
         }
376
381
 
377
382
         void splash(boolean visible)
..
..
@@ -404,7 +409,7 @@
404
409
 
405
410
                 Container container = getContentPane();
406
411
 
407
-                TimeFlowWindow(container, this);
412
+                TimeFlowWindow(container);
408
413
         }
409
414
 
410
415
         void makeRecentFileMenu()