From 7b9c6bc2db695c996b7bd4e536a6718b22042125 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 23 Feb 2018 11:24:03 +0000 Subject: [PATCH] JAL-2885 renamed base URL getter from getDomain.. --- src/jalview/ws/dbsources/Pfam.java | 2 +- src/jalview/ws/dbsources/Rfam.java | 2 +- src/jalview/ws/dbsources/Xfam.java | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java index 6cec4ef..fb4e396 100644 --- a/src/jalview/ws/dbsources/Pfam.java +++ b/src/jalview/ws/dbsources/Pfam.java @@ -96,7 +96,7 @@ abstract public class Pfam extends Xfam } @Override - protected String getDomain() + protected String getURLPrefix() { return Cache.getDefault(PFAM_DOMAIN_KEY, DEFAULT_PFAM_DOMAIN); } diff --git a/src/jalview/ws/dbsources/Rfam.java b/src/jalview/ws/dbsources/Rfam.java index bed1b48..58c648b 100644 --- a/src/jalview/ws/dbsources/Rfam.java +++ b/src/jalview/ws/dbsources/Rfam.java @@ -37,7 +37,7 @@ abstract public class Rfam extends Xfam private static final String DEFAULT_RFAM_DOMAIN = "http://rfam.xfam.org"; @Override - protected String getDomain() + protected String getURLPrefix() { return Cache.getDefault(RFAM_DOMAIN_KEY, DEFAULT_RFAM_DOMAIN); } diff --git a/src/jalview/ws/dbsources/Xfam.java b/src/jalview/ws/dbsources/Xfam.java index e336c7d..b83f558 100644 --- a/src/jalview/ws/dbsources/Xfam.java +++ b/src/jalview/ws/dbsources/Xfam.java @@ -42,7 +42,12 @@ public abstract class Xfam extends DbSourceProxyImpl super(); } - protected abstract String getDomain(); + /** + * the base URL for this Xfam-like service + * + * @return + */ + protected abstract String getURLPrefix(); @Override public abstract String getDbVersion(); @@ -84,7 +89,7 @@ public abstract class Xfam extends DbSourceProxyImpl String getURL(String queries) { - return getDomain() + "/family/" + queries.trim().toUpperCase() + return getURLPrefix() + "/family/" + queries.trim().toUpperCase() + getURLSuffix(); } -- 1.7.10.2