/*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)\r
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
* \r
* This file is part of Jalview.\r
* \r
* @author JimP\r
* \r
*/\r
-abstract public class Pfam extends Xfam implements\r
- DbSourceProxy\r
+abstract public class Pfam extends Xfam implements DbSourceProxy\r
{\r
\r
public Pfam()\r
* @see jalview.ws.DbSourceProxy#getDbVersion()\r
*/\r
@Override\r
-public String getDbVersion()\r
+ public String getDbVersion()\r
{\r
// TODO Auto-generated method stub\r
return null;\r
}\r
\r
- /**Returns base URL for selected Pfam alignment type\r
+ /**\r
+ * Returns base URL for selected Pfam alignment type\r
* \r
* @return PFAM URL stub for this DbSource\r
*/\r
@Override\r
-protected abstract String getXFAMURL();\r
+ protected abstract String getXFAMURL();\r
\r
/*\r
* (non-Javadoc)\r
// individual references to each sequence in each family alignment that's\r
// retrieved.\r
startQuery();\r
- AlignmentI rcds = new jalview.io.FormatAdapter().readFile(getPFAMURL()\r
+ AlignmentI rcds = new jalview.io.FormatAdapter().readFile(getXFAMURL()\r
+ queries.trim().toUpperCase(), jalview.io.FormatAdapter.URL,\r
"STH");\r
for (int s = 0, sNum = rcds.getHeight(); s < sNum; s++)\r
/*\r
* public String getDbName() { return "PFAM"; // getDbSource(); }\r
*/\r
- \r
- \r
- public String getXfamSource() { return jalview.datamodel.DBRefSource.PFAM; }\r
- \r
- \r
+\r
+ public String getXfamSource()\r
+ {\r
+ return jalview.datamodel.DBRefSource.PFAM;\r
+ }\r
+\r
}\r