X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=31751f5c8fd34a5d39236f9aa50b5a9983902897;hb=41b0e9331ac71787c1280aa1d809f54c575fbf97;hp=724170e0c1f66ad00adf056ee041a53e4ae01675;hpb=74b531f56bbaad5c5e06a4744980256fe8110923;p=jalview.git

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index 724170e..31751f5 100755
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -20,18 +20,21 @@
  */
 package jalview.io;
 
-import jalview.api.AlignExportSettingI;
+import java.util.Locale;
+
+import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignmentViewPanel;
 import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.util.Comparison;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -55,7 +58,7 @@ public class FormatAdapter extends AppletFormatAdapter
   }
 
   public FormatAdapter(AlignmentViewPanel alignPanel,
-          AlignExportSettingI settings)
+          AlignExportSettingsI settings)
   {
     super(alignPanel, settings);
   }
@@ -116,8 +119,8 @@ public class FormatAdapter extends AppletFormatAdapter
           startIndex = startEnd[0];
           endIndex = startEnd[1];
           // get first non-gaped residue start position
-          while (Comparison.isGap(seqs[i]
-                  .getCharAt(startIndex)) && startIndex < endIndex)
+          while (Comparison.isGap(seqs[i].getCharAt(startIndex))
+                  && startIndex < endIndex)
           {
             startIndex++;
           }
@@ -155,95 +158,25 @@ public class FormatAdapter extends AppletFormatAdapter
    */
   public String formatSequences(FileFormatI format, SequenceI[] seqs)
   {
-    //
-    // try
-    // {
-      boolean withSuffix = getCacheSuffixDefault(format);
-    return format.getAlignmentFile().print(seqs, withSuffix);
-      // null;
-      //
-      // if (format.equalsIgnoreCase("FASTA"))
-      // {
-      // afile = new FastaFile();
-      // afile.addJVSuffix(jalview.bin.Cache.getDefault("FASTA_JVSUFFIX",
-      // true));
-      // }
-      // else if (format.equalsIgnoreCase("MSF"))
-      // {
-      // afile = new MSFfile();
-      // afile.addJVSuffix(jalview.bin.Cache
-      // .getDefault("MSF_JVSUFFIX", true));
-      // }
-      // else if (format.equalsIgnoreCase("PileUp"))
-      // {
-      // afile = new PileUpfile();
-      // afile.addJVSuffix(jalview.bin.Cache.getDefault("PILEUP_JVSUFFIX",
-      // true));
-      // }
-      // else if (format.equalsIgnoreCase("CLUSTAL"))
-      // {
-      // afile = new ClustalFile();
-      // afile.addJVSuffix(jalview.bin.Cache.getDefault("CLUSTAL_JVSUFFIX",
-      // true));
-      // }
-      // else if (format.equalsIgnoreCase("BLC"))
-      // {
-      // afile = new BLCFile();
-      // afile.addJVSuffix(jalview.bin.Cache
-      // .getDefault("BLC_JVSUFFIX", true));
-      // }
-      // else if (format.equalsIgnoreCase("PIR"))
-      // {
-      // afile = new PIRFile();
-      // afile.addJVSuffix(jalview.bin.Cache
-      // .getDefault("PIR_JVSUFFIX", true));
-      // }
-      // else if (format.equalsIgnoreCase("PFAM"))
-      // {
-      // afile = new PfamFile();
-      // afile.addJVSuffix(jalview.bin.Cache.getDefault("PFAM_JVSUFFIX",
-      // true));
-      // }
-      // /*
-      // * amsa is not supported by this function - it requires an alignment
-      // * rather than a sequence vector else if
-      // (format.equalsIgnoreCase("AMSA"))
-      // * { afile = new AMSAFile(); afile.addJVSuffix(
-      // * jalview.bin.Cache.getDefault("AMSA_JVSUFFIX", true)); }
-      // */
-
-//      afile.setSeqs(seqs);
-//      String afileresp = afile.print();
-//      if (afile.hasWarningMessage())
-//      {
-//        System.err.println("Warning raised when writing as " + format
-//                + " : " + afile.getWarningMessage());
-//      }
-//      return afileresp;
-//    } catch (Exception e)
-//    {
-//      System.err.println("Failed to write alignment as a '" + format
-//              + "' file\n");
-//      e.printStackTrace();
-//    }
-//
-//    return null;
+    boolean withSuffix = getCacheSuffixDefault(format);
+    return format.getWriter(null).print(seqs, withSuffix);
   }
 
   public boolean getCacheSuffixDefault(FileFormatI format)
   {
-    return Cache.getDefault(format.toString() + "_JVSUFFIX", true);
+    return Cache.getDefault(format.getName().toUpperCase(Locale.ROOT) + "_JVSUFFIX",
+            true);
   }
 
   public String formatSequences(FileFormatI format, AlignmentI alignment,
-          String[] omitHidden, int[] exportRange, ColumnSelection colSel)
+          String[] omitHidden, int[] exportRange, HiddenColumns hidden)
   {
     return formatSequences(format, alignment, omitHidden, exportRange,
-            getCacheSuffixDefault(format), colSel, null);
+            getCacheSuffixDefault(format), hidden, null);
   }
 
   /**
-   * hack function to replace seuqences with visible sequence strings before
+   * hack function to replace sequences with visible sequence strings before
    * generating a string of the alignment in the given format.
    * 
    * @param format
@@ -256,15 +189,15 @@ public class FormatAdapter extends AppletFormatAdapter
    */
   public String formatSequences(FileFormatI format, AlignmentI alignment,
           String[] omitHidden, int[] exportRange, boolean suffix,
-          ColumnSelection colSel)
+          HiddenColumns hidden)
   {
     return formatSequences(format, alignment, omitHidden, exportRange,
-            suffix, colSel, null);
+            suffix, hidden, null);
   }
 
   public String formatSequences(FileFormatI format, AlignmentI alignment,
           String[] omitHidden, int[] exportRange, boolean suffix,
-          ColumnSelection colSel, SequenceGroup selgp)
+          HiddenColumns hidden, SequenceGroup selgp)
   {
     if (omitHidden != null)
     {
@@ -282,12 +215,12 @@ public class FormatAdapter extends AppletFormatAdapter
           AlignmentAnnotation na = new AlignmentAnnotation(ala[i]);
           if (selgp != null)
           {
-            colSel.makeVisibleAnnotation(selgp.getStartRes(),
-                    selgp.getEndRes(), na);
+            na.makeVisibleAnnotation(selgp.getStartRes(), selgp.getEndRes(),
+                    hidden);
           }
           else
           {
-            colSel.makeVisibleAnnotation(na);
+            na.makeVisibleAnnotation(hidden);
           }
           alv.addAnnotation(na);
         }
@@ -305,6 +238,13 @@ public class FormatAdapter extends AppletFormatAdapter
     return al;
   }
 
+  public AlignmentI readFile(File file, DataSourceType sourceType,
+          FileFormatI fileFormat) throws IOException
+  {
+    AlignmentI al = super.readFile(file, null, sourceType, fileFormat);
+    return al;
+  }
+
   @Override
   public AlignmentI readFromFile(FileParse source, FileFormatI format)
           throws IOException
@@ -329,8 +269,8 @@ public class FormatAdapter extends AppletFormatAdapter
             selectedOnly);
   }
 
-  public AlignmentI readFromFile(AlignmentFileI source, FileFormatI format)
-          throws IOException
+  public AlignmentI readFromFile(AlignmentFileReaderI source,
+          FileFormatI format) throws IOException
   {
     FileParse fp = new FileParse(source.getInFile(),
             source.getDataSourceType());