JAL-3676 More explicit tooltip about resetting log level on Console close. Also clari...

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

diff --git a/src/jalview/gui/Console.java b/src/jalview/gui/Console.java
index a493640..6cd8106 100644 (file)
--- a/src/jalview/gui/Console.java
+++ b/src/jalview/gui/Console.java
@@ -100,7 +100,9 @@ public class Console extends WindowAdapter
 
   private int MIN_HEIGHT = 250;
 
-  private JComboBox logLevelCombo = new JComboBox();
+  private JComboBox<Level> logLevelCombo = new JComboBox<Level>();
+
+  protected Level startingLogLevel = Level.INFO;
 
   public Console()
   {
@@ -173,6 +175,9 @@ public class Console extends WindowAdapter
     // logLevelCombo.addItem(Level.ERROR);
     // logLevelCombo.addItem(Level.FATAL);
     // logLevelCombo.addItem(Level.OFF);
+    // set startingLogLevel
+    startingLogLevel = Cache.log == null ? Level.INFO
+            : Cache.log.getLevel();
     setChosenLogLevelCombo();
     logLevelCombo.addActionListener(new ActionListener()
     {
@@ -197,10 +202,10 @@ public class Console extends WindowAdapter
     logLevelPanel.setAlignmentX(JPanel.LEFT_ALIGNMENT);
     logLevelPanel.add(logLevelLabel);
     logLevelPanel.add(logLevelCombo);
-    logLevelLabel.setToolTipText(
-            MessageManager.getString("label.log_level_tooltip"));
-    logLevelCombo.setToolTipText(
-            MessageManager.getString("label.log_level_tooltip"));
+    String logLevelTooltip = MessageManager.formatMessage(
+            "label.log_level_tooltip", startingLogLevel.toString());
+    logLevelLabel.setToolTipText(logLevelTooltip);
+    logLevelCombo.setToolTipText(logLevelTooltip);
 
     GridBagConstraints gbc = new GridBagConstraints();
     gbc.gridx = 0;
@@ -254,22 +259,25 @@ public class Console extends WindowAdapter
 
   private void setChosenLogLevelCombo()
   {
-    Level currentLogLevel = Cache.log == null ? Level.INFO
-            : Cache.log.getLevel();
-    logLevelCombo.setSelectedItem(currentLogLevel);
-    if (!logLevelCombo.getSelectedItem().equals(currentLogLevel)) // currentLogLevel
-                                                                  // not in list
+    setChosenLogLevelCombo(startingLogLevel);
+  }
+
+  private void setChosenLogLevelCombo(Level setLogLevel)
+  {
+    logLevelCombo.setSelectedItem(setLogLevel);
+    if (!logLevelCombo.getSelectedItem().equals(setLogLevel))
     {
-      if (currentLogLevel != null && currentLogLevel instanceof Level)
+      // setLogLevel not (yet) in list
+      if (setLogLevel != null && setLogLevel instanceof Level)
       {
         // add new item to list (might be set via .jalview_properties)
         boolean added = false;
         for (int i = 0; i < logLevelCombo.getItemCount(); i++)
         {
           Level l = (Level) logLevelCombo.getItemAt(i);
-          if (l.isGreaterOrEqual(currentLogLevel))
+          if (l.isGreaterOrEqual(setLogLevel))
           {
-            logLevelCombo.insertItemAt(currentLogLevel, i);
+            logLevelCombo.insertItemAt(setLogLevel, i);
             added = true;
             break;
           }
@@ -277,9 +285,9 @@ public class Console extends WindowAdapter
         if (!added) // lower priority than others or some confusion -- add to
                     // end of list
         {
-          logLevelCombo.addItem(currentLogLevel);
+          logLevelCombo.addItem(setLogLevel);
         }
-        logLevelCombo.setSelectedItem(currentLogLevel);
+        logLevelCombo.setSelectedItem(setLogLevel);
       }
       else
       {
@@ -796,12 +804,10 @@ public class Console extends WindowAdapter
     }
     else
     {
-      // reset log level to user preference
+      // reset log level to what it was before
       if (Cache.log != null)
       {
-        String userLogLevel = Cache.getDefault("logs.Jalview.level",
-                Level.INFO.toString());
-        Cache.log.setLevel(Level.toLevel(userLogLevel));
+        Cache.log.setLevel(startingLogLevel);
       }
 
       unredirectStreams();