JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

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

diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java
index ef86756..df64db0 100644 (file)
--- a/src/jalview/gui/UserQuestionnaireCheck.java
+++ b/src/jalview/gui/UserQuestionnaireCheck.java
@@ -21,13 +21,12 @@
 package jalview.gui;
 
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
 
-import javax.swing.JOptionPane;
-
 public class UserQuestionnaireCheck implements Runnable
 {
   /**
@@ -91,6 +90,7 @@ public class UserQuestionnaireCheck implements Runnable
     return prompt;
   }
 
+  @Override
   public void run()
   {
     if (url == null)
@@ -101,7 +101,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 = jalview.bin.Cache.getProperty(Preferences.QUESTIONNAIRE);
       if (lastq == null)
       {
         prompt = checkresponse(new URL(url
@@ -133,7 +133,7 @@ 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);
+        jalview.bin.Cache.setProperty(Preferences.QUESTIONNAIRE, qid + ":" + rid);
       }
       if (prompt)
       {
@@ -141,7 +141,7 @@ public class UserQuestionnaireCheck implements Runnable
                 + qid + "&rid=" + rid;
         jalview.bin.Cache.log
                 .info("Prompting user for questionnaire at " + qurl);
-        int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
+        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);
@@ -149,7 +149,7 @@ public class UserQuestionnaireCheck implements Runnable
         if (reply == JvOptionPane.YES_OPTION)
         {
           jalview.bin.Cache.log.debug("Opening " + qurl);
-          jalview.util.BrowserLauncher.openURL(qurl);
+          Platform.openURL(qurl);
         }
       }
     } catch (Exception e)