JAL-3954 Register AlignFrame as web service change listener and add menus

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

diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java
index ef86756..b75218e 100644 (file)
--- a/src/jalview/gui/UserQuestionnaireCheck.java
+++ b/src/jalview/gui/UserQuestionnaireCheck.java
@@ -20,7 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.util.MessageManager;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -28,6 +27,10 @@ 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
 {
   /**
@@ -42,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.");
     }
@@ -56,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
@@ -101,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
@@ -133,29 +136,27 @@ 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);
-        int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
+        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"),
                 JvOptionPane.YES_NO_OPTION, JvOptionPane.QUESTION_MESSAGE);
 
         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);
     }
   }