From ad3ee2a1122847f9037848aab7efcd643f9f386a Mon Sep 17 00:00:00 2001
From: tcarver <tjc>
Date: Wed, 23 Oct 2013 15:42:50 +0100
Subject: [PATCH] JNLP properties need to begin with jnlp
---
uk/ac/sanger/artemis/components/ArtemisMain.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/uk/ac/sanger/artemis/components/ArtemisMain.java b/uk/ac/sanger/artemis/components/ArtemisMain.java
index a81bc97cc..4e4b90fdd 100644
--- a/uk/ac/sanger/artemis/components/ArtemisMain.java
+++ b/uk/ac/sanger/artemis/components/ArtemisMain.java
@@ -285,6 +285,16 @@ public class ArtemisMain extends Splash
**/
protected void readArgsAndOptions(final String [] args, final JFrame f)
{
+ // JNLP properties
+ if(System.getProperty("jnlp.chado") != null)
+ System.setProperty("chado", System.getProperty("jnlp.chado"));
+ if(System.getProperty("jnlp.offset") != null)
+ System.setProperty("offset", System.getProperty("jnlp.offset"));
+ if(System.getProperty("jnlp.artemis.environment") != null)
+ System.setProperty("artemis.environment", System.getProperty("jnlp.artemis.environment"));
+ if(System.getProperty("jnlp.sanger_options") != null)
+ System.setProperty("sanger_options", System.getProperty("jnlp.sanger_options"));
+
if(args.length == 0)
{
if(System.getProperty("chado") != null &&
--
GitLab