JAL-4409 JAL-4160 Don't let getdown turn jalviewX:// URIs into absolute local file...

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

diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java
index d2af966..004cf4a 100644 (file)
--- a/src/jalview/gui/UserQuestionnaireCheck.java
+++ b/src/jalview/gui/UserQuestionnaireCheck.java
@@ -20,14 +20,14 @@
  */
 package jalview.gui;
 
-import jalview.bin.Cache;
-import jalview.util.MessageManager;
-
 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.HttpUtils;
+import jalview.util.MessageManager;
 
 public class UserQuestionnaireCheck implements Runnable
 {
@@ -43,7 +43,7 @@ public class UserQuestionnaireCheck implements Runnable
   {
     if (url.indexOf("questionnaire.pl") == -1)
     {
-      Cache.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.");
     }
@@ -57,12 +57,12 @@ public class UserQuestionnaireCheck implements Runnable
 
   private boolean checkresponse(URL qurl) throws Exception
   {
-    Cache.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
     BufferedReader br = new BufferedReader(
-            new InputStreamReader(qurl.openStream()));
+            new InputStreamReader(HttpUtils.openStream(qurl)));
     String qresp;
     while ((qresp = br.readLine()) != null)
     {
@@ -140,7 +140,7 @@ public class UserQuestionnaireCheck implements Runnable
       {
         String qurl = url + (url.indexOf('?') > -1 ? "&" : "?") + "qid="
                 + qid + "&rid=" + rid;
-        Cache.info("Prompting user for questionnaire at " + qurl);
+        Console.info("Prompting user for questionnaire at " + qurl);
         int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
                 MessageManager.getString("label.jalview_new_questionnaire"),
                 MessageManager.getString("label.jalview_user_survey"),
@@ -148,13 +148,13 @@ public class UserQuestionnaireCheck implements Runnable
 
         if (reply == JvOptionPane.YES_OPTION)
         {
-          Cache.debug("Opening " + qurl);
+          Console.debug("Opening " + qurl);
           jalview.util.BrowserLauncher.openURL(qurl);
         }
       }
     } catch (Exception e)
     {
-      Cache.warn("When trying to access questionnaire URL " + url, e);
+      Console.warn("When trying to access questionnaire URL " + url, e);
     }
   }