JAL-3949 Complete new abstracted logging framework in jalview.log. Updated log calls...

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

diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java
index 0e9f0e4..d1fd7dd 100644 (file)
--- a/src/jalview/gui/PromptUserConfig.java
+++ b/src/jalview/gui/PromptUserConfig.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -24,8 +24,6 @@ import jalview.bin.Cache;
 
 import java.awt.Component;
 
-import javax.swing.JOptionPane;
-
 public class PromptUserConfig implements Runnable
 {
   /**
@@ -91,7 +89,7 @@ public class PromptUserConfig implements Runnable
    * @param desktop
    *          - where the dialog box will be shown
    * @param property
-   *          - boolean property in jalview.bin.Cache
+   *          - boolean property in Cache
    * @param dialogTitle
    *          - title of prompt box
    * @param dialogText
@@ -120,6 +118,7 @@ public class PromptUserConfig implements Runnable
     this.allowCancel = allowCancel;
   }
 
+  @Override
   public void run()
   {
     if (property == null)
@@ -127,14 +126,14 @@ public class PromptUserConfig implements Runnable
       return;
     }
     // First - check to see if wee have an old questionnaire/response id pair.
-    String lastq = jalview.bin.Cache.getProperty(property);
+    String lastq = Cache.getProperty(property);
 
     if (lastq == null)
     {
       raiseDialog();
-      Cache.log.debug("Got user response.");
+      Cache.debug("Got user response.");
     }
-    lastq = jalview.bin.Cache.getProperty(property);
+    lastq = Cache.getProperty(property);
     String extype = "";
     Exception e = null;
     if (lastq == null)
@@ -184,7 +183,7 @@ public class PromptUserConfig implements Runnable
     // report any exceptions
     if (e != null)
     {
-      Cache.log.warn("Unexpected exception when executing the " + extype
+      Cache.warn("Unexpected exception when executing the " + extype
               + " runnable for property " + property, e);
     }
   }
@@ -194,58 +193,53 @@ public class PromptUserConfig implements Runnable
    */
   private void raiseDialog()
   {
-    if (jalview.bin.Cache.log.isDebugEnabled())
+    if (Cache.isDebugEnabled())
     {
-      jalview.bin.Cache.log.debug("Prompting user for " + dialogTitle
+      Cache.debug("Prompting user for " + dialogTitle
               + " for Cache property " + property);
     }
     try
     {
-      int reply = JOptionPane.showConfirmDialog(
-              Desktop.desktop, // component,
+      int reply = JvOptionPane.showConfirmDialog(Desktop.desktop, // component,
               dialogText, dialogTitle,
-              (allowCancel) ? JOptionPane.YES_NO_CANCEL_OPTION
-                      : JOptionPane.YES_NO_OPTION,
-              JOptionPane.QUESTION_MESSAGE);
-      // now, ask the desktop to relayer any external windows that might have
-      // been obsured
-      if (Desktop.instance != null)
-      {
-        Desktop.instance.relayerWindows();
-      }
+              (allowCancel) ? JvOptionPane.YES_NO_CANCEL_OPTION
+                      : JvOptionPane.YES_NO_OPTION,
+              JvOptionPane.QUESTION_MESSAGE);
+
       // and finish parsing the result
-      jalview.bin.Cache.log.debug("Got response : " + reply);
-      if (reply == JOptionPane.YES_OPTION)
+      Cache.debug("Got response : " + reply);
+      if (reply == JvOptionPane.YES_OPTION)
       {
-        jalview.bin.Cache.setProperty(property, "true");
+        Cache.setProperty(property, "true");
       }
-      else if (reply == JOptionPane.NO_OPTION)
+      else if (reply == JvOptionPane.NO_OPTION)
       {
         if (removeifunset)
         {
-          jalview.bin.Cache.removeProperty(property);
+          Cache.removeProperty(property);
         }
         else
         {
-          jalview.bin.Cache.setProperty(property, "false");
+          Cache.setProperty(property, "false");
         }
       }
       else
       {
-        jalview.bin.Cache.log.debug("User cancelled setting " + property);
+        Cache.debug("User cancelled setting " + property);
         return;
       }
       // verify the property is set for debugging
-      if (jalview.bin.Cache.log.isDebugEnabled())
+      if (Cache.isDebugEnabled())
       {
-        jalview.bin.Cache.log.debug("User set property to "
-                + jalview.bin.Cache.getProperty(property));
+        Cache.debug("User set property to "
+                + Cache.getProperty(property));
       }
     } catch (Exception e)
     {
-      jalview.bin.Cache.log.warn(
+      Cache.warn(
               "Unexpected exception when prompting user for yes/no setting for property "
-                      + property, e);
+                      + property,
+              e);
     }
   }
 }