X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=d4c7e5de2f7064675905e547dd099c0ec4b1f5ce;hb=1ee8b306b296ea2724e128f66486675bdaac7a3d;hp=a5231e1f090fab17cfedcbfded8d7564520828f9;hpb=0d79fdf165b3aa194d179e502b9f3c8e635ecd65;p=jalview.git

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index a5231e1..d4c7e5d 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1,68 +1,157 @@
-/********************
- * 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.*;
 
-public class Cache
-{
-  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
+import java.net.*;
 
-  public static void loadProperties()
-  {
-    applicationProperties = new Properties();
 
-    try
-    {
-      FileInputStream in = new FileInputStream(System.getProperty("user.home") +
-                                               "/.jalview_properties");
-      applicationProperties = new Properties();
-      applicationProperties.load(in);
-      in.close();
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
+/**
+ * Stores and retrieves Jalview Application Properties
+ * <br><br>Current properties include:
+ * <br>logs.Axis.Level - one of the stringified Levels for log4j controlling the logging level for axis (used for web services)
+ * <br>logs.Castor.Level - one of the stringified Levels for log4j controlling the logging level for castor (used for serialization)
+ * <br>jalview.browser - used in the jalview.utils.browserLauncher class if it doesn't know what else to do.
+ * <br>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
 
+ * @author $author$
+ * @version $Revision$
+ */
+public class Cache
+{
 
-  }
+    /** Jalview Properties */
+    public static Properties applicationProperties;
 
-  public static String getProperty(String key)
-  {
-    return  applicationProperties.getProperty(key);
-  }
+    /** Default file is  ~/.jalview_properties */
+    static String propertiesFile;
 
-  public static void setProperty(String key, String obj)
-  {
-    try
+    /** Called when Jalview is started */
+    public static void loadProperties(String propsFile)
     {
-      FileOutputStream out = new FileOutputStream(System.getProperty(
-          "user.home") + "/.jalview_properties");
-
-      applicationProperties.setProperty(key, obj);
-
-      applicationProperties.store(out, "---JalviewX Properties File---");
-      out.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);
+            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);
+        }
+
+        String jnlpVersion = System.getProperty("jalview.version");
+        String codeVersion = getProperty("VERSION");
+
+        // 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("\""));
+              setProperty("jalview.version", line);
+            }
+          }catch(Exception ex)
+          {setProperty("jalview.version", codeVersion);}
+        }
     }
-    catch (Exception ex)
-    {}
-
-  }
 
+    /**
+     * 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);
+    }
 
+    /**
+     * 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;
+    }
 }