Fix timeflow examples.

Normand Briere

2019-04-24 92e4487d01f910c705211ffb5762a5c96bdd6d8c

 timeflow/app/TimeflowApp.java
..
..
@@ -25,7 +25,7 @@
25
25
 
26
26
 public class TimeflowApp extends JFrame
27
27
 {
28
-        public TFModel model = new TFModel();
28
+        public TimeflowModel model = new TimeflowModel();
29
29
         public JFileChooser fileChooser;
30
30
         AboutWindow splash;
31
31
         String[][] examples;
..
..
@@ -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
..
..
@@ -71,7 +72,7 @@
71
72
         public JMenuBar TimeFlowWindow(Container container) throws HeadlessException
72
73
         {
73
74
                 // read example directory
74
-                String[] ex = getVisibleFiles("settings/examples");
75
+                String[] ex = getVisibleFiles("timeflow/settings/examples");
75
76
                 int n = ex.length;
76
77
                 examples = new String[n][2];
77
78
                 for (int i = 0; i < n; i++)
..
..
@@ -81,23 +82,25 @@
81
82
                         if (dot >= 0 && dot < s.length() - 1);
82
83
                         s = s.substring(0, dot);
83
84
                         examples[i][0] = s;
84
-                        examples[i][1] = "settings/examples/" + ex[i];
85
+                        examples[i][1] = "timeflow/settings/examples/" + ex[i];
85
86
                 }
86
-                templates = getVisibleFiles("settings/templates");
87
+                
88
+                templates = getVisibleFiles("timeflow/settings/templates");
87
89
                 fileChooser = new JFileChooser(state.getCurrentFile());
88
90
 
89
91
                 container.setLayout(new BorderLayout());
90
92
 
91
93
                 // left tab area, with vertical gray divider.
92
94
                 JPanel leftHolder = new JPanel();
93
-                container.add(leftHolder, BorderLayout.WEST);
95
+                container.add(leftHolder, BorderLayout.EAST); // WEST);
94
96
 
95
97
                 leftHolder.setLayout(new BorderLayout());
96
98
                 JPanel pad = new Pad(3, 3);
97
99
                 pad.setBackground(Color.gray);
98
100
                 leftHolder.add(pad, BorderLayout.EAST);
99
101
 
100
-                leftPanel = new LinkTabPane();//JTabbedPane();
102
+                leftPanel = new //LinkTabPane();
103
+                                JTabbedPane();
101
104
                 leftHolder.add(leftPanel, BorderLayout.CENTER);
102
105
 
103
106
                 JPanel configPanel = new JPanel();
..
..
@@ -112,9 +115,9 @@
112
115
                 configPanel.add(legend, BorderLayout.CENTER);
113
116
                 legend.add(new SizeLegendPanel(model), BorderLayout.NORTH);
114
117
                 legend.add(new ColorLegendPanel(model), BorderLayout.CENTER);
115
-                leftPanel.addTab(configPanel, "Display", true);
118
+                leftPanel.add(configPanel, "Display"); //, true);
116
119
 
117
-                leftPanel.addTab(filterControlPanel, "Filter", true);
120
+                leftPanel.add(filterControlPanel, "Filter"); //, true);
118
121
 
119
122
                 // center tab area
120
123
 
..
..
@@ -135,18 +138,18 @@
135
138
                 AbstractView[] views =
136
139
                 {
137
140
                         timeline,
138
-                        new CalendarView(model),
141
+                        //new CalendarView(model),
139
142
                         new ListView(model),
140
143
                         new TableView(model),
141
144
                         new BarGraphView(model),
142
-                        intro,
143
-                        new DescriptionView(model),
145
+                        //intro,
144
146
                         new SummaryView(model),
147
+                        new DescriptionView(model),
145
148
                 };
146
149
 
147
150
                 for (int i = 0; i < views.length; i++)
148
151
                 {
149
-                        center.addTab(views[i], views[i].getName(), i < 5);
152
+                        center.addTab(views[i], views[i].getName(), true); // i < 5);
150
153
                         displayPanel.addLocalControl(views[i].getName(), views[i].getControls());
151
154
                 }
152
155
 
..
..
@@ -178,7 +181,9 @@
178
181
                 JMenu fileMenu = new JMenu("File");
179
182
                 menubar.add(fileMenu);
180
183
 
181
-                fileMenu.add(new NewDataAction(this));
184
+                TimeflowAction tlAction = new NewDataAction(this);
185
+                fileMenu.add(tlAction);
186
+                tlAction.actionPerformed(null);
182
187
                 fileMenu.add(new CopySchemaAction(this));
183
188
 
184
189
                 JMenu templateMenu = new JMenu("New From Template");
..
..
@@ -200,7 +205,6 @@
200
205
                 }
201
206
 
202
207
                 fileMenu.addSeparator();
203
-
204
208
 
205
209
                 JMenuItem open = new JMenuItem("Open...");
206
210
                 fileMenu.add(open);
..
..
@@ -550,7 +554,7 @@
550
554
                 }
551
555
                 try
552
556
                 {
553
-                        final File f = new File(fileName);
557
+                        final File f = new File(TimeflowApp.class.getClassLoader().getResource(fileName).toURI());
554
558
                         ActDB db = importer.importFile(f);
555
559
                         model.setDB(db, fileName, readOnly, TimeflowApp.this);
556
560
                         if (!readOnly)
..
..
@@ -689,15 +693,23 @@
689
693
 
690
694
         static String[] getVisibleFiles(String dir)
691
695
         {
692
-                String[] s = new File(dir).list();
693
-                ArrayList<String> real = new ArrayList<String>();
694
-                for (int i = 0; i < s.length; i++)
696
+                System.out.println("getVisibleFiles = " + dir);
697
+                try
695
698
                 {
696
-                        if (!s[i].startsWith("."))
699
+                        String[] s = new File(TimeflowApp.class.getClassLoader().getResource(dir).toURI()).list();
700
+                        ArrayList<String> real = new ArrayList<String>();
701
+                        for (int i = 0; i < s.length; i++)
697
702
                         {
698
-                                real.add(s[i]);
703
+                                if (!s[i].startsWith("."))
704
+                                {
705
+                                        real.add(s[i]);
706
+                                }
699
707
                         }
708
+                        return (String[]) real.toArray(new String[0]);
700
709
                 }
701
-                return (String[]) real.toArray(new String[0]);
710
+                catch (Exception e)
711
+                {
712
+                        return new String[0];
713
+                }
702
714
         }
703
715
 }