X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbin%2FCache.java;h=8fae6a900ab3d3fb5fee480c4c96329b5a759ba8;hb=a02c010dd9c92b25f13974038329b541d424dc77;hp=57ae4ce07ff21ba95bad188930c8f95c2db1e0d0;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 57ae4ce..8fae6a9 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -22,13 +22,14 @@ import java.io.*;
import java.util.*;
+import java.net.*;
+
/**
* Stores and retrieves Jalview Application Properties
*
Current properties include:
*
logs.Axis.Level - one of the stringified Levels for log4j controlling the logging level for axis (used for web services)
*
logs.Castor.Level - one of the stringified Levels for log4j controlling the logging level for castor (used for serialization)
- *
jalview.browser - used in the jalview.utils.browserLauncher class if it doesn't know what else to do.
*
SCREEN_WIDTH,SCREEN_HEIGHT,SCREEN_Y=285,SCREEN_X=371,SHOW_FULLSCREEN
* FONT_NAME,FONT_SIZE,FONT_STYLE,GAP_SYMBOL,LAST_DIRECTORY,USER_DEFINED_COLOUR
* SHOW_FULL_ID,SHOW_IDENTITY,SHOW_QUALITY,SHOW_ANNOTATIONS,SHOW_CONSERVATION,
@@ -39,14 +40,9 @@ import java.util.*;
*/
public class Cache
{
- /** Current release tag */
- public static String VERSION = "AW Test";
-
- /** Date Jalview was last packaged, else compilation date of Cache.class */
- public static String BUILD_DATE = "";
/** Jalview Properties */
- public static Properties applicationProperties;
+ public static Properties applicationProperties = new Properties();
/** Default file is ~/.jalview_properties */
static String propertiesFile;
@@ -54,62 +50,128 @@ public class Cache
/** Called when Jalview is started */
public static void loadProperties(String propsFile)
{
- propertiesFile = propsFile;
- if (propsFile == null)
- {
- propertiesFile = System.getProperty("user.home") + "/.jalview_properties";
- }
-
-
- // get last build time.
- long date = 0;
+ propertiesFile = propsFile;
+ if (propsFile == null)
+ {
+ propertiesFile = System.getProperty("user.home") + "/.jalview_properties";
+ }
try
{
- String localFile = Cache.class.getProtectionDomain().getCodeSource()
- .getLocation().toString();
- localFile = localFile.concat("!/");
-
- String tmpString = "jar:";
- String localJarFileString = tmpString.concat(localFile);
- java.net.URL localJarFileURL = new java.net.URL(localJarFileString);
- java.net.JarURLConnection localJarFile = (java.net.JarURLConnection) localJarFileURL.openConnection();
- date = localJarFile.getLastModified();
+ FileInputStream fis = new FileInputStream(propertiesFile);
+ applicationProperties.load(fis);
+ applicationProperties.remove("LATEST_VERSION");
+ applicationProperties.remove("VERSION");
+ fis.close();
}
catch (Exception ex)
{
- ex.printStackTrace();
+ System.out.println("Error reading properties file: "+ex);
}
- if (date == 0)
- {
- // this is called for unpackaged class files, ie not in a Jar file
- // InstallAnywhere version will find build date this way
- // not entirely accurate as it only tells you when Cache.class was last compiled
- java.io.File f = new java.io.File(System.getProperty("user.dir") +
- "/jalview/bin/Cache.class");
- date = f.lastModified();
+ if(getDefault("USE_PROXY", false))
+ {
+ System.out.println("Using proxyServer: "+getDefault("PROXY_SERVER", null)+
+ " proxyPort: "+getDefault("PROXY_PORT", null));
+ System.setProperty("http.proxyHost", getDefault("PROXY_SERVER", null));
+ System.setProperty("http.proxyPort", getDefault("PROXY_PORT", null));
+ }
+
+ // FIND THE VERSION NUMBER AND BUILD DATE FROM jalview.jar
+ // MUST FOLLOW READING OF LOCAL PROPERTIES FILE AS THE
+ // VERSION MAY HAVE CHANGED SINCE LAST USING JALVIEW
+ try
+ {
+ String buildDetails = "jar:"
+ .concat(
+ Cache.class.getProtectionDomain().getCodeSource().getLocation().toString()
+ .concat("!/.build_properties")
+ );
+
+ java.net.URL localJarFileURL = new java.net.URL(buildDetails);
+
+ InputStream in = localJarFileURL.openStream();
+ applicationProperties.load(in);
+ in.close();
+ }
+ catch (Exception ex)
+ {
+ System.out.println("Error reading build details: "+ex);
+ applicationProperties.remove("VERSION");
}
- if (date != 0)
+ String jnlpVersion = System.getProperty("jalview.version");
+ String codeVersion = getProperty("VERSION");
+
+
+ if(codeVersion==null)
{
- BUILD_DATE = new Date(date).toString();
+ // THIS SHOULD ONLY BE THE CASE WHEN TESTING!!
+ codeVersion = "Test";
+ jnlpVersion = "Test";
}
- applicationProperties = new Properties();
- try
+ System.out.println("Jalview Version: "+codeVersion);
+
+ // jnlpVersion will be null if we're using InstallAnywhere
+ // Dont do this check if running in headless mode
+ if(jnlpVersion==null && (
+ System.getProperty("java.awt.headless")==null
+ || System.getProperty("java.awt.headless").equals("false")))
{
- FileInputStream in = new FileInputStream(propertiesFile);
- applicationProperties = new Properties();
- applicationProperties.load(in);
- in.close();
+
+
+ class VersionChecker
+ extends Thread
+ {
+ public void run()
+ {
+ String jnlpVersion = null;
+ try
+ {
+ java.net.URL url = new java.net.URL(
+ "http://www.jalview.org/webstart/jalview.jnlp");
+ BufferedReader in = new BufferedReader(new InputStreamReader(url.
+ openStream()));
+ String line = null;
+ while ( (line = in.readLine()) != null)
+ {
+ if (line.indexOf("jalview.version") == -1)
+ continue;
+
+ line = line.substring(line.indexOf("value=") + 7);
+ line = line.substring(0, line.lastIndexOf("\""));
+ jnlpVersion = line;
+ break;
+ }
+ }
+ catch (Exception ex)
+ {
+ System.out.println(ex);
+ jnlpVersion = getProperty("VERSION");
+ }
+
+ setProperty("LATEST_VERSION", jnlpVersion);
+ }
+ }
+
+ VersionChecker vc = new VersionChecker();
+ vc.start();
}
- catch (Exception ex)
+ else
{
+ setProperty("LATEST_VERSION", jnlpVersion);
}
+
+ setProperty("VERSION", codeVersion);
+
+ //LOAD USERDEFINED COLOURS
+ jalview.gui.UserDefinedColours.initUserColourSchemes( getProperty("USER_DEFINED_COLOURS"));
}
+
+
/**
* Gets Jalview application property of given key. Returns null
* if key not found
@@ -123,6 +185,37 @@ public class Cache
return applicationProperties.getProperty(key);
}
+
+ /** These methods are used when checking if the saved preference
+ * is different to the default setting
+ */
+
+ public static boolean getDefault(String property, boolean def)
+ {
+ String string = getProperty(property);
+ if (string != null)
+ {
+ def = Boolean.valueOf(string).booleanValue();
+ }
+
+ return def;
+ }
+
+ /** These methods are used when checking if the saved preference
+ * is different to the default setting
+ */
+ public static String getDefault(String property, String def)
+ {
+ String string = getProperty(property);
+ if (string != null)
+ {
+ return string;
+ }
+
+ return def;
+ }
+
+
/**
* Stores property in the file "HOME_DIR/.jalview_properties"
*
@@ -136,16 +229,24 @@ public class Cache
try
{
FileOutputStream out = new FileOutputStream(propertiesFile);
-
applicationProperties.setProperty(key, obj);
-
applicationProperties.store(out, "---JalviewX Properties File---");
out.close();
}
catch (Exception ex)
+ { }
+ return obj;
+ }
+
+ public static void saveProperties()
+ {
+ try
{
+ FileOutputStream out = new FileOutputStream(propertiesFile);
+ applicationProperties.store(out, "---JalviewX Properties File---");
+ out.close();
}
-
- return obj;
+ catch (Exception ex)
+ { }
}
}