.. | .. |
---|
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; |
---|
.. | .. |
---|
84 | 84 | examples[i][0] = s; |
---|
85 | 85 | examples[i][1] = "settings/examples/" + ex[i]; |
---|
86 | 86 | } |
---|
| 87 | + |
---|
87 | 88 | templates = getVisibleFiles("settings/templates"); |
---|
88 | 89 | fileChooser = new JFileChooser(state.getCurrentFile()); |
---|
89 | 90 | |
---|
.. | .. |
---|
137 | 138 | AbstractView[] views = |
---|
138 | 139 | { |
---|
139 | 140 | timeline, |
---|
140 | | - new CalendarView(model), |
---|
| 141 | + //new CalendarView(model), |
---|
141 | 142 | new ListView(model), |
---|
142 | 143 | new TableView(model), |
---|
143 | 144 | new BarGraphView(model), |
---|
144 | | - intro, |
---|
145 | | - new DescriptionView(model), |
---|
| 145 | + //intro, |
---|
146 | 146 | new SummaryView(model), |
---|
| 147 | + new DescriptionView(model), |
---|
147 | 148 | }; |
---|
148 | 149 | |
---|
149 | 150 | for (int i = 0; i < views.length; i++) |
---|
150 | 151 | { |
---|
151 | | - center.addTab(views[i], views[i].getName(), i < 5); |
---|
| 152 | + center.addTab(views[i], views[i].getName(), true); // i < 5); |
---|
152 | 153 | displayPanel.addLocalControl(views[i].getName(), views[i].getControls()); |
---|
153 | 154 | } |
---|
154 | 155 | |
---|
.. | .. |
---|
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 | 205 | } |
---|
203 | 206 | |
---|
204 | 207 | fileMenu.addSeparator(); |
---|
205 | | - |
---|
206 | 208 | |
---|
207 | 209 | JMenuItem open = new JMenuItem("Open..."); |
---|
208 | 210 | fileMenu.add(open); |
---|