git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: 497958b 68dcaa7
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLite.java
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
ef48bf9
..
833dd7e
100644
(file)
--- 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;
public static boolean debug = false;
- static String builddate = null, version = null;
+ static String builddate = null, version = null, installation = null;
private static void initBuildDetails()
{
private static void initBuildDetails()
{
@@
-1277,6
+1277,7
@@
public class JalviewLite extends Applet implements
{
builddate = "unknown";
version = "test";
{
builddate = "unknown";
version = "test";
+ installation = "Webstart";
java.net.URL url = JalviewLite.class
.getResource("/.build_properties");
if (url != null)
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);
}
{
builddate = line.substring(line.indexOf("=") + 1);
}
+ if (line.indexOf("INSTALLATION") > -1)
+ {
+ installation = line.substring(line.indexOf("=") + 1);
+ }
}
} catch (Exception ex)
{
}
} catch (Exception ex)
{
@@
-1311,6
+1316,12
@@
public class JalviewLite extends Applet implements
return builddate;
}
return builddate;
}
+ public static String getInstallation()
+ {
+ initBuildDetails();
+ return installation;
+ }
+
public static String getVersion()
{
initBuildDetails();
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("JalviewLite Version " + getVersion());
System.err.println("Build Date : " + getBuildDate());
+ System.err.println("Installation : " + getInstallation());
}
String externalsviewer = getParameter("externalstructureviewer");
}
String externalsviewer = getParameter("externalstructureviewer");