X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fbin%2FCache.java;h=e2477d9eab317abb2452fff15073bfd7a4f3770f;hb=b8d09897dacc7b0ad203982b4578e2c1d8929142;hp=66518fad2b98ed56ba362d041ebf2190c89dcc79;hpb=338584e2151df68daca4085183a757610aa55909;p=jalview.git
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 66518fa..e2477d9 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1,100 +1,174 @@
-/********************
- * 2004 Jalview Reengineered
- * Barton Group
- * Dundee University
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
*
- * AM Waterhouse
- *******************/
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+package jalview.bin;
+import java.io.*;
-package jalview.bin;
import java.util.*;
-import java.io.*;
-import java.util.jar.*;
-public class Cache
-{
- public static String VERSION = "Release 2.0";
- public static String BUILD_DATE = "";
-
- public static Properties applicationProperties;
- // Current properties include:
- //
- // LAST_DIRECTORY , use this to cache record of where the user looked to find a file
- // UNIPROT_CACHE
- // USER_DEFINED_COLOUR - file describing last user set colours
- // FONT_NAME
- // FONT_STYLE
- // FONT_SIZE
- // logs.Axis.Level - one of the stringified Levels for log4j controlling the logging level for axis (used for web services)
-
- public static void loadProperties()
- {
- // get last build time.
- long date = 0;
- 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();
- }catch(Exception ex){ex.printStackTrace();}
- 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
+import java.net.*;
- java.io.File f = new java.io.File(System.getProperty("user.dir") + "/jalview/bin/Cache.class" );
- date = f.lastModified();
- }
+/**
+ * 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,
+ * DEFAULT_COLOUR,DEFAULT_FILE_FORMAT,STARTUP_FILE,SHOW_STARTUP_FILE
- if(date!=0)
- BUILD_DATE = new Date( date ).toString();
+ * @author $author$
+ * @version $Revision$
+ */
+public class Cache
+{
+
+ /** Jalview Properties */
+ public static Properties applicationProperties;
- applicationProperties = new Properties();
+ /** Default file is ~/.jalview_properties */
+ static String propertiesFile;
- try
+ /** Called when Jalview is started */
+ public static void loadProperties(String propsFile)
{
- FileInputStream in = new FileInputStream(System.getProperty("user.home") +
- "/.jalview_properties");
- applicationProperties = new Properties();
- applicationProperties.load(in);
- in.close();
+ applicationProperties = new Properties();
+ propertiesFile = propsFile;
+ if (propsFile == null)
+ {
+ propertiesFile = System.getProperty("user.home") + "/.jalview_properties";
+ }
+
+ try
+ {
+ FileInputStream fis = new FileInputStream(propertiesFile);
+ applicationProperties.load(fis);
+ applicationProperties.remove("LATEST_VERSION");
+ applicationProperties.remove("VERSION");
+ fis.close();
+ }
+ catch (Exception ex)
+ {
+ System.out.println("Error reading properties file: "+ex);
+ }
+
+ // 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");
+ }
+
+ String jnlpVersion = System.getProperty("jalview.version");
+ String codeVersion = getProperty("VERSION");
+
+
+ if(codeVersion==null)
+ {
+ // THIS SHOULD ONLY BE THE CASE WHEN TESTING!!
+ codeVersion = "Test";
+ jnlpVersion = "Test";
+ }
+
+ // jnlpVersion will be null if we're using InstallAnywhere
+ if(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)
+ { jnlpVersion = codeVersion; }
+ }
+
+ System.out.println("Version: "+codeVersion);
+ System.out.println("Latest : "+jnlpVersion);
+
+ setProperty("LATEST_VERSION", jnlpVersion);
+ setProperty("VERSION", codeVersion);
}
- catch (Exception ex)
- { }
- }
-
- public static String getProperty(String key)
- {
- return applicationProperties.getProperty(key);
- }
-
- public static String setProperty(String key, String obj)
- {
- try
- {
- FileOutputStream out = new FileOutputStream(System.getProperty(
- "user.home") + "/.jalview_properties");
- applicationProperties.setProperty(key, obj);
-
- applicationProperties.store(out, "---JalviewX Properties File---");
- out.close();
+ /**
+ * Gets Jalview application property of given key. Returns null
+ * if key not found
+ *
+ * @param key Name of property
+ *
+ * @return Property value
+ */
+ public static String getProperty(String key)
+ {
+ return applicationProperties.getProperty(key);
}
- catch (Exception ex)
- {}
-
- return obj;
-
- }
-
+ /**
+ * Stores property in the file "HOME_DIR/.jalview_properties"
+ *
+ * @param key Name of object
+ * @param obj String value of property
+ *
+ * @return String value of property
+ */
+ public static String setProperty(String key, String obj)
+ {
+ try
+ {
+ FileOutputStream out = new FileOutputStream(propertiesFile);
+ applicationProperties.setProperty(key, obj);
+ applicationProperties.store(out, "---JalviewX Properties File---");
+ out.close();
+ }
+ catch (Exception ex)
+ {
+ }
+ return obj;
+ }
}