X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPromptUserConfig.java;h=e8fea51bd032cb5851ea1ce23e0b7fe0cdb1d1b6;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=77d83a83ea3161f4f03ac07b41c28d374caf3ddc;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java index 77d83a8..e8fea51 100644 --- a/src/jalview/gui/PromptUserConfig.java +++ b/src/jalview/gui/PromptUserConfig.java @@ -21,6 +21,7 @@ package jalview.gui; import jalview.bin.Cache; +import jalview.bin.Console; import java.awt.Component; @@ -89,7 +90,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 +127,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."); + Console.debug("Got user response."); } - lastq = jalview.bin.Cache.getProperty(property); + lastq = Cache.getProperty(property); String extype = ""; Exception e = null; if (lastq == null) @@ -183,7 +184,7 @@ public class PromptUserConfig implements Runnable // report any exceptions if (e != null) { - Cache.log.warn("Unexpected exception when executing the " + extype + Console.warn("Unexpected exception when executing the " + extype + " runnable for property " + property, e); } } @@ -193,9 +194,9 @@ public class PromptUserConfig implements Runnable */ private void raiseDialog() { - if (jalview.bin.Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - jalview.bin.Cache.log.debug("Prompting user for " + dialogTitle + Console.debug("Prompting user for " + dialogTitle + " for Cache property " + property); } try @@ -207,36 +208,36 @@ public class PromptUserConfig implements Runnable JvOptionPane.QUESTION_MESSAGE); // and finish parsing the result - jalview.bin.Cache.log.debug("Got response : " + reply); + Console.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); + Console.debug("User cancelled setting " + property); return; } // verify the property is set for debugging - if (jalview.bin.Cache.log.isDebugEnabled()) + if (Console.isDebugEnabled()) { - jalview.bin.Cache.log.debug("User set property to " - + jalview.bin.Cache.getProperty(property)); + Console.debug( + "User set property to " + Cache.getProperty(property)); } } catch (Exception e) { - jalview.bin.Cache.log.warn( + Console.warn( "Unexpected exception when prompting user for yes/no setting for property " + property, e);