X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=41fac7fb66899d083c1318f6126ae4d151fc4169;hb=fe72160257543fca39f7959fc1347665e95764a2;hp=4084fa0305b815e637260d83750afa1e4c12fb4d;hpb=a039ae44a24c29f0bd4d888a2574b5bd999b8d82;p=jalview.git

diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
index 4084fa0..41fac7f 100755
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -1,33 +1,43 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
- * 
+ * 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 
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
+import jalview.api.AlignViewportI;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.AlignmentView;
+import jalview.datamodel.SequenceGroup;
+import jalview.util.MessageManager;
+
 import java.io.File;
 import java.io.InputStream;
-
-import jalview.datamodel.*;
+import java.util.List;
 
 /**
  * A low level class for alignment and feature IO with alignment formatting
  * methods used by both applet and application for generating flat alignment
  * files. It also holds the lists of magic format names that the applet and
  * application will allow the user to read or write files with.
- * 
+ *
  * @author $author$
  * @version $Revision$
  */
@@ -38,50 +48,50 @@ public class AppletFormatAdapter
    */
   public static final String[] READABLE_FORMATS = new String[]
   { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH",
-      "PDB", "JnetFile" , "RNAML"}; // , "SimpleBLAST" };
+      "PDB", "JnetFile", "RNAML", PhylipFile.FILE_DESC, JSONFile.FILE_DESC,
+      "HTML" };
+
+  /**
+   * List of readable format file extensions by application in order
+   * corresponding to READABLE_FNAMES
+   */
+  public static final String[] READABLE_EXTENSIONS = new String[]
+  { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa",
+      "sto,stk", "xml,rnaml", PhylipFile.FILE_EXT, JSONFile.FILE_EXT,
+      "jar,jvp", HtmlFile.FILE_EXT };
+
+  /**
+   * List of readable formats by application in order corresponding to
+   * READABLE_EXTENSIONS
+   */
+  public static final String[] READABLE_FNAMES = new String[]
+  { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Stockholm",
+      "RNAML", PhylipFile.FILE_DESC, JSONFile.FILE_DESC, "Jalview",
+      HtmlFile.FILE_DESC };
 
   /**
    * List of valid format strings for use by callers of the formatSequences
    * method
    */
   public static final String[] WRITEABLE_FORMATS = new String[]
-  { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "AMSA" };
+          { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "AMSA",
+    "STH", PhylipFile.FILE_DESC, JSONFile.FILE_DESC };
 
   /**
    * List of extensions corresponding to file format types in WRITABLE_FNAMES
    * that are writable by the application.
    */
   public static final String[] WRITABLE_EXTENSIONS = new String[]
-  { "fa,faa,fasta,fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar" };
+  { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa",
+      "sto,stk", PhylipFile.FILE_EXT, JSONFile.FILE_EXT, "jvp" };
 
   /**
    * List of writable formats by the application. Order must correspond with the
    * WRITABLE_EXTENSIONS list of formats.
    */
   public static final String[] WRITABLE_FNAMES = new String[]
-  { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview" };
-
-  /**
-   * List of readable format file extensions by application in order
-   * corresponding to READABLE_FNAMES
-   */
-  public static final String[] READABLE_EXTENSIONS = new String[]
-  { "fa,faa,fasta,fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
-      "sto,stk","xml,rnaml" }; // ,
-
-  // ".blast"
-  // };
-
-  /**
-   * List of readable formats by application in order corresponding to
-   * READABLE_EXTENSIONS
-   */
-  public static final String[] READABLE_FNAMES = new String[]
-  { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview",
-      "Stockholm","RNAML" };// ,
-
-  // "SimpleBLAST"
-  // };
+  { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "STH",
+      PhylipFile.FILE_DESC, JSONFile.FILE_DESC, "Jalview" };
 
   public static String INVALID_CHARACTERS = "Contains invalid characters";
 
@@ -90,7 +100,7 @@ public class AppletFormatAdapter
           + prettyPrint(READABLE_FORMATS);
 
   /**
-   * 
+   *
    * @param els
    * @return grammatically correct(ish) list consisting of els elements.
    */
@@ -100,7 +110,7 @@ public class AppletFormatAdapter
     for (int i = 0, iSize = els.length - 1; i < iSize; i++)
     {
       list.append(els[i]);
-      list.append(",");
+      list.append(", ");
     }
     list.append(" and " + els[els.length - 1] + ".");
     return list.toString();
@@ -114,6 +124,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;
@@ -135,7 +160,7 @@ public class AppletFormatAdapter
 
   /**
    * check that this format is valid for reading
-   * 
+   *
    * @param format
    *          a format string to be compared with READABLE_FORMATS
    * @return true if format is readable
@@ -147,7 +172,7 @@ public class AppletFormatAdapter
 
   /**
    * validate format is valid for IO
-   * 
+   *
    * @param format
    *          a format string to be compared with either READABLE_FORMATS or
    *          WRITEABLE_FORMATS
@@ -161,9 +186,9 @@ public class AppletFormatAdapter
     boolean valid = false;
     String[] format_list = (forwriting) ? WRITEABLE_FORMATS
             : READABLE_FORMATS;
-    for (int i = 0; i < format_list.length; i++)
+    for (String element : format_list)
     {
-      if (format_list[i].equalsIgnoreCase(format))
+      if (element.equalsIgnoreCase(format))
       {
         return true;
       }
@@ -174,14 +199,14 @@ public class AppletFormatAdapter
 
   /**
    * Constructs the correct filetype parser for a characterised datasource
-   * 
+   *
    * @param inFile
    *          data/data location
    * @param type
    *          type of datasource
    * @param format
    *          File format of data provided by datasource
-   * 
+   *
    * @return DOCUMENT ME!
    */
   public Alignment readFile(String inFile, String type, String format)
@@ -192,6 +217,7 @@ public class AppletFormatAdapter
     this.inFile = inFile;
     try
     {
+      Alignment al;
       if (format.equals("FASTA"))
       {
         afile = new FastaFile(inFile, type);
@@ -227,7 +253,10 @@ public class AppletFormatAdapter
       }
       else if (format.equals("PDB"))
       {
-        afile = new MCview.PDBfile(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);
       }
       else if (format.equals("STH"))
       {
@@ -237,12 +266,38 @@ public class AppletFormatAdapter
       {
         afile = new SimpleBlastFile(inFile, type);
       }
+      else if (format.equals(PhylipFile.FILE_DESC))
+      {
+        afile = new PhylipFile(inFile, type);
+      }
+      else if (format.equals(JSONFile.FILE_DESC))
+      {
+        afile = new JSONFile(inFile, type);
+        al = new Alignment(afile.getSeqsAsArray());
+        afile.addAnnotations(al);
+        for (SequenceGroup sg : afile.getSeqGroups())
+        {
+          al.addGroup(sg);
+        }
+        return al;
+      }
+      else if (format.equals(HtmlFile.FILE_DESC))
+      {
+        afile = new HtmlFile(inFile, type);
+        al = new Alignment(afile.getSeqsAsArray());
+        afile.addAnnotations(al);
+        for (SequenceGroup sg : afile.getSeqGroups())
+        {
+          al.addGroup(sg);
+        }
+        return al;
+      }
       else if (format.equals("RNAML"))
       {
         afile = new RnamlFile(inFile, type);
       }
-      
-      Alignment al = new Alignment(afile.getSeqsAsArray());
+
+      al = new Alignment(afile.getSeqsAsArray());
 
       afile.addAnnotations(al);
 
@@ -267,6 +322,8 @@ public class AppletFormatAdapter
           // Possible sequence is just residues with no label
           afile = new FastaFile(">UNKNOWN\n" + inFile, "Paste");
           Alignment al = new Alignment(afile.getSeqsAsArray());
+
+          afile.addSeqGroups(al);
           afile.addAnnotations(al);
           return al;
 
@@ -288,15 +345,15 @@ public class AppletFormatAdapter
 
   /**
    * Constructs the correct filetype parser for an already open datasource
-   * 
+   *
    * @param source
    *          an existing datasource
    * @param format
    *          File format of data that will be provided by datasource
-   * 
+   *
    * @return DOCUMENT ME!
    */
-  public Alignment readFromFile(FileParse source, String format)
+  public AlignmentI readFromFile(FileParse source, String format)
           throws java.io.IOException
   {
     // TODO: generalise mapping between format string and io. class instances
@@ -307,6 +364,7 @@ public class AppletFormatAdapter
     String type = source.type;
     try
     {
+      Alignment al;
       if (format.equals("FASTA"))
       {
         afile = new FastaFile(source);
@@ -342,7 +400,8 @@ public class AppletFormatAdapter
       }
       else if (format.equals("PDB"))
       {
-        afile = new MCview.PDBfile(source);
+        afile = new MCview.PDBfile(annotFromStructure,
+                localSecondaryStruct, serviceSecondaryStruct, source);
       }
       else if (format.equals("STH"))
       {
@@ -356,9 +415,23 @@ public class AppletFormatAdapter
       {
         afile = new SimpleBlastFile(source);
       }
-
-      Alignment al = new Alignment(afile.getSeqsAsArray());
-
+      else if (format.equals(PhylipFile.FILE_DESC))
+      {
+        afile = new PhylipFile(source);
+      }
+      else if (format.equals(JSONFile.FILE_DESC))
+      {
+        afile = new JSONFile(source);
+        al = new Alignment(afile.getSeqsAsArray());
+        afile.addAnnotations(al);
+        afile.addSeqGroups(al);
+        return al;
+      }
+      else if (format.equals(HtmlFile.FILE_DESC))
+      {
+        afile = new HtmlFile(source);
+      }
+      al = new Alignment(afile.getSeqsAsArray());
       afile.addAnnotations(al);
 
       return al;
@@ -383,6 +456,7 @@ public class AppletFormatAdapter
           afile = new FastaFile(">UNKNOWN\n" + inFile, "Paste");
           Alignment al = new Alignment(afile.getSeqsAsArray());
           afile.addAnnotations(al);
+          afile.addSeqGroups(al);
           return al;
 
         } catch (Exception ex)
@@ -401,11 +475,40 @@ public class AppletFormatAdapter
     }
   }
 
+
+  /**
+   * create an alignment flatfile from a Jalview alignment view
+   * @param format
+   * @param jvsuffix
+   * @param av
+   * @param selectedOnly
+   * @return flatfile in a string
+   */
+  public String formatSequences(String format, boolean jvsuffix,
+          AlignViewportI av, boolean selectedOnly)
+  {
+
+    AlignmentView selvew = av.getAlignmentView(selectedOnly, false);
+    AlignmentI aselview = selvew.getVisibleAlignment(av
+            .getGapCharacter());
+    List<AlignmentAnnotation> ala = (av
+            .getVisibleAlignmentAnnotation(selectedOnly));
+    if (ala != null)
+    {
+      for (AlignmentAnnotation aa : ala)
+      {
+        aselview.addAnnotation(aa);
+      }
+    }
+
+    return formatSequences(format, aselview, jvsuffix);
+  }
+
   /**
    * Construct an output class for an alignment in a particular filetype TODO:
    * allow caller to detect errors and warnings encountered when generating
    * output
-   * 
+   *
    * @param format
    *          string name of alignment format
    * @param alignment
@@ -413,7 +516,7 @@ public class AppletFormatAdapter
    * @param jvsuffix
    *          passed to AlnFile class controls whether /START-END is added to
    *          sequence names
-   * 
+   *
    * @return alignment flat file contents
    */
   public String formatSequences(String format, AlignmentI alignment,
@@ -422,7 +525,6 @@ public class AppletFormatAdapter
     try
     {
       AlignFile afile = null;
-
       if (format.equalsIgnoreCase("FASTA"))
       {
         afile = new FastaFile();
@@ -453,27 +555,50 @@ public class AppletFormatAdapter
       }
       else if (format.equalsIgnoreCase("STH"))
       {
-        afile = new StockholmFile();
+        afile = new StockholmFile(alignment);
       }
       else if (format.equalsIgnoreCase("AMSA"))
       {
         afile = new AMSAFile(alignment);
       }
+      else if (format.equalsIgnoreCase(PhylipFile.FILE_DESC))
+      {
+        afile = new PhylipFile();
+      }
+       else if (format.equalsIgnoreCase(JSONFile.FILE_DESC))
+       {
+        afile = new JSONFile();
+        // Add groups to AlignFile
+        afile.seqGroups = alignment.getGroups();
+
+        // Add non auto calculated annotation to AlignFile
+        for (AlignmentAnnotation annot : alignment.getAlignmentAnnotation())
+        {
+          if (annot != null && !annot.autoCalculated)
+          {
+            if (annot.label.equals("PDB.CATempFactor"))
+            {
+              continue;
+            }
+            afile.annotations.add(annot);
+          }
+        }
+       }
       else if (format.equalsIgnoreCase("RNAML"))
       {
         afile = new RnamlFile();
       }
-      
+
       else
       {
-        throw new Exception(
-                "Implementation error: Unknown file format string");
+        throw new Exception(MessageManager.getString("error.implementation_error_unknown_file_format_string"));
       }
       afile.setNewlineString(newline);
       afile.addJVSuffix(jvsuffix);
 
       afile.setSeqs(alignment.getSequencesArray());
 
+
       String afileresp = afile.print();
       if (afile.hasWarningMessage())
       {
@@ -535,7 +660,7 @@ public class AppletFormatAdapter
             } catch (Exception e)
             {
               System.err
-                      .println("Couln't format the alignment for output as a FASTA file.");
+              .println("Couln't format the alignment for output as a FASTA file.");
               e.printStackTrace(System.err);
             }
           }
@@ -545,9 +670,8 @@ public class AppletFormatAdapter
           }
           System.out.println("Read took " + (t1 / 1000.0) + " seconds.");
           System.out
-                  .println("Difference between free memory now and before is "
-                          + (memf / (1024.0 * 1024.0) * 1.0) + " MB");
-
+          .println("Difference between free memory now and before is "
+                  + (memf / (1024.0 * 1024.0) * 1.0) + " MB");
         } catch (Exception e)
         {
           System.err.println("Exception when dealing with " + i
@@ -566,7 +690,7 @@ public class AppletFormatAdapter
   /**
    * try to discover how to access the given file as a valid datasource that
    * will be identified as the given type.
-   * 
+   *
    * @param file
    * @param format
    * @return protocol that yields the data parsable as the given type
@@ -613,7 +737,7 @@ public class AppletFormatAdapter
     } catch (Exception ex)
     {
       System.err
-              .println("Exception checking resources: " + file + " " + ex);
+      .println("Exception checking resources: " + file + " " + ex);
     }
 
     if (file.indexOf("://") > -1)
@@ -715,7 +839,7 @@ public class AppletFormatAdapter
           if (debug)
           {
             System.out
-                    .println("File deemed not accessible via " + protocol);
+            .println("File deemed not accessible via " + protocol);
           }
           fp.close();
           return null;