X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserQuestionnaireCheck.java;h=b75218e7da4715d9a358ff6a6b6dd08d8d604973;hb=5f4f772b4ce40f2ea987cb03dd2c06ec1f48ba67;hp=2f6a5c269b9dc335a322ccd71a63a200edd49253;hpb=48e68905336d8ee17ee6b3903d80b36bac8c56cf;p=jalview.git

diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java
index 2f6a5c2..b75218e 100644
--- a/src/jalview/gui/UserQuestionnaireCheck.java
+++ b/src/jalview/gui/UserQuestionnaireCheck.java
@@ -20,10 +20,15 @@
  */
 package jalview.gui;
 
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
 
+import javax.swing.JOptionPane;
+
+import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.util.MessageManager;
 
 public class UserQuestionnaireCheck implements Runnable
@@ -40,7 +45,7 @@ public class UserQuestionnaireCheck implements Runnable
   {
     if (url.indexOf("questionnaire.pl") == -1)
     {
-      jalview.bin.Cache.log.error("'" + url
+      Console.error("'" + url
               + "' is an Invalid URL for the checkForQuestionnaire() method.\n"
               + "This argument is only for questionnaires derived from jalview's questionnaire.pl cgi interface.");
     }
@@ -54,7 +59,7 @@ public class UserQuestionnaireCheck implements Runnable
 
   private boolean checkresponse(URL qurl) throws Exception
   {
-    jalview.bin.Cache.log.debug("Checking Response for : " + qurl);
+    Console.debug("Checking Response for : " + qurl);
     boolean prompt = false;
     // see if we have already responsed to this questionnaire or get a new
     // qid/rid pair
@@ -99,7 +104,7 @@ public class UserQuestionnaireCheck implements Runnable
     try
     {
       // First - check to see if wee have an old questionnaire/response id pair.
-      String lastq = jalview.bin.Cache.getProperty("QUESTIONNAIRE");
+      String lastq = Cache.getProperty("QUESTIONNAIRE");
       if (lastq == null)
       {
         prompt = checkresponse(new URL(url
@@ -131,14 +136,13 @@ public class UserQuestionnaireCheck implements Runnable
       if (qid != null && rid != null)
       {
         // Update our local property cache with latest qid and rid
-        jalview.bin.Cache.setProperty("QUESTIONNAIRE", qid + ":" + rid);
+        Cache.setProperty("QUESTIONNAIRE", qid + ":" + rid);
       }
       if (prompt)
       {
         String qurl = url + (url.indexOf('?') > -1 ? "&" : "?") + "qid="
                 + qid + "&rid=" + rid;
-        jalview.bin.Cache.log
-                .info("Prompting user for questionnaire at " + qurl);
+        Console.info("Prompting user for questionnaire at " + qurl);
         int reply = JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(),
                 MessageManager.getString("label.jalview_new_questionnaire"),
                 MessageManager.getString("label.jalview_user_survey"),
@@ -146,14 +150,13 @@ public class UserQuestionnaireCheck implements Runnable
 
         if (reply == JvOptionPane.YES_OPTION)
         {
-          jalview.bin.Cache.log.debug("Opening " + qurl);
+          Console.debug("Opening " + qurl);
           jalview.util.BrowserLauncher.openURL(qurl);
         }
       }
     } catch (Exception e)
     {
-      jalview.bin.Cache.log
-              .warn("When trying to access questionnaire URL " + url, e);
+      Console.warn("When trying to access questionnaire URL " + url, e);
     }
   }