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-4235_gradle_task_jalviewjsTranspile_does_not_fail...
[jalview.git]
/
src
/
jalview
/
util
/
ChannelProperties.java
diff --git
a/src/jalview/util/ChannelProperties.java
b/src/jalview/util/ChannelProperties.java
index
b0f25eb
..
c4c083f
100644
(file)
--- a/
src/jalview/util/ChannelProperties.java
+++ b/
src/jalview/util/ChannelProperties.java
@@
-86,8
+86,8
@@
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
- jalview.bin.Console.errPrintln("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.");
+ (channelPropsURL == null ? "null"
: channelPropsURL.toString())
+ "'. Using class defaultProps.");
@@
-214,7
+214,8
@@
public class ChannelProperties
}
else
{
}
else
{
- jalview.bin.Console.errPrintln("Failed to get channel property '" + key + "'");
+ jalview.bin.Console
+ .errPrintln("Failed to get channel property '" + key + "'");
}
}
return null;
}
}
return null;