git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3026 Java bug associated with File/String mods
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
Xfam.java
diff --git
a/src/jalview/ws/dbsources/Xfam.java
b/src/jalview/ws/dbsources/Xfam.java
index
26291eb
..
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();
}
super();
}
- protected abstract String getXFAMURL();
+ /**
+ * the base URL for this Xfam-like service
+ *
+ * @return
+ */
+ protected abstract String getURLPrefix();
@Override
public abstract String getDbVersion();
@Override
public abstract String getDbVersion();
@@
-57,8
+62,7
@@
public abstract class Xfam extends DbSourceProxyImpl
// retrieved.
startQuery();
// TODO: trap HTTP 404 exceptions and return null
// retrieved.
startQuery();
// TODO: trap HTTP 404 exceptions and return null
- String xfamUrl = getXFAMURL() + queries.trim().toUpperCase()
- + getXFAMURLSUFFIX();
+ String xfamUrl = getURL(queries);
if (Cache.log != null)
{
if (Cache.log != null)
{
@@
-83,6
+87,12
@@
public abstract class Xfam extends DbSourceProxyImpl
return rcds;
}
return rcds;
}
+ String getURL(String queries)
+ {
+ return getURLPrefix() + "/family/" + queries.trim().toUpperCase()
+ + getURLSuffix();
+ }
+
/**
* Pfam and Rfam provide alignments
*/
/**
* Pfam and Rfam provide alignments
*/
@@
-97,7
+107,7
@@
public abstract class Xfam extends DbSourceProxyImpl
*
* @return "" for most Xfam sources
*/
*
* @return "" for most Xfam sources
*/
- public String getXFAMURLSUFFIX()
+ public String getURLSuffix()
{
return "";
}
{
return "";
}