git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f8392b9
)
JAL-4298 reuse existing log level preference method
author
James Procter
<j.procter@dundee.ac.uk>
Fri, 20 Oct 2023 15:35:27 +0000
(16:35 +0100)
committer
James Procter
<j.procter@dundee.ac.uk>
Fri, 20 Oct 2023 15:35:27 +0000
(16:35 +0100)
src/jalview/gui/Console.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/Console.java
b/src/jalview/gui/Console.java
index
960421f
..
b8aad21
100644
(file)
--- a/
src/jalview/gui/Console.java
+++ b/
src/jalview/gui/Console.java
@@
-217,30
+217,14
@@
public class Console extends WindowAdapter
// logLevelCombo.addItem(LogLevel.ERROR);
// logLevelCombo.addItem(LogLevel.OFF);
// set startingLogLevel
// logLevelCombo.addItem(LogLevel.ERROR);
// logLevelCombo.addItem(LogLevel.OFF);
// set startingLogLevel
- if (jalview.bin.Console.log == null)
+
+ if (jalview.bin.Console.getLogger() == null)
{
{
- try
- {
- startingLogLevel = LogLevel
- .valueOf(Cache.getDefault(Cache.JALVIEWLOGLEVEL, null));
- } catch (IllegalArgumentException e1)
- {
- jalview.bin.Console.debug(
- "Invalid value for preference " + Cache.JALVIEWLOGLEVEL);
- } catch (NullPointerException e2)
- {
- // no value in preferences
- } finally
- {
- if (startingLogLevel == null)
- {
- startingLogLevel = LogLevel.INFO;
- }
- }
+ startingLogLevel = jalview.bin.Console.getCachedLogLevel();
}
else
{
}
else
{
- startingLogLevel = jalview.bin.Console.log.getLevel();
+ startingLogLevel = jalview.bin.Console.getLogger().getLevel();
}
setChosenLogLevelCombo();
logLevelCombo.addActionListener(new ActionListener()
}
setChosenLogLevelCombo();
logLevelCombo.addActionListener(new ActionListener()