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 releases/Release_2_11_2_Branch
[jalview.git]
/
src
/
jalview
/
gui
/
Console.java
diff --git
a/src/jalview/gui/Console.java
b/src/jalview/gui/Console.java
index
d9d729a
..
9cf2cc9
100644
(file)
--- a/
src/jalview/gui/Console.java
+++ b/
src/jalview/gui/Console.java
@@
-220,7
+220,8
@@
public class Console extends WindowAdapter
{
if (jalview.bin.Console.log != null)
{
{
if (jalview.bin.Console.log != null)
{
- jalview.bin.Console.log.setLevel((LogLevel) logLevelCombo.getSelectedItem());
+ jalview.bin.Console.log
+ .setLevel((LogLevel) logLevelCombo.getSelectedItem());
}
}
}
}
@@
-510,7
+511,8
@@
public class Console extends WindowAdapter
JalviewAppender jappender = new JalviewAppender(level);
JalviewAppender.setTextArea(textArea);
jappender.start();
JalviewAppender jappender = new JalviewAppender(level);
JalviewAppender.setTextArea(textArea);
jappender.start();
- if (jalview.bin.Console.log != null && jalview.bin.Console.log instanceof JLoggerLog4j)
+ if (jalview.bin.Console.log != null
+ && jalview.bin.Console.log instanceof JLoggerLog4j)
{
JLoggerLog4j.addAppender(jalview.bin.Console.log, jappender);
}
{
JLoggerLog4j.addAppender(jalview.bin.Console.log, jappender);
}