X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FCustomUrlProvider.java;h=e6f19fbbd9b3d3defd0a312cb1d3329c39cbb780;hb=d3cabbfdd38d554bb8a8b17d3e2c4b113c102545;hp=f679e36adf18f40b8d41bdfdedd201a9130fdcff;hpb=0ccf65bf92f9d299339437b139458c93b8fdaf19;p=jalview.git diff --git a/src/jalview/util/CustomUrlProvider.java b/src/jalview/util/CustomUrlProvider.java index f679e36..e6f19fb 100644 --- a/src/jalview/util/CustomUrlProvider.java +++ b/src/jalview/util/CustomUrlProvider.java @@ -22,9 +22,12 @@ package jalview.util; import static jalview.util.UrlConstants.DB_ACCESSION; -import static jalview.util.UrlConstants.EMBLEBI_STRING; +import static jalview.util.UrlConstants.DELIM; +//import static jalview.util.UrlConstants.EMBLEBI_LABEL; +//import static jalview.util.UrlConstants.EMBLEBI_STRING; +import static jalview.util.UrlConstants.SEP; import static jalview.util.UrlConstants.SEQUENCE_ID; -import static jalview.util.UrlConstants.SRS_STRING; +//import static jalview.util.UrlConstants.SRS_LABEL; import java.util.HashMap; import java.util.Iterator; @@ -40,81 +43,118 @@ import java.util.Vector; * @author $author$ * @version $Revision$ */ -public class CustomUrlProvider implements UrlProviderI +public class CustomUrlProvider extends UrlProviderImpl { + // minimum length of substitution in url link string + private static final int MIN_SUBST_LENGTH = 4; + + // Default sequence URL link label for SRS + private static final String SRS_LABEL = "SRS"; + + // map of string ids to urlLinks private HashMap urls; + /** + * Construct UrlProvider for custom (user-entered) URLs + * + * @param cachedUrlList + * list of URLs in form stored in Cache. i.e. SEP delimited string + */ public CustomUrlProvider(String cachedUrlList) { try { - StringTokenizer st = new StringTokenizer(cachedUrlList, "|"); + urls = new HashMap(); + + // cachedUrlList is in form