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
Merge branch 'develop' into bug/JAL-4235_gradle_task_jalviewjsTranspile_does_not_fail...
[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
9340f65
..
36d9891
100644
(file)
--- a/
src/jalview/ws/dbsources/Xfam.java
+++ b/
src/jalview/ws/dbsources/Xfam.java
@@
-22,7
+22,7
@@
package jalview.ws.dbsources;
import java.util.Locale;
import java.util.Locale;
-import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.io.DataSourceType;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.io.DataSourceType;
@@
-65,10
+65,7
@@
public abstract class Xfam extends DbSourceProxyImpl
// TODO: trap HTTP 404 exceptions and return null
String xfamUrl = getURL(queries);
// TODO: trap HTTP 404 exceptions and return null
String xfamUrl = getURL(queries);
- if (Cache.log != null)
- {
- Cache.log.debug("XFAM URL for retrieval is: " + xfamUrl);
- }
+ Console.debug("XFAM URL for retrieval is: " + xfamUrl);
AlignmentI rcds = new FormatAdapter().readFile(xfamUrl,
DataSourceType.URL, FileFormat.Stockholm);
AlignmentI rcds = new FormatAdapter().readFile(xfamUrl,
DataSourceType.URL, FileFormat.Stockholm);
@@
-90,8
+87,8
@@
public abstract class Xfam extends DbSourceProxyImpl
String getURL(String queries)
{
String getURL(String queries)
{
- return getURLPrefix() + "/family/" + queries.trim().toUpperCase(Locale.ROOT)
- + getURLSuffix();
+ return getURLPrefix() + "/family/"
+ + queries.trim().toUpperCase(Locale.ROOT) + getURLSuffix();
}
/**
}
/**