X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserQuestionnaireCheck.java;h=ef867564e3b9fa2e073f71d3749b99fc32606d2b;hb=e1aa3fdd1ca82abf5acc0cd3c2b86a5ca1083941;hp=02f6054910454e40c18c4480fd358ca059759539;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java
index 02f6054..ef86756 100644
--- a/src/jalview/gui/UserQuestionnaireCheck.java
+++ b/src/jalview/gui/UserQuestionnaireCheck.java
@@ -22,10 +22,11 @@ package jalview.gui;
 
 import jalview.util.MessageManager;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
 
 public class UserQuestionnaireCheck implements Runnable
 {
@@ -41,11 +42,9 @@ public class UserQuestionnaireCheck implements Runnable
   {
     if (url.indexOf("questionnaire.pl") == -1)
     {
-      jalview.bin.Cache.log
-              .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.");
+      jalview.bin.Cache.log.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.");
     }
     else
     {
@@ -61,8 +60,8 @@ public class UserQuestionnaireCheck implements Runnable
     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()));
+    BufferedReader br = new BufferedReader(
+            new InputStreamReader(qurl.openStream()));
     String qresp;
     while ((qresp = br.readLine()) != null)
     {
@@ -113,8 +112,9 @@ public class UserQuestionnaireCheck implements Runnable
         String qurl = url + (url.indexOf('?') > -1 ? "&" : "?")
                 + "checkresponse=1";
         // query the server with the old qid/id pair
-        String qqid = lastq.indexOf(':') > -1 ? lastq.substring(0,
-                lastq.indexOf(':')) : null;
+        String qqid = lastq.indexOf(':') > -1
+                ? lastq.substring(0, lastq.indexOf(':'))
+                : null;
         if (qqid != null && qqid != "null" && qqid.length() > 0)
         {
           qurl += "&qid=" + qqid;
@@ -139,17 +139,14 @@ public class UserQuestionnaireCheck implements Runnable
       {
         String qurl = url + (url.indexOf('?') > -1 ? "&" : "?") + "qid="
                 + qid + "&rid=" + rid;
-        jalview.bin.Cache.log.info("Prompting user for questionnaire at "
-                + qurl);
-        int reply = JOptionPane
-                .showInternalConfirmDialog(Desktop.desktop, MessageManager
-                        .getString("label.jalview_new_questionnaire"),
-                        MessageManager
-                                .getString("label.jalview_user_survey"),
-                        JOptionPane.YES_NO_OPTION,
-                        JOptionPane.QUESTION_MESSAGE);
+        jalview.bin.Cache.log
+                .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"),
+                JvOptionPane.YES_NO_OPTION, JvOptionPane.QUESTION_MESSAGE);
 
-        if (reply == JOptionPane.YES_OPTION)
+        if (reply == JvOptionPane.YES_OPTION)
         {
           jalview.bin.Cache.log.debug("Opening " + qurl);
           jalview.util.BrowserLauncher.openURL(qurl);
@@ -157,8 +154,8 @@ public class UserQuestionnaireCheck implements Runnable
       }
     } catch (Exception e)
     {
-      jalview.bin.Cache.log.warn("When trying to access questionnaire URL "
-              + url, e);
+      jalview.bin.Cache.log
+              .warn("When trying to access questionnaire URL " + url, e);
     }
   }