JAL-3949 An attempt at converting to Log4j 2 -- no output achieved!

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

diff --git a/src/jalview/gui/Console.java b/src/jalview/gui/Console.java
index 050523e..1786c0c 100644 (file)
--- a/src/jalview/gui/Console.java
+++ b/src/jalview/gui/Console.java
@@ -50,11 +50,11 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.SimpleLayout;
+import org.apache.logging.log4j.Level;
 
 import jalview.bin.Cache;
 import jalview.util.ChannelProperties;
+import jalview.util.Log4j;
 import jalview.util.MessageManager;
 
 /**
@@ -186,7 +186,8 @@ public class Console extends WindowAdapter
       {
         if (Cache.log != null)
         {
-          Cache.log.setLevel((Level) logLevelCombo.getSelectedItem());
+          Log4j.setLevel(Cache.log,
+                  (Level) logLevelCombo.getSelectedItem());
         }
       }
 
@@ -279,7 +280,7 @@ public class Console extends WindowAdapter
         for (int i = 0; i < logLevelCombo.getItemCount(); i++)
         {
           Level l = (Level) logLevelCombo.getItemAt(i);
-          if (l.isGreaterOrEqual(setLogLevel))
+          if (l.isMoreSpecificThan(setLogLevel))
           {
             logLevelCombo.insertItemAt(setLogLevel, i);
             added = true;
@@ -472,9 +473,8 @@ public class Console extends WindowAdapter
     // desktop.add(frame);
     initConsole(false);
     JalviewAppender jappender = new JalviewAppender();
-    jappender.setLayout(new SimpleLayout());
     JalviewAppender.setTextArea(textArea);
-    org.apache.log4j.Logger.getRootLogger().addAppender(jappender);
+    Log4j.addAppenderToRootLogger(jappender);
   }
 
   public synchronized void stopConsole()
@@ -817,7 +817,7 @@ public class Console extends WindowAdapter
       // reset log level to what it was before
       if (Cache.log != null)
       {
-        Cache.log.setLevel(startingLogLevel);
+        Log4j.setLevel(Cache.log, startingLogLevel);
       }
 
       unredirectStreams();