From 86f4e9c75951153ae9825f4772633e45698cb602 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 16 Dec 2018 21:21:43 -0500
Subject: [PATCH] Timeflow clean-up.
---
timeflow/app/TimeflowApp.java | 120 +++++++++++++++++++++++++++++------------------------------
1 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/timeflow/app/TimeflowApp.java b/timeflow/app/TimeflowApp.java
index b7b8442..a057ddb 100755
--- a/timeflow/app/TimeflowApp.java
+++ b/timeflow/app/TimeflowApp.java
@@ -25,8 +25,7 @@
public class TimeflowApp extends JFrame
{
-
- public TFModel model = new TFModel();
+ public TimeflowModel model = new TimeflowModel();
public JFileChooser fileChooser;
AboutWindow splash;
String[][] examples;
@@ -36,10 +35,10 @@
public JMenu filterMenu;
JMenuItem save = new JMenuItem("Save");
FilterControlPanel filterControlPanel;
- LinkTabPane leftPanel;
+ //LinkTabPane
+ JTabbedPane leftPanel;
TFListener filterMenuMaker = new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -70,35 +69,8 @@
}
};
- void splash(boolean visible)
+ public JMenuBar TimeFlowWindow(Container container) throws HeadlessException
{
- splash.setVisible(visible);
- }
-
- public void init() throws Exception
- {
- Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
- setBounds(0, 0, Math.min(d.width, 1200), Math.min(d.height, 900));
- setTitle(Display.version());
- setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- final QuitAction quitAction = new QuitAction(this, model);
- addWindowListener(new WindowAdapter()
- {
-
- @Override
- public void windowClosing(WindowEvent e)
- {
- quitAction.quit();
- }
-
- public void windowStateChanged(WindowEvent e)
- {
- repaint();
- }
- });
- Image icon = Toolkit.getDefaultToolkit().getImage("images/icon.gif");
- setIconImage(icon);
-
// read example directory
String[] ex = getVisibleFiles("settings/examples");
int n = ex.length;
@@ -112,21 +84,23 @@
examples[i][0] = s;
examples[i][1] = "settings/examples/" + ex[i];
}
+
templates = getVisibleFiles("settings/templates");
fileChooser = new JFileChooser(state.getCurrentFile());
- getContentPane().setLayout(new BorderLayout());
+ container.setLayout(new BorderLayout());
// left tab area, with vertical gray divider.
JPanel leftHolder = new JPanel();
- getContentPane().add(leftHolder, BorderLayout.WEST);
+ container.add(leftHolder, BorderLayout.EAST); // WEST);
leftHolder.setLayout(new BorderLayout());
JPanel pad = new Pad(3, 3);
pad.setBackground(Color.gray);
leftHolder.add(pad, BorderLayout.EAST);
- leftPanel = new LinkTabPane();//JTabbedPane();
+ leftPanel = new //LinkTabPane();
+ JTabbedPane();
leftHolder.add(leftPanel, BorderLayout.CENTER);
JPanel configPanel = new JPanel();
@@ -141,18 +115,17 @@
configPanel.add(legend, BorderLayout.CENTER);
legend.add(new SizeLegendPanel(model), BorderLayout.NORTH);
legend.add(new ColorLegendPanel(model), BorderLayout.CENTER);
- leftPanel.addTab(configPanel, "Display", true);
+ leftPanel.add(configPanel, "Display"); //, true);
- leftPanel.addTab(filterControlPanel, "Filter", true);
+ leftPanel.add(filterControlPanel, "Filter"); //, true);
// center tab area
final LinkTabPane center = new LinkTabPane();
- getContentPane().add(center, BorderLayout.CENTER);
+ container.add(center, BorderLayout.CENTER);
center.addPropertyChangeListener(new PropertyChangeListener()
{
-
@Override
public void propertyChange(PropertyChangeEvent evt)
{
@@ -165,18 +138,18 @@
AbstractView[] views =
{
timeline,
- new CalendarView(model),
+ //new CalendarView(model),
new ListView(model),
new TableView(model),
new BarGraphView(model),
- intro,
- new DescriptionView(model),
+ //intro,
new SummaryView(model),
+ new DescriptionView(model),
};
for (int i = 0; i < views.length; i++)
{
- center.addTab(views[i], views[i].getName(), i < 5);
+ center.addTab(views[i], views[i].getName(), true); // i < 5);
displayPanel.addLocalControl(views[i].getName(), views[i].getControls());
}
@@ -187,7 +160,6 @@
// but then, once data is loaded, switch directly to the timeline view.
model.addListener(new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -203,12 +175,15 @@
});
JMenuBar menubar = new JMenuBar();
- setJMenuBar(menubar);
+
+ // frame.setJMenuBar(menubar);
JMenu fileMenu = new JMenu("File");
menubar.add(fileMenu);
- fileMenu.add(new NewDataAction(this));
+ TimeflowAction tlAction = new NewDataAction(this);
+ fileMenu.add(tlAction);
+ tlAction.actionPerformed(null);
fileMenu.add(new CopySchemaAction(this));
JMenu templateMenu = new JMenu("New From Template");
@@ -231,12 +206,10 @@
fileMenu.addSeparator();
-
JMenuItem open = new JMenuItem("Open...");
fileMenu.add(open);
open.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -254,7 +227,6 @@
fileMenu.add(impDel);
impDel.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -273,7 +245,6 @@
save.setEnabled(false);
save.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -283,7 +254,6 @@
});
model.addListener(new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -295,7 +265,6 @@
fileMenu.add(saveAs);
saveAs.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -309,7 +278,6 @@
fileMenu.add(exportTSV);
exportTSV.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -320,7 +288,6 @@
fileMenu.add(exportCSV);
exportCSV.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -331,15 +298,14 @@
fileMenu.add(exportHTML);
exportHTML.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
exportHtml();
}
});
- fileMenu.addSeparator();
- fileMenu.add(quitAction);
+// fileMenu.addSeparator();
+// fileMenu.add(quitAction);
JMenu editMenu = new JMenu("Edit");
menubar.add(editMenu);
@@ -370,7 +336,6 @@
final String file = examples[i][1];
example.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -380,7 +345,7 @@
}
JMenu helpMenu = new JMenu("Help");
- menubar.add(helpMenu);
+ //menubar.add(helpMenu);
helpMenu.add(new WebDocAction(this));
@@ -388,7 +353,6 @@
helpMenu.add(about);
about.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -398,7 +362,6 @@
model.addListener(new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -414,6 +377,41 @@
}
}
});
+
+ return menubar;
+ }
+
+ void splash(boolean visible)
+ {
+ splash.setVisible(visible);
+ }
+
+ public void init() throws Exception
+ {
+ Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+ setBounds(0, 0, Math.min(d.width, 1200), Math.min(d.height, 900));
+ setTitle(Display.version());
+ setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+// final QuitAction quitAction = new QuitAction(this, model);
+// addWindowListener(new WindowAdapter()
+// {
+// @Override
+// public void windowClosing(WindowEvent e)
+// {
+// quitAction.quit();
+// }
+//
+// public void windowStateChanged(WindowEvent e)
+// {
+// repaint();
+// }
+// });
+ Image icon = Toolkit.getDefaultToolkit().getImage("images/icon.gif");
+ setIconImage(icon);
+
+ Container container = getContentPane();
+
+ TimeFlowWindow(container);
}
void makeRecentFileMenu()
--
Gitblit v1.6.2