git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2164 create RESNUM features with padding the same as for pre 2.10 features
[jalview.git]
/
src
/
jalview
/
util
/
UrlLink.java
diff --git
a/src/jalview/util/UrlLink.java
b/src/jalview/util/UrlLink.java
index
c716110
..
4297090
100644
(file)
--- a/
src/jalview/util/UrlLink.java
+++ b/
src/jalview/util/UrlLink.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-208,8
+208,7
@@
public class UrlLink
if (ns == 0)
{
// take whole regex
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[]
url_prefix + rg.stringMatched() + url_suffix };
} /*
* else if (ns==1) { // take only subgroup match return new String[]
@@
-288,13
+287,11
@@
public class UrlLink
}
// just return simple url substitution.
}
// just return simple url substitution.
- return new String[]
- { idstring, url_prefix + idstring + url_suffix };
+ return new String[] { idstring, url_prefix + idstring + url_suffix };
}
else
{
}
else
{
- return new String[]
- { "", url_prefix };
+ return new String[] { "", url_prefix };
}
}
}
}
@@
-329,8
+326,7
@@
public class UrlLink
public static void main(String argv[])
{
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",
/*
* "AlinkT|Target|http://foo.foo.soo/",
* "myUrl1|http://$SEQUENCE_ID=/[0-9]+/=$.someserver.org/foo",
@@
-346,8
+342,7
@@
public class UrlLink
* , "NOTFER|http://notfer.org/$SEQUENCE_ID=/(?<!\\s)(.+)/=$",
*/
"NESTED|http://nested/$SEQUENCE_ID=/^(?:Label:)?(?:(?:gi\\|(\\d+))|([^:]+))/=$/nested" };
* , "NOTFER|http://notfer.org/$SEQUENCE_ID=/(?<!\\s)(.+)/=$",
*/
"NESTED|http://nested/$SEQUENCE_ID=/^(?:Label:)?(?:(?:gi\\|(\\d+))|([^:]+))/=$/nested" };
- String[] idstrings = new String[]
- {
+ String[] idstrings = new String[] {
/*
* //"LGUL_human", //"QWIQW_123123", "uniprot|why_do+_12313_foo",
* //"123123312", "123123 ABCDE foo", "PFAM:PF23943",
/*
* //"LGUL_human", //"QWIQW_123123", "uniprot|why_do+_12313_foo",
* //"123123312", "123123 ABCDE foo", "PFAM:PF23943",