Merge branch 'JAL-1587_promotedisorder' into develop

[jalview.git] / src / jalview / io / AppletFormatAdapter.java

diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
index efddab3..505f609 100755 (executable)
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -47,7 +47,7 @@ public class AppletFormatAdapter
    */
   public static final String[] READABLE_FORMATS = new String[]
           { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH",
-      "PDB", "JnetFile", "RNAML", PhylipFile.FILE_DESC, HtmlFile.FILE_DESC }; // ,
+      "PDB", "JnetFile", "RNAML", PhylipFile.FILE_DESC, "HTML" }; // ,
                                                                               // "SimpleBLAST"
                                                                               // };
 
@@ -82,7 +82,7 @@ public class AppletFormatAdapter
   public static final String[] READABLE_EXTENSIONS = new String[]
           { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa",
       "jar,jvp", "sto,stk", "xml,rnaml", PhylipFile.FILE_EXT,
-      HtmlFile.FILE_EXT }; // ".blast"
+ "html" }; // ".blast"
 
   /**
    * List of readable formats by application in order corresponding to
@@ -90,7 +90,7 @@ public class AppletFormatAdapter
    */
   public static final String[] READABLE_FNAMES = new String[]
           { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview",
-      "Stockholm", "RNAML", PhylipFile.FILE_DESC, HtmlFile.FILE_DESC };// ,
+      "Stockholm", "RNAML", PhylipFile.FILE_DESC, "HTML" };// ,
 
   // "SimpleBLAST"
   // };
@@ -126,6 +126,21 @@ public class AppletFormatAdapter
 
   public static String CLASSLOADER = "ClassLoader";
 
+  /**
+   * add jalview-derived non-secondary structure annotation from PDB structure
+   */
+  boolean annotFromStructure = false;
+
+  /**
+   * add secondary structure from PDB data with built-in algorithms
+   */
+  boolean localSecondaryStruct = false;
+
+  /**
+   * process PDB data with web services
+   */
+  boolean serviceSecondaryStruct = false;
+
   AlignFile afile = null;
 
   String inFile;
@@ -239,7 +254,8 @@ public class AppletFormatAdapter
       }
       else if (format.equals("PDB"))
       {
-        afile = new MCview.PDBfile(true,true,inFile, type);
+        afile = new MCview.PDBfile(annotFromStructure,
+                localSecondaryStruct, serviceSecondaryStruct, inFile, type);
         // Uncomment to test Jmol data based PDB processing: JAL-1213
         // afile = new jalview.ext.jmol.PDBFileWithJmol(inFile, type);
       }
@@ -255,10 +271,10 @@ public class AppletFormatAdapter
       {
         afile = new PhylipFile(inFile, type);
       }
-      else if (format.equals(HtmlFile.FILE_DESC))
-      {
-        afile = new HtmlFile(inFile, type);
-      }
+      // else if (format.equals(HtmlFile.FILE_DESC))
+      // {
+      // afile = new HtmlFile(inFile, type);
+      // }
       else if (format.equals("RNAML"))
       {
         afile = new RnamlFile(inFile, type);
@@ -364,7 +380,8 @@ public class AppletFormatAdapter
       }
       else if (format.equals("PDB"))
       {
-        afile = new MCview.PDBfile(true,true,source);
+        afile = new MCview.PDBfile(annotFromStructure,
+                localSecondaryStruct, serviceSecondaryStruct, source);
       }
       else if (format.equals("STH"))
       {
@@ -382,10 +399,10 @@ public class AppletFormatAdapter
       {
         afile = new PhylipFile(source);
       }
-      else if (format.equals(HtmlFile.FILE_DESC))
-      {
-        afile = new HtmlFile(source);
-      }
+      // else if (format.equals(HtmlFile.FILE_DESC))
+      // {
+      // afile = new HtmlFile(source);
+      // }
       Alignment al = new Alignment(afile.getSeqsAsArray());
 
       afile.addAnnotations(al);
@@ -521,10 +538,10 @@ public class AppletFormatAdapter
       {
         afile = new PhylipFile();
       }
-      else if (format.equalsIgnoreCase(HtmlFile.FILE_DESC))
-      {
-        afile = new HtmlFile();
-      }
+      // else if (format.equalsIgnoreCase(HtmlFile.FILE_DESC))
+      // {
+      // afile = new HtmlFile();
+      // }
       else if (format.equalsIgnoreCase("RNAML"))
       {
         afile = new RnamlFile();