From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 17 Dec 2018 17:25:49 +0000 (+0000)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~343^2~2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=1d01c9f62d4a2d2070d1296abe79a1e0dc7a3d7d

Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2

Conflicts:
	src/jalview/io/JalviewFileChooser.java
---

1d01c9f62d4a2d2070d1296abe79a1e0dc7a3d7d
diff --cc src/jalview/io/JalviewFileChooser.java
index 9c99603,2419bef..81cb510
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@@ -313,15 -323,14 +311,10 @@@ public class JalviewFileChooser extend
    @Override
    public File getSelectedFile()
    {
 -    File selfile = super.getSelectedFile();
 -    if (selfile == null && ourselectedFile != null)
 -    {
 -      return ourselectedFile;
 -    }
 -    return selfile;
 +    File f = super.getSelectedFile();
 +    return f == null ? selectedFile : f;
    }
  
-   /**
-    * Overridden for JalviewJS compatibility: only one thread in Javascript, 
-    * so we can't wait for user choice in another thread and then perform the 
-    * desired action
-    */
    @Override
    public int showSaveDialog(Component parent) throws HeadlessException
    {
@@@ -423,23 -434,15 +418,15 @@@
      }
    }
  
-   /**
-    * A panel to set as the 'accessory' component to the file chooser dialog,
-    * holding a list of recently opened files (if any). These are held as a
-    * tab-separated list of file paths under key <code>RECENT_FILE</code> in
-    * <code>.jalview_properties</code>. A click in the list calls a method in
-    * JalviewFileChooser to set the chosen file as the selection.
-    */
    class RecentlyOpened extends JPanel
    {
 +    private static final long serialVersionUID = 1L;
- 
      JList<String> list;
  
 -    public RecentlyOpened()
 +    RecentlyOpened()
      {
 -
        setPreferredSize(new Dimension(300,100));
 -      String historyItems = jalview.bin.Cache.getProperty("RECENT_FILE");
 +      String historyItems = Cache.getProperty("RECENT_FILE");
        StringTokenizer st;
        Vector<String> recent = new Vector<>();