Merge branch 'develop' of http://source.jalview.org/git/jalview into develop

diff --combined test/jalview/ws/jabaws/RNAStructExportImport.java
index 24578f1,8994e67..fe96e07
--- 1/test/jalview/ws/jabaws/RNAStructExportImport.java
--- 2/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@@ -36,6 -36,7 +36,7 @@@ import jalview.ws.jws2.jabaws2.Jws2Inst
  import jalview.ws.params.AutoCalcSetting;
  
  import java.awt.Component;
+ import java.io.File;
  import java.util.ArrayList;
  import java.util.List;
  
@@@ -51,6 -52,8 +52,8 @@@ import compbio.metadata.WrongParameterE
  
  public class RNAStructExportImport
  {
+   private static final String JAR_FILE_NAME = "testRnalifold_param.jar";
+ 
    public static String testseqs = "examples/RF00031_folded.stk";
  
    public static Jws2Discoverer disc;
@@@ -108,13 -111,18 +111,18 @@@
                                                        // public?
    }
  
 -  @AfterClass
 +  @AfterClass(alwaysRun = true)
    public static void tearDownAfterClass() throws Exception
    {
      if (af != null)
      {
        af.setVisible(false);
        af.dispose();
+       File f = new File(JAR_FILE_NAME);
+       if (f.exists())
+       {
+         f.delete();
+       }
      }
    }
  
@@@ -267,10 -275,10 +275,10 @@@
      // write out parameters
      jalview.gui.AlignFrame nalf = null;
      assertTrue("Couldn't write out the Jar file",
-             new Jalview2XML(false).saveAlignment(af,
-                     "testRnalifold_param.jar", "trial parameter writeout"));
+             new Jalview2XML(false).saveAlignment(af, JAR_FILE_NAME,
+                     "trial parameter writeout"));
      assertTrue("Couldn't read back the Jar file", (nalf = new Jalview2XML(
-             false).loadJalviewAlign("testRnalifold_param.jar")) != null);
+             false).loadJalviewAlign(JAR_FILE_NAME)) != null);
      if (nalf != null)
      {
        AutoCalcSetting acs = af.getViewport().getCalcIdSettingsFor(