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-2418 source formatting
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
RfamFull.java
diff --git
a/src/jalview/ws/dbsources/RfamFull.java
b/src/jalview/ws/dbsources/RfamFull.java
index
74f4ec6
..
b2ca31a
100644
(file)
--- a/
src/jalview/ws/dbsources/RfamFull.java
+++ b/
src/jalview/ws/dbsources/RfamFull.java
@@
-20,15
+20,13
@@
*/
package jalview.ws.dbsources;
*/
package jalview.ws.dbsources;
-import jalview.ws.seqfetcher.DbSourceProxy;
-
/**
* Flyweight class specifying retrieval of Full family alignments from RFAM
*
* @author Lauren Michelle Lui
*
*/
/**
* Flyweight class specifying retrieval of Full family alignments from RFAM
*
* @author Lauren Michelle Lui
*
*/
-public class RfamFull extends Rfam implements DbSourceProxy
+public class RfamFull extends Rfam
{
public RfamFull()
{
{
public RfamFull()
{
@@
-40,9
+38,17
@@
public class RfamFull extends Rfam implements DbSourceProxy
*
* @see jalview.ws.dbsources.Rfam#getXFAMURL()
*/
*
* @see jalview.ws.dbsources.Rfam#getXFAMURL()
*/
+ @Override
protected String getXFAMURL()
{
protected String getXFAMURL()
{
- return "http://rfam.sanger.ac.uk/family/alignment/download/format?alnType=full&nseLabels=0&format=stockholm&acc=";
+ return "http://rfam.xfam.org/family/";
+
+ }
+
+ @Override
+ public String getXFAMURLSUFFIX()
+ {
+ return "/alignment/full";
}
/*
}
/*
@@
-50,16
+56,19
@@
public class RfamFull extends Rfam implements DbSourceProxy
*
* @see jalview.ws.seqfetcher.DbSourceProxy#getDbName()
*/
*
* @see jalview.ws.seqfetcher.DbSourceProxy#getDbName()
*/
+ @Override
public String getDbName()
{
return "RFAM (Full)";
}
public String getDbName()
{
return "RFAM (Full)";
}
+ @Override
public String getDbSource()
{
return getDbName(); // so we have unique DbSource string.
}
public String getDbSource()
{
return getDbName(); // so we have unique DbSource string.
}
+ @Override
public String getTestQuery()
{
// Can be retrieved from http://rfam.janelia.org/cgi-bin/getdesc?acc=RF00014
public String getTestQuery()
{
// Can be retrieved from http://rfam.janelia.org/cgi-bin/getdesc?acc=RF00014
@@
-68,6
+77,7
@@
public class RfamFull extends Rfam implements DbSourceProxy
return "RF00014";
}
return "RF00014";
}
+ @Override
public String getDbVersion()
{
return null;
public String getDbVersion()
{
return null;