X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserQuestionnaireCheck.java;h=182ab1c1387b66943e6eb0ebf0c9d2dc8329da53;hb=1379350f04bc63ca05bd428afb86717c4764755d;hp=0fdea6c546e85695098516eab58ce20c496ee50a;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/gui/UserQuestionnaireCheck.java b/src/jalview/gui/UserQuestionnaireCheck.java index 0fdea6c..182ab1c 100644 --- a/src/jalview/gui/UserQuestionnaireCheck.java +++ b/src/jalview/gui/UserQuestionnaireCheck.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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 . */ package jalview.gui; @@ -57,8 +56,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) { @@ -109,14 +108,14 @@ 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; qid = qqid; String qrid = lastq.substring(lastq.indexOf(':') + 1); // retrieve - // old rid + // old rid if (qrid != null && !qrid.equals("null")) { rid = qrid;