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;
..
..
@@ -72,7 +72,7 @@
72
72
         public JMenuBar TimeFlowWindow(Container container) throws HeadlessException
73
73
         {
74
74
                 // read example directory
75
-                String[] ex = getVisibleFiles("settings/examples");
75
+                String[] ex = getVisibleFiles("timeflow/settings/examples");
76
76
                 int n = ex.length;
77
77
                 examples = new String[n][2];
78
78
                 for (int i = 0; i < n; i++)
..
..
@@ -82,9 +82,10 @@
82
82
                         if (dot >= 0 && dot < s.length() - 1);
83
83
                         s = s.substring(0, dot);
84
84
                         examples[i][0] = s;
85
-                        examples[i][1] = "settings/examples/" + ex[i];
85
+                        examples[i][1] = "timeflow/settings/examples/" + ex[i];
86
86
                 }
87
-                templates = getVisibleFiles("settings/templates");
87
+                
88
+                templates = getVisibleFiles("timeflow/settings/templates");
88
89
                 fileChooser = new JFileChooser(state.getCurrentFile());
89
90
 
90
91
                 container.setLayout(new BorderLayout());
..
..
@@ -180,7 +181,9 @@
180
181
                 JMenu fileMenu = new JMenu("File");
181
182
                 menubar.add(fileMenu);
182
183
 
183
-                fileMenu.add(new NewDataAction(this));
184
+                TimeflowAction tlAction = new NewDataAction(this);
185
+                fileMenu.add(tlAction);
186
+                tlAction.actionPerformed(null);
184
187
                 fileMenu.add(new CopySchemaAction(this));
185
188
 
186
189
                 JMenu templateMenu = new JMenu("New From Template");
..
..
@@ -202,7 +205,6 @@
202
205
                 }
203
206
 
204
207
                 fileMenu.addSeparator();
205
-
206
208
 
207
209
                 JMenuItem open = new JMenuItem("Open...");
208
210
                 fileMenu.add(open);
..
..
@@ -552,7 +554,7 @@
552
554
                 }
553
555
                 try
554
556
                 {
555
-                        final File f = new File(fileName);
557
+                        final File f = new File(TimeflowApp.class.getClassLoader().getResource(fileName).toURI());
556
558
                         ActDB db = importer.importFile(f);
557
559
                         model.setDB(db, fileName, readOnly, TimeflowApp.this);
558
560
                         if (!readOnly)
..
..
@@ -691,15 +693,23 @@
691
693
 
692
694
         static String[] getVisibleFiles(String dir)
693
695
         {
694
-                String[] s = new File(dir).list();
695
-                ArrayList<String> real = new ArrayList<String>();
696
-                for (int i = 0; i < s.length; i++)
696
+                System.out.println("getVisibleFiles = " + dir);
697
+                try
697
698
                 {
698
-                        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++)
699
702
                         {
700
-                                real.add(s[i]);
703
+                                if (!s[i].startsWith("."))
704
+                                {
705
+                                        real.add(s[i]);
706
+                                }
701
707
                         }
708
+                        return (String[]) real.toArray(new String[0]);
702
709
                 }
703
-                return (String[]) real.toArray(new String[0]);
710
+                catch (Exception e)
711
+                {
712
+                        return new String[0];
713
+                }
704
714
         }
705
715
 }