From 388ffb29d4febc6b9c705c45ccf9580d30f96c2f Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 23 Feb 2018 11:39:34 +0000 Subject: [PATCH] JAL-2885 XFAM_DOMAIN->XFAM_BASEURL --- src/jalview/ws/dbsources/Pfam.java | 7 ++++--- src/jalview/ws/dbsources/Rfam.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java index fb4e396..d07bd14 100644 --- a/src/jalview/ws/dbsources/Pfam.java +++ b/src/jalview/ws/dbsources/Pfam.java @@ -35,8 +35,9 @@ import com.stevesoft.pat.Regex; */ abstract public class Pfam extends Xfam { - private static final String PFAM_DOMAIN_KEY = "PFAM_DOMAIN"; - private static final String DEFAULT_PFAM_DOMAIN = "http://pfam.xfam.org"; + private static final String PFAM_BASEURL_KEY = "PFAM_BASEURL"; + + private static final String DEFAULT_PFAM_BASEURL = "http://pfam.xfam.org"; public Pfam() { @@ -98,7 +99,7 @@ abstract public class Pfam extends Xfam @Override protected String getURLPrefix() { - return Cache.getDefault(PFAM_DOMAIN_KEY, DEFAULT_PFAM_DOMAIN); + return Cache.getDefault(PFAM_BASEURL_KEY, DEFAULT_PFAM_BASEURL); } /* diff --git a/src/jalview/ws/dbsources/Rfam.java b/src/jalview/ws/dbsources/Rfam.java index 58c648b..b12f107 100644 --- a/src/jalview/ws/dbsources/Rfam.java +++ b/src/jalview/ws/dbsources/Rfam.java @@ -32,14 +32,14 @@ import com.stevesoft.pat.Regex; */ abstract public class Rfam extends Xfam { - private static final String RFAM_DOMAIN_KEY = "RFAM_DOMAIN"; + private static final String RFAM_BASEURL_KEY = "RFAM_BASEURL"; - private static final String DEFAULT_RFAM_DOMAIN = "http://rfam.xfam.org"; + private static final String DEFAULT_RFAM_BASEURL = "http://rfam.xfam.org"; @Override protected String getURLPrefix() { - return Cache.getDefault(RFAM_DOMAIN_KEY, DEFAULT_RFAM_DOMAIN); + return Cache.getDefault(RFAM_BASEURL_KEY, DEFAULT_RFAM_BASEURL); } public Rfam() -- 1.7.10.2