X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FPfamFull.java;h=ec9fcbb482a623c36b965719e40c09f82e445319;hb=06de78be50c3934158fa1d35ec92ad86b54e959f;hp=93b6227f81160730d4bbf8afe1769b991f7a6a0f;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/ws/dbsources/PfamFull.java b/src/jalview/ws/dbsources/PfamFull.java
index 93b6227..ec9fcbb 100644
--- a/src/jalview/ws/dbsources/PfamFull.java
+++ b/src/jalview/ws/dbsources/PfamFull.java
@@ -1,67 +1,86 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
- * This file is part of Jalview.
- *
- * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * Jalview is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
- */
-package jalview.ws.dbsources;
-
-import jalview.ws.seqfetcher.DbSourceProxy;
-
-/**
- * flyweight class specifying retrieval of Full family alignments from PFAM
- *
- */
-public class PfamFull extends Pfam implements DbSourceProxy
-{
- public PfamFull()
- {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see jalview.ws.dbsources.Pfam#getPFAMURL()
- */
- protected String getXFAMURL()
- {
- return "http://pfam.sanger.ac.uk/family/alignment/download/format?alnType=full&format=stockholm&order=t&case=l&gaps=default&entry=";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see jalview.ws.seqfetcher.DbSourceProxy#getDbName()
- */
- public String getDbName()
- {
- return "PFAM (Full)";
- }
-
- public String getDbSource()
- {
- return getDbName(); // so we have unique DbSource string.
- }
-
- public String getTestQuery()
- {
- return "PF03760";
- }
-
-public String getDbVersion() {
- return null;
-}
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.ws.dbsources;
+
+/**
+ * flyweight class specifying retrieval of Full family alignments from PFAM
+ *
+ */
+public class PfamFull extends Pfam
+{
+ public PfamFull()
+ {
+ super();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.ws.dbsources.Pfam#getPFAMURL()
+ */
+ @Override
+ protected String getXFAMURL()
+ {
+ return "http://pfam.xfam.org/family/";
+
+ }
+
+ @Override
+ public String getXFAMURLSUFFIX()
+ {
+ return "/alignment/full";
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.ws.seqfetcher.DbSourceProxy#getDbName()
+ */
+ @Override
+ public String getDbName()
+ {
+ return "PFAM (Full)";
+ }
+
+ @Override
+ public String getDbSource()
+ {
+ return getDbName(); // so we have unique DbSource string.
+ }
+
+ @Override
+ public String getTestQuery()
+ {
+ return "PF03760";
+ }
+
+ @Override
+ public String getDbVersion()
+ {
+ return null;
+ }
+
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
+}