diff --git a/etc/versions b/etc/versions index b602a4f351dd5bb490e4a24431d627a41edf98c0..421ae9799d4195db9eaba97fbcc4226e4b96109b 100644 --- a/etc/versions +++ b/etc/versions @@ -1,4 +1,4 @@ -Artemis Release 15.1.9 -ACT Release 12.1.9 +Artemis Release 15.1.10 +ACT Release 12.1.10 DNAPlotter Release 1.11 BamView 1.2.10 \ No newline at end of file diff --git a/uk/ac/sanger/artemis/components/ActMain.java b/uk/ac/sanger/artemis/components/ActMain.java index 403dd36503cee447d73bb82a53145939583bc1bf..fabcbb50da3b1918596475ca3cdcea675b6743a0 100644 --- a/uk/ac/sanger/artemis/components/ActMain.java +++ b/uk/ac/sanger/artemis/components/ActMain.java @@ -140,7 +140,7 @@ public class ActMain extends Splash final InputStreamProgressListener progress_listener, final Object[] file_names) { - + processJnlpAttributes(); final ProgressThread progress_thread = new ProgressThread(null, "Loading Entry..."); diff --git a/uk/ac/sanger/artemis/components/ArtemisMain.java b/uk/ac/sanger/artemis/components/ArtemisMain.java index 40c8ffad3d39e03157c564f56d8ae36500c0a962..44f18d53b30b96537bc3177e1da8137c6b86bb55 100644 --- a/uk/ac/sanger/artemis/components/ArtemisMain.java +++ b/uk/ac/sanger/artemis/components/ArtemisMain.java @@ -44,7 +44,6 @@ import org.biojava.bio.seq.io.SequenceFormat; import java.awt.event.*; import java.awt.Toolkit; import java.io.*; -import java.util.Properties; import java.util.Vector; import java.awt.datatransfer.*; import javax.swing.JFrame; @@ -280,28 +279,6 @@ public class ArtemisMain extends Splash }; entryWorker.start(); } - - /** - * Web start properties need to begin with "javaws." or "jnlp. - */ - private void processJnlpAttributes() - { - // JNLP properties - final Properties properties = System.getProperties(); - for(String key : properties.stringPropertyNames()) - { - if( key.equals("jnlp.chado") || - key.equals("jnlp.offset") || - key.equals("jnlp.artemis.environment") || - key.equals("jnlp.sanger_options") || - key.equals("jnlp.read_only") || - key.startsWith("jnlp.bam") || - key.startsWith("jnlp.userplot") || - key.startsWith("jnlp.loguserplot") || - key.startsWith("jnlp.show_") ) - System.setProperty(key.substring(5), System.getProperty(key)); - } - } /** * Read the entries named in args and in the diana.ini file. diff --git a/uk/ac/sanger/artemis/components/Splash.java b/uk/ac/sanger/artemis/components/Splash.java index ea1b989dee87e21f6913db817a5ba9f72b68083c..8daea10c577482d90f8bb1c3ea8e6f852f33e621 100644 --- a/uk/ac/sanger/artemis/components/Splash.java +++ b/uk/ac/sanger/artemis/components/Splash.java @@ -349,6 +349,29 @@ abstract public class Splash extends JFrame icon); } + /** + * Web start properties need to begin with "javaws." or "jnlp. + */ + protected static void processJnlpAttributes() + { + // JNLP properties + final Properties properties = System.getProperties(); + for(String key : properties.stringPropertyNames()) + { + if( key.equals("jnlp.black_belt_mode") || + key.equals("jnlp.chado") || + key.equals("jnlp.offset") || + key.equals("jnlp.artemis.environment") || + key.equals("jnlp.sanger_options") || + key.equals("jnlp.read_only") || + key.startsWith("jnlp.bam") || + key.startsWith("jnlp.userplot") || + key.startsWith("jnlp.loguserplot") || + key.startsWith("jnlp.show_") ) + System.setProperty(key.substring(5), System.getProperty(key)); + } + } + protected void loadFile(final String fileName) { if(this instanceof ArtemisMain)