/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
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
{
/**
{
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
{
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)
{
return prompt;
}
+ @Override
public void run()
{
if (url == null)
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
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;
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)
{
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.getDesktopPane(),
+ 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);
+ Platform.openURL(qurl);
}
}
} 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);
}
}