From cec2422864f7a07513a5e6da8673885e6740d29a Mon Sep 17 00:00:00 2001 From: kiramt Date: Wed, 2 Nov 2016 10:03:15 +0000 Subject: [PATCH] JAL-2282 Code tidy --- src/jalview/util/UrlLink.java | 155 ++++++++++++++++++++++++----------------- 1 file changed, 92 insertions(+), 63 deletions(-) diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index 0d92759..b8e3eeb 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -39,19 +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 uses_db_accession = false; + private boolean usesDBaccession = false; private String invalidMessage = null; /** - * parse the given linkString of the form '