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

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index d4179b6..18bf76a 100755
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -1,46 +1,165 @@
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2005 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 {
+import java.util.Vector;
 
-  public static String get(String format,Vector seqs) {
 
-    SequenceI [] s = new SequenceI[seqs.size()];
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class FormatAdapter
+{
+    /** DOCUMENT ME!! */
+    public static final Vector formats = new Vector();
 
-    for (int i=0;i<seqs.size(); i++)
-      s[i] = (SequenceI)seqs.elementAt(i);
-
-
-    if (FormatProperties.contains(format))
+    static
     {
-      AlignFile afile = FormatFactory.get(format);
-      afile.setSeqs(s);
-      return afile.print();
+        formats.addElement("FASTA");
+        formats.addElement("MSF");
+        formats.addElement("PileUp");
+        formats.addElement("CLUSTAL");
+        formats.addElement("BLC");
+        formats.addElement("PIR");
+        formats.addElement("PFAM");
     }
-    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;
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param inFile DOCUMENT ME!
+     * @param type DOCUMENT ME!
+     * @param format DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public static SequenceI[] readFile(String inFile, String type, String format)
+    {
+        try
+        {
+            AlignFile afile = null;
+
+            if (format.equals("FASTA"))
+            {
+                afile = new FastaFile(inFile, type);
+            }
+            else if (format.equals("MSF"))
+            {
+                afile = new MSFfile(inFile, type);
+            }
+            else if (format.equals("PileUp"))
+            {
+                afile = new PileUpfile(inFile, type);
+            }
+            else if (format.equals("CLUSTAL"))
+            {
+                afile = new ClustalFile(inFile, type);
+            }
+            else if (format.equals("BLC"))
+            {
+                afile = new BLCFile(inFile, type);
+            }
+            else if (format.equals("PIR"))
+            {
+                afile = new PIRFile(inFile, type);
+            }
+            else if (format.equals("PFAM"))
+            {
+                afile = new PfamFile(inFile, type);
+            }
+
+            return afile.getSeqsAsArray();
+        }
+        catch (Exception e)
+        {
+            System.err.println("Failed to read alignment using the '" + format +
+                "' reader.");
+            e.printStackTrace();
+        }
+
+        return null;
     }
-  }
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param format DOCUMENT ME!
+     * @param seqs DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public static String formatSequences(String format, Vector seqs)
+    {
+        SequenceI[] s = new SequenceI[seqs.size()];
+
+        for (int i = 0; i < seqs.size(); i++)
+            s[i] = (SequenceI) seqs.elementAt(i);
 
-  public static SequenceI[] read(String inFile, String type, String format) {
-      try {
-        AlignFile afile = FormatFactory.get(format,inFile,type);
-        return afile.getSeqsAsArray();
-      } catch (Exception e) {    }
+        try
+        {
+            AlignFile afile = null;
 
-    return null;
-  }
+            if (format.equalsIgnoreCase("FASTA"))
+            {
+                afile = new FastaFile();
+            }
+            else if (format.equalsIgnoreCase("MSF"))
+            {
+                afile = new MSFfile();
+            }
+            else if (format.equalsIgnoreCase("PileUp"))
+            {
+                afile = new PileUpfile();
+            }
+            else if (format.equalsIgnoreCase("CLUSTAL"))
+            {
+                afile = new ClustalFile();
+            }
+            else if (format.equalsIgnoreCase("BLC"))
+            {
+                afile = new BLCFile();
+            }
+            else if (format.equalsIgnoreCase("PIR"))
+            {
+                afile = new PIRFile();
+            }
+            else if (format.equalsIgnoreCase("PFAM"))
+            {
+                afile = new PfamFile();
+            }
 
+            afile.setSeqs(s);
+
+            return afile.print();
+        }
+        catch (Exception e)
+        {
+            System.err.println("Failed to write alignment as a '" + format +
+                "' file\n");
+            e.printStackTrace();
+        }
+
+        return null;
+    }
 }