git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
util
/
ChannelProperties.java
diff --git
a/src/jalview/util/ChannelProperties.java
b/src/jalview/util/ChannelProperties.java
index
4832588
..
b0f25eb
100644
(file)
--- 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
if (channelPropsURL == null)
{
// complete failure of channel_properties, set all properties to defaults
- System.err.println("Failed to find '/" + CHANNEL_PROPERTIES_FILENAME
+ jalview.bin.Console.errPrintln("Failed to find '/" + CHANNEL_PROPERTIES_FILENAME
+ "' file at '"
+ (channelPropsURL == null ? "null"
: channelPropsURL.toString())
+ "' file at '"
+ (channelPropsURL == null ? "null"
: channelPropsURL.toString())
@@
-102,7
+102,7
@@
public class ChannelProperties
channelPropsIS.close();
} catch (IOException e)
{
channelPropsIS.close();
} catch (IOException e)
{
- System.err.println(e.getMessage());
+ jalview.bin.Console.errPrintln(e.getMessage());
// return false;
}
}
// return false;
}
}
@@
-157,10
+157,10
@@
public class ChannelProperties
channelProps.load(is);
} catch (FileNotFoundException e)
{
channelProps.load(is);
} catch (FileNotFoundException e)
{
- System.err.println(e.getMessage());
+ jalview.bin.Console.errPrintln(e.getMessage());
} catch (IOException e)
{
} catch (IOException e)
{
- System.err.println(e.getMessage());
+ jalview.bin.Console.errPrintln(e.getMessage());
}
}
}
}
}
}
@@
-214,7
+214,7
@@
public class ChannelProperties
}
else
{
}
else
{
- System.err.println("Failed to get channel property '" + key + "'");
+ jalview.bin.Console.errPrintln("Failed to get channel property '" + key + "'");
}
}
return null;
}
}
return null;
@@
-266,7
+266,7
@@
public class ChannelProperties
img = imgIcon == null ? null : imgIcon.getImage();
if (img == null)
{
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)
{
"Failed to load channel image " + key + "=" + path);
if (!useClassDefaultImage)
{
@@
-293,7
+293,7
@@
public class ChannelProperties
{
return urlMap().getOrDefault(key, null);
}
{
return urlMap().getOrDefault(key, null);
}
- System.err.println(
+ jalview.bin.Console.errPrintln(
"Do not use getImageURL(key) before using getImage(key...)");
}
return null;
"Do not use getImageURL(key) before using getImage(key...)");
}
return null;