X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=3dea84e53dff3cd11d1584f5ef0ba32062722f06;hb=fd235cc7542d6e308e054a8a76580a6c511ae631;hp=a48b750f08e23f7bb2814ad2ddd4b0f341fc39a3;hpb=6a1564abce042be6eb37fd3ae883921e00a2bd0c;p=jalview.git
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index a48b750..3dea84e 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -150,6 +150,7 @@ import org.apache.log4j.SimpleLayout;
*
FOLLOW_SELECTIONS (true) Controls whether a new alignment view should
* respond to selections made in other alignments containing the same sequences.
*
+ * JWS2HOSTURLS comma-separated list of URLs to try for JABAWS services
* SHOW_WSDISCOVERY_ERRORS (true) Controls if the web service URL discovery
* warning dialog box is displayed.
* ANNOTATIONCOLOUR_MIN (orange) Shade used for minimum value of annotation
@@ -173,6 +174,7 @@ import org.apache.log4j.SimpleLayout;
* display
* STRUCTURE_DISPLAY choose from JMOL (default) or CHIMERA for 3D structure
* display
+ * CHIMERA_PATH specify full path to Chimera program (if non-standard)
*
*
* Deprecated settings:
@@ -377,15 +379,21 @@ public class Cache
String jnlpVersion = System.getProperty("jalview.version");
String codeVersion = getProperty("VERSION");
-
+ String codeInstallation = getProperty("INSTALLATION");
if (codeVersion == null)
{
// THIS SHOULD ONLY BE THE CASE WHEN TESTING!!
codeVersion = "Test";
jnlpVersion = "Test";
+ codeInstallation = "";
+ }
+ else
+ {
+ codeInstallation = " (" + codeInstallation + ")";
}
- System.out.println("Jalview Version: " + codeVersion);
+ System.out
+ .println("Jalview Version: " + codeVersion + codeInstallation);
// jnlpVersion will be null if we're using InstallAnywhere
// Dont do this check if running in headless mode
@@ -475,6 +483,8 @@ public class Cache
applicationProperties.remove("AUTHORS");
applicationProperties.remove("AUTHORFNAMES");
applicationProperties.remove("YEAR");
+ applicationProperties.remove("BUILD_DATE");
+ applicationProperties.remove("INSTALLATION");
}
/**
@@ -906,4 +916,27 @@ public class Cache
}
return sourceRegistry;
}
+
+ /**
+ * Set the specified value, or remove it if null or empty. Does not save the
+ * properties file.
+ *
+ * @param propName
+ * @param value
+ */
+ public static void setOrRemove(String propName, String value)
+ {
+ if (propName == null)
+ {
+ return;
+ }
+ if (value == null || value.trim().length() < 1)
+ {
+ Cache.applicationProperties.remove(propName);
+ }
+ else
+ {
+ Cache.applicationProperties.setProperty(propName, value);
+ }
+ }
}