Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

diff --git a/src/jalview/ws/dbsources/Pfam.java b/src/jalview/ws/dbsources/Pfam.java
index 93001a4..316c1aa 100644 (file)
--- a/src/jalview/ws/dbsources/Pfam.java
+++ b/src/jalview/ws/dbsources/Pfam.java
@@ -39,7 +39,7 @@ import jalview.util.Platform;
 abstract public class Pfam extends Xfam
 {
   public static final String FULL = "full", RP35 = "rp35", RP15 = "rp15",
-          RP75 = "rp75", RP55 = "rp55", SEED = "seed";
+          RP75 = "rp75", RP55 = "rp55", SEED = "seed", UNIPROT = "uniprot";
 
   public String getPfamDownloadURL(String id, String alType)
   {
@@ -53,7 +53,10 @@ abstract public class Pfam extends Xfam
 
   protected String alignmentType;
 
-  private static final String DEFAULT_PFAM_BASEURL = "https://www.ebi.ac.uk/interpro/wwwapi/entry/pfam/$PFAMID$/?annotation=alignment:$ALTYPE$&download";
+  /**
+   * docs are http://www.ebi.ac.uk/interpro/api/
+   */
+  private static final String DEFAULT_PFAM_BASEURL = "https://www.ebi.ac.uk/interpro/api/entry/pfam/$PFAMID$/?annotation=alignment:$ALTYPE$";
 
   static
   {