JAL-2885 renamed base URL getter from getDomain..

diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java
index 6cec4ef..fb4e396 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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();
   }