Filechooser is now common to all components

dinasv · Sep 5, 2018 · 3d4292c · 3d4292c
1 parent ae03f25
commit 3d4292c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/Main/java/MVC/View/InputParametersDialog.java b/src/Main/java/MVC/View/InputParametersDialog.java
@@ -56,9 +56,9 @@ public class InputParametersDialog extends JDialog {
 
  JFileChooser fc;
 
- public InputParametersDialog() {
+ public InputParametersDialog(JFileChooser fc) {
 
- fc = new JFileChooser(System.getProperty("user.dir"));
+ this.fc = fc;
  setTitle("Parameters");
 
  initLabels();

diff --git a/src/Main/java/MVC/View/MainFrame.java b/src/Main/java/MVC/View/MainFrame.java
@@ -31,11 +31,14 @@ public class MainFrame extends JFrame {
 
  private ProgressBar progressBar;
 
+ private JFileChooser fc;
+
  public MainFrame(CSBFinderController controller) {
  super("CSBFinder");
 
  setUIFont (new javax.swing.plaf.FontUIResource("Serif",Font.PLAIN,16));
 
+ fc = new JFileChooser(System.getProperty("user.dir"));
 
  this.controller = controller;
 
@@ -72,9 +75,9 @@ public void clearPanels(){
 
  public void initComponents() {
 
- inputParamsDialog = new InputParametersDialog();
+ inputParamsDialog = new InputParametersDialog(fc);
 
- toolbar = new Toolbar();
+ toolbar = new Toolbar(fc);
  genomes = new GenomePanel();
  summaryPanel = new SummaryPanel();
 

diff --git a/src/Main/java/MVC/View/Toolbar.java b/src/Main/java/MVC/View/Toolbar.java
@@ -21,9 +21,8 @@ public class Toolbar extends JPanel {
 
  private JFileChooser fc;
 
- public Toolbar() {
-
- fc = new JFileChooser(System.getProperty("user.dir"));
+ public Toolbar(JFileChooser fc) {
+ this.fc = fc;
 
  setBorder(BorderFactory.createEtchedBorder());
  loadFile = new JButton("Load Input Genomes");