X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=5aff236bb41f628237821e523edc16c7ab94ff96;hb=801c367379086cc38bf4d3059a8e30ca9f4e78c0;hp=2d334780ae0c7925655a5317b3aa46c81e5aecf4;hpb=2b08c849bd54a0799ddf251f602a421d4696005e;p=jalview.git diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index 2d33478..5aff236 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -33,6 +33,7 @@ import jalview.util.Platform; import jalview.ws.sifts.SiftsSettings; import java.awt.Color; +import java.awt.Dimension; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -205,8 +206,6 @@ import org.apache.log4j.SimpleLayout; * panel in web service preferences * * - * @author $author$ - * @version $Revision$ */ public class Cache implements ApplicationSingletonI { @@ -223,7 +222,7 @@ public class Cache implements ApplicationSingletonI * * @return */ - private static Cache getInstance() + public static Cache getInstance() { return (Cache) ApplicationSingletonProvider.getInstance(Cache.class); } @@ -286,7 +285,7 @@ public class Cache implements ApplicationSingletonI /** Jalview Properties */ // BH 2019.05.08 was static @SuppressWarnings("serial") - private Properties applicationProperties = new Properties() + public Properties applicationProperties = new Properties() { // override results in properties output in alphabetical order @Override @@ -510,7 +509,7 @@ public class Cache implements ApplicationSingletonI getDefault("sifts_cache_threshold_in_days", DEFAULT_CACHE_THRESHOLD_IN_DAYS)); - IdOrgSettings.setUrl(getDefault("ID_ORG_HOSTURL", + IdOrgSettings.setUrl(getDefault(Preferences.ID_ORG_HOSTURL, "http://www.jalview.org/services/identifiers")); IdOrgSettings.setDownloadLocation(ID_ORG_FILE); @@ -518,7 +517,7 @@ public class Cache implements ApplicationSingletonI .println("Jalview Version: " + codeVersion + codeInstallation); StructureImportSettings.setDefaultStructureFileFormat(jalview.bin.Cache - .getDefault("PDB_DOWNLOAD_FORMAT", PDB_DOWNLOAD_FORMAT)); + .getDefault(Preferences.PDB_DOWNLOAD_FORMAT, PDB_DOWNLOAD_FORMAT)); StructureImportSettings .setDefaultPDBFileParser(DEFAULT_PDB_FILE_PARSER); // StructureImportSettings @@ -627,44 +626,89 @@ public class Cache implements ApplicationSingletonI } /** - * These methods are used when checking if the saved preference is different - * to the default setting + * Returns the boolean property value for the given property name. If the + * value is absent then the default value is returned instead. + * + * @param property + * @param def + * @return */ + public static boolean getDefault(String property, final boolean def) + { + String string = getProperty(property); + return string == null ? def : Boolean.parseBoolean(string); + } - public static boolean getDefault(String property, boolean def) + /** + * Returns the integer property value for the given property name. If the + * value is absent, or malformed (not an integer), then the default value is + * returned instead. + * + * @param property + * @param def + * @return + */ + public static int getDefault(String property, final int def) { String string = getProperty(property); if (string != null) { - def = Boolean.valueOf(string).booleanValue(); + try + { + return Integer.parseInt(string); + } catch (NumberFormatException e) + { + System.out.println("Error parsing int property '" + property + + "' with value '" + string + "'"); + } } return def; } - public static int getDefault(String property, int def) + /** + * retrieve a dimension, such as for Jmol + * + * @param property + * @param def + * @return + */ + public static Dimension getDefaultDim(String property, Dimension def) { - String string = getProperty(property); - if (string != null) + String s = getProperty(property); + if (s != null) { + if (s.indexOf(',') < 0) + { + s = s.trim().replace(' ', ','); + if (s.indexOf(',') < 0) + { + s += "," + s; + } + } try { - def = Integer.parseInt(string); + int pt = s.indexOf(","); + return new Dimension(Integer.parseInt(s.substring(0, pt)), + Integer.parseInt(s.substring(pt + 1))); } catch (NumberFormatException e) { - System.out.println("Error parsing int property '" + property - + "' with value '" + string + "'"); + System.out.println("Error parsing Dimension property '" + property + + "' with value '" + s + "'"); } } - return def; } /** - * Answers the value of the given property, or the supplied default value if + * Returns the value of the given property, or the supplied default value if * the property is not set + * + * @param property + * @param def + * @return */ - public static String getDefault(String property, String def) + public static String getDefault(String property, final String def) { String value = getProperty(property); return value == null ? def : value; @@ -685,11 +729,27 @@ public class Cache implements ApplicationSingletonI return getInstance().setPropertyImpl(key, obj, true); } + /** + * Sets a property value for the running application, without saving it to the + * properties file + * + * @param key + * @param obj + */ public static void setPropertyNoSave(String key, String obj) { getInstance().setPropertyImpl(key, obj, false); } + /** + * Sets a property value, and optionally also saves the current properties to + * file + * + * @param key + * @param obj + * @param andSave + * @return + */ private Object setPropertyImpl(String key, String obj, boolean andSave) { Object oldValue = null; @@ -711,7 +771,7 @@ public class Cache implements ApplicationSingletonI } /** - * remove the specified property from the jalview properties file + * Removes the specified property from the jalview properties file * * @param key */ @@ -720,11 +780,24 @@ public class Cache implements ApplicationSingletonI getInstance().removePropertyImpl(key, true); } + /** + * Removes the named property for the running application, without saving the + * properties file + * + * @param key + */ public static void removePropertyNoSave(String key) { getInstance().removePropertyImpl(key, false); } + /** + * Removes the named property, and optionally saves the current properties to + * file + * + * @param key + * @param andSave + */ private void removePropertyImpl(String key, boolean andSave) { applicationProperties.remove(key); @@ -734,6 +807,9 @@ public class Cache implements ApplicationSingletonI } } + /** + * Saves the current properties to file + */ public static void saveProperties() { getInstance().savePropertiesImpl(); @@ -977,18 +1053,24 @@ public class Cache implements ApplicationSingletonI } /** - * get the user's default colour if available + * Returns the Color value of the given property's value, or the supplied + * default colour if no property is found, or it cannot be parsed to a colour. + * Colours are normally saved as hex rgb values, though other formats may be + * parseable. * * @param property - * @param defcolour + * @param defaultColour * @return + * @see Cache#setColourPropertyNoSave(String, Color) + * @see ColorUtils#parseColourString(String) */ - public static Color getDefaultColour(String property, Color defcolour) + public static Color getDefaultColour(String property, + final Color defaultColour) { String colprop = getProperty(property); if (colprop == null) { - return defcolour; + return defaultColour; } Color col = ColorUtils.parseColourString(colprop); if (col == null) @@ -996,22 +1078,24 @@ public class Cache implements ApplicationSingletonI log.warn("Couldn't parse '" + colprop + "' as a colour for " + property); } - return (col == null) ? defcolour : col; + return (col == null) ? defaultColour : col; } /** - * store a colour as a Jalview user default property + * Stores a colour as a Jalview property, converted to hex values for rgb. + * Properties are not saved to file. * * @param property * @param colour */ - public static void setColourProperty(String property, Color colour) + public static void setColourPropertyNoSave(String property, Color colour) { - setProperty(property, jalview.util.Format.getHexString(colour)); + setPropertyNoSave(property, jalview.util.Format.getHexString(colour)); } /** * Stores a formatted date in a jalview property, using a fixed locale. + * Updated properties are written out to the properties file. * * @param propertyName * @param date