X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FChannelProperties.java;h=ffcb6a16f074f5316f9bb25627a7d8068f3dfb2d;hb=dee97314c8d002df2ec57812bf82f0460ba51dd8;hp=4832588b196b8f1cd404d57219bb29a0c2ad6c24;hpb=32504ac62e27ce8849ab331a10b7cc3d0c2322b2;p=jalview.git diff --git a/src/jalview/util/ChannelProperties.java b/src/jalview/util/ChannelProperties.java index 4832588..ffcb6a1 100644 --- a/src/jalview/util/ChannelProperties.java +++ b/src/jalview/util/ChannelProperties.java @@ -86,7 +86,7 @@ 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 + ErrorLog.errPrintln("Failed to find '/" + CHANNEL_PROPERTIES_FILENAME + "' file at '" + (channelPropsURL == null ? "null" : channelPropsURL.toString()) @@ -97,12 +97,12 @@ public class ChannelProperties { try { - InputStream channelPropsIS = channelPropsURL.openStream(); + InputStream channelPropsIS = HttpUtils.openStream(channelPropsURL); tryChannelProps.load(channelPropsIS); channelPropsIS.close(); } catch (IOException e) { - System.err.println(e.getMessage()); + ErrorLog.errPrintln(e.getMessage()); // return false; } } @@ -157,10 +157,10 @@ public class ChannelProperties channelProps.load(is); } catch (FileNotFoundException e) { - System.err.println(e.getMessage()); + ErrorLog.errPrintln(e.getMessage()); } catch (IOException e) { - System.err.println(e.getMessage()); + ErrorLog.errPrintln(e.getMessage()); } } } @@ -214,7 +214,7 @@ public class ChannelProperties } else { - System.err.println("Failed to get channel property '" + key + "'"); + ErrorLog.errPrintln("Failed to get channel property '" + key + "'"); } } return null; @@ -266,7 +266,7 @@ public class ChannelProperties img = imgIcon == null ? null : imgIcon.getImage(); if (img == null) { - System.err.println( + ErrorLog.errPrintln( "Failed to load channel image " + key + "=" + path); if (!useClassDefaultImage) { @@ -293,7 +293,7 @@ public class ChannelProperties { return urlMap().getOrDefault(key, null); } - System.err.println( + ErrorLog.errPrintln( "Do not use getImageURL(key) before using getImage(key...)"); } return null;