X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=480bf5db0596650d743c129d1961621f203b6cdb;hb=74e4d71835fd0031dd7c309e37ec6bf934e4de4a;hp=d5757df9ce15fd5fa9c19f4e8e50ef3d073d35fc;hpb=d85d2bf55610bc799dd67d7f9ed6b494632e5420;p=jalview.git
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index d5757df..480bf5d 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -30,6 +30,9 @@ import java.net.*;
*
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)
+ *
logs.Jalview.Level - Jalview.log stringified level.
+ *
DISCOVERY_START - Boolean - controls if discovery services are queried on startup
+ *
DISCOVERY_URLS - comma separated list of Discovery Service endpoints.
*
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,
@@ -112,7 +115,7 @@ public class Cache
}
- System.out.println("Version: "+codeVersion);
+ System.out.println("Jalview Version: "+codeVersion);
// jnlpVersion will be null if we're using InstallAnywhere
// Dont do this check if running in headless mode
@@ -165,6 +168,9 @@ public class Cache
}
setProperty("VERSION", codeVersion);
+
+ //LOAD USERDEFINED COLOURS
+ jalview.gui.UserDefinedColours.initUserColourSchemes( getProperty("USER_DEFINED_COLOURS"));
}
@@ -231,7 +237,7 @@ public class Cache
out.close();
}
catch (Exception ex)
- { }
+ { System.out.println("Error setting property: "+key+" "+obj+"\n"+ex); }
return obj;
}
@@ -244,6 +250,6 @@ public class Cache
out.close();
}
catch (Exception ex)
- { }
+ { System.out.println("Error saving properties: "+ex); }
}
}