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 cb59452..d1fd7dd 100644 (file)
--- a/src/jalview/gui/PromptUserConfig.java
+++ b/src/jalview/gui/PromptUserConfig.java
@@ -89,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
@@ -126,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)
@@ -183,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);
     }
   }
@@ -193,9 +193,9 @@ 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
@@ -207,36 +207,36 @@ public class PromptUserConfig implements Runnable
               JvOptionPane.QUESTION_MESSAGE);
 
       // and finish parsing the result
-      jalview.bin.Cache.log.debug("Got response : " + reply);
+      Cache.debug("Got response : " + reply);
       if (reply == JvOptionPane.YES_OPTION)
       {
-        jalview.bin.Cache.setProperty(property, "true");
+        Cache.setProperty(property, "true");
       }
       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);