Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects

[jalview.git] / src / jalview / gui / Console.java

diff --git a/src/jalview/gui/Console.java b/src/jalview/gui/Console.java
index cb53d14..5a23048 100644 (file)
--- 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;
@@ -115,6 +114,7 @@ public class Console extends WindowAdapter
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
     frame = initFrame("Java Console", screenSize.width / 2,
             screenSize.height / 2, -1, -1);
+    frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
     initConsole(true);
   }
 
@@ -212,16 +212,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 +512,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);
       }
     }
   }
@@ -550,10 +552,12 @@ public class Console extends WindowAdapter
       {
       }
     }
+    /*
     if (!frame.isVisible())
     {
       frame.dispose();
     }
+    */
     // System.exit(0);
   }
 
@@ -856,9 +860,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();