From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 17 Dec 2018 14:20:27 +0000 (+0000)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
X-Git-Tag: Release_2_11_4_0~45^2~18^2~343^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bd7b3138379c2db8507fe7e8d25f5a921e2d9df7;p=jalview.git

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

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

bd7b3138379c2db8507fe7e8d25f5a921e2d9df7
diff --cc src/jalview/io/JalviewFileChooser.java
index 6fa6016,b7eeaab..9c99603
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@@ -423,22 -465,15 +423,23 @@@ public class JalviewFileChooser extend
      }
    }
  
 +  /**
 +   * 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<>();