X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FUrlLink.java;h=3ee64329521fe8af4b8d201a508c2858a0e70612;hb=fd7eebe6dcf2346692d718ef91bb468cc12ebf44;hp=3f72ab4fd37447cb0fdc0bea46e3677a27ce0c70;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index 3f72ab4..3ee6432 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -20,6 +20,15 @@ */ package jalview.util; +import static jalview.util.UrlConstants.DB_ACCESSION; +import static jalview.util.UrlConstants.SEQUENCE_ID; + +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 @@ -30,17 +39,33 @@ 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; + + // Internal constants + private static final String SEP = "|"; + + private static final String DELIM = "$"; + + private String urlSuffix; + + private String urlPrefix; + + private String target; + + private String label; + + private String regexReplace; private boolean dynamic = false; + private boolean usesDBaccession = false; + private String invalidMessage = null; /** - * parse the given linkString of the form '