X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FUrlLink.java;h=007da86f5d00fb2b2b9d3303972dd45839a07e77;hb=ac5f0c912a1c7819530456bab13942ad3734460b;hp=a8c0b324df11e44136ade1acaa6c18dc0efb3bf2;hpb=b8961bc1a1c973c507489abb91572c73edcda1e2;p=jalview.git diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index a8c0b32..007da86 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -20,9 +20,17 @@ */ package jalview.util; +import static jalview.util.UrlConstants.DB_ACCESSION; +import static jalview.util.UrlConstants.DELIM; +import static jalview.util.UrlConstants.SEP; import static jalview.util.UrlConstants.SEQUENCE_ID; -import static jalview.util.UrlConstants.SEQUENCE_NAME; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.SequenceI; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.Vector; public class UrlLink @@ -33,19 +41,34 @@ public class UrlLink * Jalview 2.4 extension allows regular expressions to be used to parse ID * strings and replace the result in the URL. Regex's operate on the whole ID * string given to the matchURL method, if no regex is supplied, then only - * text following the first pipe symbol will be susbstituted. Usage + * text following the first pipe symbol will be substituted. Usage * documentation todo. */ - private String url_suffix, url_prefix, target, label, regexReplace; + + private static final String EQUALS = "="; + + private static final String SPACE = " "; + + private String urlSuffix; + + private String urlPrefix; + + private String target; + + private String label; + + private String dbname; + + private String regexReplace; private boolean dynamic = false; - private boolean uses_seq_id = false; + private boolean usesDBaccession = false; private String invalidMessage = null; /** - * parse the given linkString of the form '