X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FUrlLink.java;h=85a4bc81249a1eb5c025dc5849887278e2fe9395;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=2936ac3d66ef01f9e8ef46f5ab63cd6686680dcc;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index 2936ac3..85a4bc8 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 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; @@ -206,8 +208,7 @@ public class UrlLink if (ns == 0) { // take whole regex - return new String[] - { rg.stringMatched(), + return new String[] { rg.stringMatched(), url_prefix + rg.stringMatched() + url_suffix }; } /* * else if (ns==1) { // take only subgroup match return new String[] @@ -286,13 +287,11 @@ public class UrlLink } // just return simple url substitution. - return new String[] - { idstring, url_prefix + idstring + url_suffix }; + return new String[] { idstring, url_prefix + idstring + url_suffix }; } else { - return new String[] - { "", url_prefix }; + return new String[] { "", url_prefix }; } } @@ -327,8 +326,7 @@ public class UrlLink public static void main(String argv[]) { - String[] links = new String[] - { + String[] links = new String[] { /* * "AlinkT|Target|http://foo.foo.soo/", * "myUrl1|http://$SEQUENCE_ID=/[0-9]+/=$.someserver.org/foo", @@ -344,8 +342,7 @@ public class UrlLink * , "NOTFER|http://notfer.org/$SEQUENCE_ID=/(?