X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserQuestionnaireCheck.java;h=8c3c76e16c7b43d7914b07b112a6698b46a7a6ff;hb=3609d4b908fa64cab35f2348401baab3347188fc;hp=dc23978ac642a7aae9fb40e2884bf5b90f5c2724;hpb=2f4f1d8fb6878271b64f327bc58c895f458137af;p=jalview.git diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java index dc23978..8c3c76e 100644 --- a/src/jalview/gui/UserQuestionnaireCheck.java +++ b/src/jalview/gui/UserQuestionnaireCheck.java @@ -1,29 +1,30 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * Copyright (C) 2014 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. * * 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 jalview.util.MessageManager; -import java.io.*; -import java.net.*; - -import javax.swing.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; public class UserQuestionnaireCheck implements Runnable { @@ -39,11 +40,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 { @@ -59,8 +58,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) { @@ -111,8 +110,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; @@ -137,14 +137,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, + 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"), JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); + 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); @@ -152,8 +152,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); } }