X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbin%2FJalviewLite.java;fp=src%2Fjalview%2Fbin%2FJalviewLite.java;h=ae8bc98d92a970750eb4cfe70c4a4dc7184f1513;hb=b8810711642d8473325c8a3d3e76cc5c3c9b5bbd;hp=ef1e16e17d7ae1d3519146f2326af57390a234ed;hpb=936d4dc095734df2b1e9f3bf9e0bd29b9c86434c;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index ef1e16e..ae8bc98 100644 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -1269,7 +1269,7 @@ public class JalviewLite extends Applet implements public static boolean debug = false; - static String builddate = null, version = null; + static String builddate = null, version = null, installation = null; private static void initBuildDetails() { @@ -1277,6 +1277,7 @@ public class JalviewLite extends Applet implements { builddate = "unknown"; version = "test"; + installation = "Webstart"; java.net.URL url = JalviewLite.class .getResource("/.build_properties"); if (url != null) @@ -1296,6 +1297,10 @@ public class JalviewLite extends Applet implements { builddate = line.substring(line.indexOf("=") + 1); } + if (line.indexOf("INSTALLATION") > -1) + { + installation = line.substring(line.indexOf("=") + 1); + } } } catch (Exception ex) { @@ -1311,6 +1316,12 @@ public class JalviewLite extends Applet implements return builddate; } + public static String getInstallation() + { + initBuildDetails(); + return installation; + } + public static String getVersion() { initBuildDetails(); @@ -1360,6 +1371,7 @@ public class JalviewLite extends Applet implements System.err.println("JalviewLite Version " + getVersion()); System.err.println("Build Date : " + getBuildDate()); + System.err.println("Installation : " + getInstallation()); } String externalsviewer = getParameter("externalstructureviewer"); @@ -2076,10 +2088,12 @@ public class JalviewLite extends Applet implements { String sequence = applet.getParameter("PDBSEQ"); if (sequence != null) + { seqs = new SequenceI[] { matcher == null ? (Sequence) newAlignFrame .getAlignViewport().getAlignment() .findName(sequence) : matcher.findIdMatch(sequence) }; + } } else @@ -2139,6 +2153,8 @@ public class JalviewLite extends Applet implements if (seqs[i] != null) { ((Sequence) seqs[i]).addPDBId(pdb); + StructureSelectionManager.getStructureSelectionManager( + applet).registerPDBEntry(pdb); } else { @@ -2323,7 +2339,9 @@ public class JalviewLite extends Applet implements // note separator local variable intentionally masks object field int seplen = separator.length(); if (list == null || list.equals("") || list.equals(separator)) + { return null; + } java.util.Vector jv = new Vector(); int cp = 0, pos; while ((pos = list.indexOf(separator, cp)) > cp)