X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FConsole.java;h=9cf2cc97393610b60eca984c4fbdcac662a0c2ee;hb=d1e20f6a5654ea6baf378afa3277b4e751c69a96;hp=cb53d1403366d5aa9a6da2714178336e84889f53;hpb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;p=jalview.git

diff --git a/src/jalview/gui/Console.java b/src/jalview/gui/Console.java
index cb53d14..9cf2cc9 100644
--- a/src/jalview/gui/Console.java
+++ b/src/jalview/gui/Console.java
@@ -53,7 +53,6 @@ import javax.swing.JTextArea;
 import javax.swing.border.Border;
 import javax.swing.text.DefaultCaret;
 
-import jalview.bin.Cache;
 import jalview.log.JLoggerI.LogLevel;
 import jalview.log.JLoggerLog4j;
 import jalview.log.JalviewAppender;
@@ -212,16 +211,17 @@ public class Console extends WindowAdapter
     // logLevelCombo.addItem(LogLevel.ERROR);
     // logLevelCombo.addItem(LogLevel.OFF);
     // set startingLogLevel
-    startingLogLevel = Cache.log == null ? LogLevel.INFO
-            : Cache.log.getLevel();
+    startingLogLevel = jalview.bin.Console.log == null ? LogLevel.INFO
+            : jalview.bin.Console.log.getLevel();
     setChosenLogLevelCombo();
     logLevelCombo.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        if (Cache.log != null)
+        if (jalview.bin.Console.log != null)
         {
-          Cache.log.setLevel((LogLevel) logLevelCombo.getSelectedItem());
+          jalview.bin.Console.log
+                  .setLevel((LogLevel) logLevelCombo.getSelectedItem());
         }
       }
 
@@ -511,9 +511,10 @@ public class Console extends WindowAdapter
       JalviewAppender jappender = new JalviewAppender(level);
       JalviewAppender.setTextArea(textArea);
       jappender.start();
-      if (Cache.log != null && Cache.log instanceof JLoggerLog4j)
+      if (jalview.bin.Console.log != null
+              && jalview.bin.Console.log instanceof JLoggerLog4j)
       {
-        JLoggerLog4j.addAppender(Cache.log, jappender);
+        JLoggerLog4j.addAppender(jalview.bin.Console.log, jappender);
       }
     }
   }
@@ -856,9 +857,9 @@ public class Console extends WindowAdapter
     else
     {
       // reset log level to what it was before
-      if (Cache.log != null)
+      if (jalview.bin.Console.log != null)
       {
-        Cache.log.setLevel(startingLogLevel);
+        jalview.bin.Console.log.setLevel(startingLogLevel);
       }
 
       unredirectStreams();