X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Futil%2FChannelProperties.java;h=109eaa5b6a2f1df863fbefe37f234df8b5ed8811;hb=fe57dedfd0a058edf685f4bbcb71a3eafb67a340;hp=2194c4d9d781fe9e7e005c4f374f6d626e9ae266;hpb=b6f8ec5c6678d0f363c521b97bda9574d04c6338;p=jalview.git

diff --git a/src/jalview/util/ChannelProperties.java b/src/jalview/util/ChannelProperties.java
index 2194c4d..109eaa5 100644
--- a/src/jalview/util/ChannelProperties.java
+++ b/src/jalview/util/ChannelProperties.java
@@ -18,7 +18,7 @@ import jalview.bin.Cache;
 public class ChannelProperties
 {
 
-  private static final String CHANNEL_PROPERTIES_FILENAME = "/channel_properties";
+  private static final String CHANNEL_PROPERTIES_FILENAME = "/channel.props";
 
   private static final Properties channelProps;
 
@@ -26,6 +26,8 @@ public class ChannelProperties
 
   private static Map<String, Image> imageMap = new HashMap<String, Image>();
 
+  private static Map<String, URL> urlMap = new HashMap<String, URL>();
+
   private static final ArrayList<Image> iconList;
 
   static
@@ -45,10 +47,15 @@ public class ChannelProperties
     defaultProps.put("logo.512", "/default_images/jalview_logo-512.png");
     defaultProps.put("rotatable_logo.48",
             "/default_images/rotatable_jalview_logo-38.png");
-    defaultProps.put("bg_logo.62", "/default_images/barton_group-62.png");
-    defaultProps.put("uod_banner", "/default_images/UoD_banner.png");
+    defaultProps.put("bg_logo.28", "/default_images/barton_group-28.png");
+    defaultProps.put("bg_logo.30", "/default_images/barton_group-30.png");
+    defaultProps.put("bg_logo.32", "/default_images/barton_group-32.png");
+    defaultProps.put("uod_banner.28", "/default_images/UoD_banner-28.png");
+    defaultProps.put("uod_banner.30", "/default_images/UoD_banner-30.png");
+    defaultProps.put("uod_banner.32", "/default_images/UoD_banner-32.png");
     defaultProps.put("default_appbase",
             "https://www.jalview.org/getdown/release/1.8");
+    defaultProps.put("preferences.filename", ".jalview_properties");
 
     // load channel_properties
     Properties tryChannelProps = new Properties();
@@ -58,7 +65,10 @@ public class ChannelProperties
     {
       // complete failure of channel_properties, set all properties to defaults
       System.err.println("Failed to find '" + CHANNEL_PROPERTIES_FILENAME
-              + "' file, using defaults");
+              + "' file at '"
+              + (channelPropsURL == null ? "null"
+                      : channelPropsURL.toString())
+              + "'. Using class defaultProps.");
       tryChannelProps = defaultProps;
     }
     else
@@ -122,6 +132,11 @@ public class ChannelProperties
     return imageMap;
   }
 
+  private static Map<String, URL> urlMap()
+  {
+    return urlMap;
+  }
+
   /*
    * getProperty(key) will get property value from channel_properties for key.
    * If no property for key is found, it will fall back to using the defaultProps defined for this class.
@@ -217,16 +232,34 @@ public class ChannelProperties
       else
       {
         imageMap().put(key, img);
+        urlMap.put(key, imageURL);
       }
     }
     return img;
   }
 
   /*
+   * Public method to get the URL object pointing to a cached image.
+   */
+  public static URL getImageURL(String key)
+  {
+    if (getImage(key) != null)
+    {
+      if (urlMap().containsKey(key))
+      {
+        return urlMap().getOrDefault(key, null);
+      }
+      System.err.println(
+              "Do not use getImageURL(key) before using getImage(key...)");
+    }
+    return null;
+  }
+
+  /*
    * Get a List of Icon images of different sizes.
    */
   public static ArrayList<Image> getIconList()
   {
     return iconList;
   }
-}
\ No newline at end of file
+}