blame | history | patch | commit | commitdiff
Normand Briere
2018-10-27 d34fd9341c61d13677e029cb187d4dacff5e44ea 
 timeflow/app/TimeflowApp.java
....@@ -25,7 +25,6 @@
2525 
2626 public class TimeflowApp extends JFrame
2727 {
28
-
2928         public TFModel model = new TFModel();
3029         public JFileChooser fileChooser;
3130         AboutWindow splash;
....@@ -36,10 +35,10 @@
3635         public JMenu filterMenu;
3736         JMenuItem save = new JMenuItem("Save");
3837         FilterControlPanel filterControlPanel;
39
-        LinkTabPane leftPanel;
38
+        //LinkTabPane
39
+                JTabbedPane leftPanel;
4040         TFListener filterMenuMaker = new TFListener()
4141         {
42
-
4342                 @Override
4443                 public void note(TFEvent e)
4544                 {
....@@ -70,35 +69,8 @@
7069                 }
7170         };
7271 
73
-        void splash(boolean visible)
72
+        public JMenuBar TimeFlowWindow(Container container) throws HeadlessException
7473         {
75
-                splash.setVisible(visible);
76
-        }
77
-
78
-        public void init() throws Exception
79
-        {
80
-                Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
81
-                setBounds(0, 0, Math.min(d.width, 1200), Math.min(d.height, 900));
82
-                setTitle(Display.version());
83
-                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
84
-                final QuitAction quitAction = new QuitAction(this, model);
85
-                addWindowListener(new WindowAdapter()
86
-                {
87
-
88
-                        @Override
89
-                        public void windowClosing(WindowEvent e)
90
-                        {
91
-                                quitAction.quit();
92
-                        }
93
-
94
-                        public void windowStateChanged(WindowEvent e)
95
-                        {
96
-                                repaint();
97
-                        }
98
-                });
99
-                Image icon = Toolkit.getDefaultToolkit().getImage("images/icon.gif");
100
-                setIconImage(icon);
101
-
10274                 // read example directory
10375                 String[] ex = getVisibleFiles("settings/examples");
10476                 int n = ex.length;
....@@ -115,18 +87,19 @@
11587                 templates = getVisibleFiles("settings/templates");
11688                 fileChooser = new JFileChooser(state.getCurrentFile());
11789 
118
-                getContentPane().setLayout(new BorderLayout());
90
+                container.setLayout(new BorderLayout());
11991 
12092                 // left tab area, with vertical gray divider.
12193                 JPanel leftHolder = new JPanel();
122
-                getContentPane().add(leftHolder, BorderLayout.WEST);
94
+                container.add(leftHolder, BorderLayout.EAST); // WEST);
12395 
12496                 leftHolder.setLayout(new BorderLayout());
12597                 JPanel pad = new Pad(3, 3);
12698                 pad.setBackground(Color.gray);
12799                 leftHolder.add(pad, BorderLayout.EAST);
128100 
129
-                leftPanel = new LinkTabPane();//JTabbedPane();
101
+                leftPanel = new //LinkTabPane();
102
+                                JTabbedPane();
130103                 leftHolder.add(leftPanel, BorderLayout.CENTER);
131104 
132105                 JPanel configPanel = new JPanel();
....@@ -141,18 +114,17 @@
141114                 configPanel.add(legend, BorderLayout.CENTER);
142115                 legend.add(new SizeLegendPanel(model), BorderLayout.NORTH);
143116                 legend.add(new ColorLegendPanel(model), BorderLayout.CENTER);
144
-                leftPanel.addTab(configPanel, "Display", true);
117
+                leftPanel.add(configPanel, "Display"); //, true);
145118 
146
-                leftPanel.addTab(filterControlPanel, "Filter", true);
119
+                leftPanel.add(filterControlPanel, "Filter"); //, true);
147120 
148121                 // center tab area
149122 
150123                 final LinkTabPane center = new LinkTabPane();
151
-                getContentPane().add(center, BorderLayout.CENTER);
124
+                container.add(center, BorderLayout.CENTER);
152125 
153126                 center.addPropertyChangeListener(new PropertyChangeListener()
154127                 {
155
-
156128                         @Override
157129                         public void propertyChange(PropertyChangeEvent evt)
158130                         {
....@@ -165,18 +137,18 @@
165137                 AbstractView[] views =
166138                 {
167139                         timeline,
168
-                        new CalendarView(model),
140
+                        //new CalendarView(model),
169141                         new ListView(model),
170142                         new TableView(model),
171143                         new BarGraphView(model),
172
-                        intro,
173
-                        new DescriptionView(model),
144
+                        //intro,
174145                         new SummaryView(model),
146
+                        new DescriptionView(model),
175147                 };
176148 
177149                 for (int i = 0; i < views.length; i++)
178150                 {
179
-                        center.addTab(views[i], views[i].getName(), i < 5);
151
+                        center.addTab(views[i], views[i].getName(), true); // i < 5);
180152                         displayPanel.addLocalControl(views[i].getName(), views[i].getControls());
181153                 }
182154 
....@@ -187,7 +159,6 @@
187159                 // but then, once data is loaded, switch directly to the timeline view.
188160                 model.addListener(new TFListener()
189161                 {
190
-
191162                         @Override
192163                         public void note(TFEvent e)
193164                         {
....@@ -203,7 +174,8 @@
203174                 });
204175 
205176                 JMenuBar menubar = new JMenuBar();
206
-                setJMenuBar(menubar);
177
+                
178
+                // frame.setJMenuBar(menubar);
207179 
208180                 JMenu fileMenu = new JMenu("File");
209181                 menubar.add(fileMenu);
....@@ -236,7 +208,6 @@
236208                 fileMenu.add(open);
237209                 open.addActionListener(new ActionListener()
238210                 {
239
-
240211                         @Override
241212                         public void actionPerformed(ActionEvent e)
242213                         {
....@@ -254,7 +225,6 @@
254225                 fileMenu.add(impDel);
255226                 impDel.addActionListener(new ActionListener()
256227                 {
257
-
258228                         @Override
259229                         public void actionPerformed(ActionEvent e)
260230                         {
....@@ -273,7 +243,6 @@
273243                 save.setEnabled(false);
274244                 save.addActionListener(new ActionListener()
275245                 {
276
-
277246                         @Override
278247                         public void actionPerformed(ActionEvent e)
279248                         {
....@@ -283,7 +252,6 @@
283252                 });
284253                 model.addListener(new TFListener()
285254                 {
286
-
287255                         @Override
288256                         public void note(TFEvent e)
289257                         {
....@@ -295,7 +263,6 @@
295263                 fileMenu.add(saveAs);
296264                 saveAs.addActionListener(new ActionListener()
297265                 {
298
-
299266                         @Override
300267                         public void actionPerformed(ActionEvent e)
301268                         {
....@@ -309,7 +276,6 @@
309276                 fileMenu.add(exportTSV);
310277                 exportTSV.addActionListener(new ActionListener()
311278                 {
312
-
313279                         @Override
314280                         public void actionPerformed(ActionEvent e)
315281                         {
....@@ -320,7 +286,6 @@
320286                 fileMenu.add(exportCSV);
321287                 exportCSV.addActionListener(new ActionListener()
322288                 {
323
-
324289                         @Override
325290                         public void actionPerformed(ActionEvent e)
326291                         {
....@@ -331,15 +296,14 @@
331296                 fileMenu.add(exportHTML);
332297                 exportHTML.addActionListener(new ActionListener()
333298                 {
334
-
335299                         @Override
336300                         public void actionPerformed(ActionEvent e)
337301                         {
338302                                 exportHtml();
339303                         }
340304                 });
341
-                fileMenu.addSeparator();
342
-                fileMenu.add(quitAction);
305
+//                fileMenu.addSeparator();
306
+//                fileMenu.add(quitAction);
343307 
344308                 JMenu editMenu = new JMenu("Edit");
345309                 menubar.add(editMenu);
....@@ -370,7 +334,6 @@
370334                         final String file = examples[i][1];
371335                         example.addActionListener(new ActionListener()
372336                         {
373
-
374337                                 @Override
375338                                 public void actionPerformed(ActionEvent e)
376339                                 {
....@@ -380,7 +343,7 @@
380343                 }
381344 
382345                 JMenu helpMenu = new JMenu("Help");
383
-                menubar.add(helpMenu);
346
+                //menubar.add(helpMenu);
384347 
385348                 helpMenu.add(new WebDocAction(this));
386349 
....@@ -388,7 +351,6 @@
388351                 helpMenu.add(about);
389352                 about.addActionListener(new ActionListener()
390353                 {
391
-
392354                         @Override
393355                         public void actionPerformed(ActionEvent e)
394356                         {
....@@ -398,7 +360,6 @@
398360 
399361                 model.addListener(new TFListener()
400362                 {
401
-
402363                         @Override
403364                         public void note(TFEvent e)
404365                         {
....@@ -414,6 +375,41 @@
414375                                 }
415376                         }
416377                 });
378
+                
379
+                return menubar;
380
+        }
381
+
382
+        void splash(boolean visible)
383
+        {
384
+                splash.setVisible(visible);
385
+        }
386
+
387
+        public void init() throws Exception
388
+        {
389
+                Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
390
+                setBounds(0, 0, Math.min(d.width, 1200), Math.min(d.height, 900));
391
+                setTitle(Display.version());
392
+                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
393
+//                final QuitAction quitAction = new QuitAction(this, model);
394
+//                addWindowListener(new WindowAdapter()
395
+//                {
396
+//                        @Override
397
+//                        public void windowClosing(WindowEvent e)
398
+//                        {
399
+//                                quitAction.quit();
400
+//                        }
401
+//
402
+//                        public void windowStateChanged(WindowEvent e)
403
+//                        {
404
+//                                repaint();
405
+//                        }
406
+//                });
407
+                Image icon = Toolkit.getDefaultToolkit().getImage("images/icon.gif");
408
+                setIconImage(icon);
409
+
410
+                Container container = getContentPane();
411
+
412
+                TimeFlowWindow(container);
417413         }
418414 
419415         void makeRecentFileMenu()