JAL-3032 prefer Jalview.isJS() to j2sNative

[jalview.git] / src / jalview / io / JalviewFileChooser.java

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 9667d7f..56b8637 100755 (executable)
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -22,6 +22,7 @@
 package jalview.io;
 
 import jalview.bin.Cache;
+import jalview.bin.Jalview;
 import jalview.gui.JvOptionPane;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
@@ -126,7 +127,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
   public JalviewFileChooser(String dir)
   {
     super(safePath(dir));
-    setAccessory(new RecentlyOpened(this));
+    setAccessory(new RecentlyOpened());
   }
 
   public JalviewFileChooser(String dir, String[] suffix, String[] desc,
@@ -193,15 +194,13 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
   {
     int value = super.showOpenDialog(this);
     
-    /*
-     * code below here is not reached in JalviewJS, instead
-     * propertyChange() is called for dialog action
-     */
-    /**
-     * @j2sNative
-     */
+    if (!Jalview.isJS())
     {
-    handleResponse(value);
+      /*
+       * code here is not run in JalviewJS, instead
+       * propertyChange() is called for dialog action
+       */
+      handleResponse(value);
     }
     return value;
   }
@@ -238,7 +237,7 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
       setFileFilter(chosen);
     }
 
-    setAccessory(new RecentlyOpened(this));
+    setAccessory(new RecentlyOpened());
   }
 
   @Override
@@ -423,6 +422,78 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
     }
   }
 
+  class RecentlyOpened extends JPanel
+  {
+    private static final long serialVersionUID = 1L;
+    JList<String> list;
+
+    RecentlyOpened()
+    {
+      setPreferredSize(new Dimension(300,100));
+      String historyItems = Cache.getProperty("RECENT_FILE");
+      StringTokenizer st;
+      Vector<String> recent = new Vector<>();
+
+      if (historyItems != null)
+      {
+        st = new StringTokenizer(historyItems, "\t");
+
+        while (st.hasMoreTokens())
+        {
+          recent.addElement(st.nextToken());
+        }
+      }
+
+      list = new JList<>(recent);
+  
+      DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
+//      dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
+      list.setCellRenderer(dlcr);
+
+      list.addMouseListener(new MouseAdapter()
+      {
+        @Override
+        public void mousePressed(MouseEvent evt)
+        {
+          recentListSelectionChanged(list.getSelectedValue());
+        }
+      });
+
+      this.setBorder(new javax.swing.border.TitledBorder(
+              MessageManager.getString("label.recently_opened")));
+
+      final JScrollPane scroller = new JScrollPane(list);
+
+      SpringLayout layout = new SpringLayout();
+      layout.putConstraint(SpringLayout.WEST, scroller, 5,
+              SpringLayout.WEST, this);
+      layout.putConstraint(SpringLayout.NORTH, scroller, 5,
+              SpringLayout.NORTH, this);
+
+      if (Platform.isAMac())
+      {
+        scroller.setPreferredSize(new Dimension(500, 100));
+      }
+      else
+      {
+        scroller.setPreferredSize(new Dimension(530, 200));
+      }
+
+      this.add(scroller);
+
+      javax.swing.SwingUtilities.invokeLater(new Runnable()
+      {
+        @Override
+        public void run()
+        {
+          scroller.getHorizontalScrollBar()
+                  .setValue(scroller.getHorizontalScrollBar().getMaximum());
+        }
+      });
+
+    }
+
+  }
 
   @Override
   public DialogRunnerI setResponseHandler(Object response, Runnable action)
@@ -470,78 +541,3 @@ public class JalviewFileChooser extends JFileChooser implements DialogRunnerI,
     }
   }
 }
-
-class RecentlyOpened extends JPanel
-{
-  private static final long serialVersionUID = 1L;
-  JList<String> list;
-  private JalviewFileChooser chooser;
-
-  RecentlyOpened(JalviewFileChooser chooser) 
-  {
-       this.chooser = chooser;
-    setPreferredSize(new Dimension(300,100));
-    String historyItems = Cache.getProperty("RECENT_FILE");
-    StringTokenizer st;
-    Vector<String> recent = new Vector<>();
-
-    if (historyItems != null)
-    {
-      st = new StringTokenizer(historyItems, "\t");
-
-      while (st.hasMoreTokens())
-      {
-        recent.addElement(st.nextToken());
-      }
-    }
-
-    list = new JList<>(recent);
-
-    DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
-//    dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT);
-    list.setCellRenderer(dlcr);
-
-    list.addMouseListener(new MouseAdapter()
-    {
-      @Override
-      public void mousePressed(MouseEvent evt)
-      {
-        chooser.recentListSelectionChanged(list.getSelectedValue());
-      }
-    });
-
-    this.setBorder(new javax.swing.border.TitledBorder(
-            MessageManager.getString("label.recently_opened")));
-
-    final JScrollPane scroller = new JScrollPane(list);
-
-    SpringLayout layout = new SpringLayout();
-    layout.putConstraint(SpringLayout.WEST, scroller, 5,
-            SpringLayout.WEST, this);
-    layout.putConstraint(SpringLayout.NORTH, scroller, 5,
-            SpringLayout.NORTH, this);
-
-    if (Platform.isAMac())
-    {
-      scroller.setPreferredSize(new Dimension(500, 100));
-    }
-    else
-    {
-      scroller.setPreferredSize(new Dimension(530, 200));
-    }
-
-    this.add(scroller);
-
-    javax.swing.SwingUtilities.invokeLater(new Runnable()
-    {
-      @Override
-      public void run()
-      {
-        scroller.getHorizontalScrollBar()
-                .setValue(scroller.getHorizontalScrollBar().getMaximum());
-      }
-    });
-
-  }
-
-}