X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=a23bbba3b665a4a6685fabef14588b76315d06b4;hb=7be3a744db5213f49e70178ade126d1cc797c762;hp=d4179b6685a02ce9dc11817b2fc28b00c94776a9;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index d4179b6..a23bbba 100755
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -1,46 +1,124 @@
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* This program 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 2
+* of the License, or (at your option) any later version.
+*
+* This program 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 this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+*/
 package jalview.io;
 
 import jalview.datamodel.*;
-import java.util.*;
 
-public class FormatAdapter {
 
-  public static String get(String format,Vector seqs) {
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class FormatAdapter extends AppletFormatAdapter
+{
 
-    SequenceI [] s = new SequenceI[seqs.size()];
+    public String formatSequences(String format,
+                                  SequenceI [] seqs,
+                                  String [] omitHiddenColumns)
+    {
+      if(omitHiddenColumns!=null)
+      {
+        SequenceI [] tmp = new SequenceI[seqs.length];
+        for(int i=0; i<seqs.length; i++)
+          tmp [i] = new Sequence(
+              seqs[i].getName(), omitHiddenColumns[i],
+              seqs[i].getStart(), seqs[i].getEnd());
+
+        seqs = tmp;
+      }
 
-    for (int i=0;i<seqs.size(); i++)
-      s[i] = (SequenceI)seqs.elementAt(i);
+      return formatSequences(format, seqs);
+    }
 
 
-    if (FormatProperties.contains(format))
+    /**
+     * DOCUMENT ME!
+     *
+     * @param format DOCUMENT ME!
+     * @param seqs DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public String formatSequences(String format,
+                                  SequenceI [] seqs)
     {
-      AlignFile afile = FormatFactory.get(format);
-      afile.setSeqs(s);
-      return afile.print();
-    }
-    else
-       return null;
-  }
-
-  public static SequenceI[] read(String format,String inStr) {
-    if (FormatProperties.contains(format)) {
-      AlignFile afile = FormatFactory.get(format,inStr);
-      return afile.getSeqsAsArray();
-    } else {
-    // Should throw exception
-      return null;
-    }
-  }
 
+        try
+        {
+            AlignFile afile = 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));
+            }
 
-  public static SequenceI[] read(String inFile, String type, String format) {
-      try {
-        AlignFile afile = FormatFactory.get(format,inFile,type);
-        return afile.getSeqsAsArray();
-      } catch (Exception e) {    }
+            afile.setSeqs(seqs);
 
-    return null;
-  }
+            return afile.print();
+        }
+        catch (Exception e)
+        {
+            System.err.println("Failed to write alignment as a '" + format +
+                "' file\n");
+            e.printStackTrace();
+        }
 
+        return null;
+    }
 }