X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FChannelProperties.java;h=c4c083f30c6c1091373c23bf0344e43384ad6709;hb=a6715746d2537e715a08d4ca2a098e94d8d47f5c;hp=50d6fc66a891e31f5267ac79152eba46ba58cd2c;hpb=d654b1f014790b7ae25e6eec631847170a930987;p=jalview.git diff --git a/src/jalview/util/ChannelProperties.java b/src/jalview/util/ChannelProperties.java index 50d6fc6..c4c083f 100644 --- a/src/jalview/util/ChannelProperties.java +++ b/src/jalview/util/ChannelProperties.java @@ -77,6 +77,7 @@ public class ChannelProperties defaultProps.put("default_appbase", "https://www.jalview.org/getdown/release/1.8"); defaultProps.put("preferences.filename", ".jalview_properties"); + defaultProps.put("channel", "none"); // load channel_properties Properties tryChannelProps = new Properties(); @@ -85,8 +86,8 @@ public class ChannelProperties if (channelPropsURL == null) { // complete failure of channel_properties, set all properties to defaults - System.err.println("Failed to find '/" + CHANNEL_PROPERTIES_FILENAME - + "' file at '" + jalview.bin.Console.errPrintln("Failed to find '/" + + CHANNEL_PROPERTIES_FILENAME + "' file at '" + (channelPropsURL == null ? "null" : channelPropsURL.toString()) + "'. Using class defaultProps."); @@ -101,7 +102,7 @@ public class ChannelProperties channelPropsIS.close(); } catch (IOException e) { - System.err.println(e.getMessage()); + jalview.bin.Console.errPrintln(e.getMessage()); // return false; } } @@ -156,10 +157,10 @@ public class ChannelProperties channelProps.load(is); } catch (FileNotFoundException e) { - System.err.println(e.getMessage()); + jalview.bin.Console.errPrintln(e.getMessage()); } catch (IOException e) { - System.err.println(e.getMessage()); + jalview.bin.Console.errPrintln(e.getMessage()); } } } @@ -213,7 +214,8 @@ public class ChannelProperties } else { - System.err.println("Failed to get channel property '" + key + "'"); + jalview.bin.Console + .errPrintln("Failed to get channel property '" + key + "'"); } } return null; @@ -265,7 +267,7 @@ public class ChannelProperties img = imgIcon == null ? null : imgIcon.getImage(); if (img == null) { - System.err.println( + jalview.bin.Console.errPrintln( "Failed to load channel image " + key + "=" + path); if (!useClassDefaultImage) { @@ -292,7 +294,7 @@ public class ChannelProperties { return urlMap().getOrDefault(key, null); } - System.err.println( + jalview.bin.Console.errPrintln( "Do not use getImageURL(key) before using getImage(key...)"); } return null;