X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FGroupUrlLink.java;h=2b5dc74e154381fdee64ab8eec4917c13ba9f7aa;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=243be6322412c35c935beed04c97b0f1f7c8c758;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/util/GroupUrlLink.java b/src/jalview/util/GroupUrlLink.java index 243be63..2b5dc74 100644 --- a/src/jalview/util/GroupUrlLink.java +++ b/src/jalview/util/GroupUrlLink.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) * Copyright (C) 2014 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.util; @@ -394,8 +396,7 @@ public class GroupUrlLink { dsstring }); if (idstrings.length != seqstrings.length) { - throw new Error( - "idstrings and seqstrings contain one string each per sequence."); + throw new Error(MessageManager.getString("error.idstring_seqstrings_only_one_per_sequence")); } return rstrings; } @@ -485,18 +486,14 @@ public class GroupUrlLink { if (maxs != idseq[i].length) { - throw new Error( - "Cannot have mixed length replacement vectors. Replacement vector for " - + (mtch[i]) + " is " + idseq[i].length - + " strings long, and have already seen a " - + maxs + " length vector."); + throw new Error(MessageManager.formatMessage("error.cannot_have_mixed_length_replacement_vectors", + new String[]{(mtch[i]), Integer.valueOf(idseq[i].length).toString(),Integer.valueOf(maxs).toString()})); } } } else { - throw new Error( - "Cannot have zero length vector of replacement strings - either 1 value or n values."); + throw new Error(MessageManager.getString("error.cannot_have_zero_length_vector_replacement_strings")); } } // iterate through input, collating segments to be inserted into url @@ -819,6 +816,7 @@ public class GroupUrlLink public static void main(String argv[]) { + // note - JAL-1383 - these services are all dead String[] links = new String[] { "EnVision2|IDS|http://www.ebi.ac.uk/enfin-srv/envision2/pages/linkin.jsf?workflow=Enfin%20Default%20Workflow&datasetName=linkInDatasetFromJalview&input=$SEQUENCEIDS$&inputType=0|,",