X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FUserQuestionnaireCheck.java;h=385eb57338815bf0f1402f9734c0f9cb45aff2a1;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hp=182ab1c1387b66943e6eb0ebf0c9d2dc8329da53;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git
diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java
index 182ab1c..385eb57 100644
--- a/src/jalview/gui/UserQuestionnaireCheck.java
+++ b/src/jalview/gui/UserQuestionnaireCheck.java
@@ -1,26 +1,34 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.io.*;
-import java.net.*;
+import jalview.bin.Cache;
+import jalview.bin.Console;
+import jalview.util.MessageManager;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
-import javax.swing.*;
+import javax.swing.JOptionPane;
public class UserQuestionnaireCheck implements Runnable
{
@@ -36,11 +44,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.");
+ 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.");
}
else
{
@@ -52,12 +58,12 @@ 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
- BufferedReader br = new BufferedReader(new InputStreamReader(
- qurl.openStream()));
+ BufferedReader br = new BufferedReader(
+ new InputStreamReader(qurl.openStream()));
String qresp;
while ((qresp = br.readLine()) != null)
{
@@ -97,7 +103,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
@@ -108,8 +114,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;
@@ -128,30 +135,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 = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- "There is a new Questionnaire available."
- + "Would you like to complete it now ?\n",
- "Jalview User Survey", JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
+ 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"),
+ JvOptionPane.YES_NO_OPTION, JvOptionPane.QUESTION_MESSAGE);
- if (reply == JOptionPane.YES_OPTION)
+ 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);
}
}