X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFastaFile.java;h=d8890afe8909831decb9e7f68bf011c2db726073;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=c69b8ce6804530264c3cfe5111cd3342ebad9ddf;hpb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;p=jalview.git
diff --git a/src/jalview/io/FastaFile.java b/src/jalview/io/FastaFile.java
index c69b8ce..d8890af 100755
--- a/src/jalview/io/FastaFile.java
+++ b/src/jalview/io/FastaFile.java
@@ -1,217 +1,238 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 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 java.io.*;
-
-import jalview.datamodel.*;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
- */
-public class FastaFile
- extends AlignFile
-{
- /**
- * Length of a sequence line
- */
- int len = 72;
-
- StringBuffer out;
-
- /**
- * Creates a new FastaFile object.
- */
- public FastaFile()
- {
- }
-
- /**
- * Creates a new FastaFile object.
- *
- * @param inFile DOCUMENT ME!
- * @param type DOCUMENT ME!
- *
- * @throws IOException DOCUMENT ME!
- */
- public FastaFile(String inFile, String type)
- throws IOException
- {
- super(inFile, type);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @throws IOException DOCUMENT ME!
- */
- public void parse()
- throws IOException
- {
- StringBuffer sb = new StringBuffer();
- boolean firstLine = true;
-
- String line;
- Sequence seq = null;
-
- boolean annotation = false;
-
- while ( (line = nextLine()) != null)
- {
- line = line.trim();
- if (line.length() > 0)
- {
- if (line.charAt(0) == '>')
- {
- if (line.startsWith(">#_"))
- {
- if (annotation)
- {
- Annotation[] anots = new Annotation[sb.length()];
- String anotString = sb.toString();
- for (int i = 0; i < sb.length(); i++)
- {
- anots[i] = new Annotation(anotString.substring(i, i + 1),
- null,
- ' ', 0);
- }
- AlignmentAnnotation aa = new AlignmentAnnotation(
- seq.getName().substring(2), seq.getDescription(),
- anots);
-
- annotations.addElement(aa);
- }
- }
- else
- {
- annotation = false;
- }
-
- if (!firstLine)
- {
- seq.setSequence(sb.toString());
-
- if (!annotation)
- {
- seqs.addElement(seq);
- }
- }
-
- seq = parseId(line.substring(1));
- firstLine = false;
-
- sb = new StringBuffer();
-
- if (line.startsWith(">#_"))
- {
- annotation = true;
- }
- }
- else
- {
- sb.append(line);
- }
- }
- }
-
- if (annotation)
- {
- Annotation[] anots = new Annotation[sb.length()];
- String anotString = sb.toString();
- for (int i = 0; i < sb.length(); i++)
- {
- anots[i] = new Annotation(anotString.substring(i, i + 1),
- null,
- ' ', 0);
- }
- AlignmentAnnotation aa = new AlignmentAnnotation(
- seq.getName().substring(2), seq.getDescription(),
- anots);
-
- annotations.addElement(aa);
- }
-
- else if (!firstLine)
- {
- seq.setSequence(sb.toString());
- seqs.addElement(seq);
- }
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param s DOCUMENT ME!
- * @param len DOCUMENT ME!
- * @param gaps DOCUMENT ME!
- * @param displayId DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public String print(SequenceI[] s)
- {
- out = new StringBuffer();
- int i = 0;
-
- while ( (i < s.length) && (s[i] != null))
- {
- out.append(">" + printId(s[i]));
- if (s[i].getDescription() != null)
- {
- out.append(" " + s[i].getDescription());
- }
-
- out.append("\n");
-
- int nochunks = (s[i].getLength() / len) + 1;
-
- for (int j = 0; j < nochunks; j++)
- {
- int start = j * len;
- int end = start + len;
-
- if (end < s[i].getLength())
- {
- out.append(s[i].getSequenceAsString(start, end) + "\n");
- }
- else if (start < s[i].getLength())
- {
- out.append(s[i].getSequenceAsString(start, s[i].getLength()) + "\n");
- }
- }
-
- i++;
- }
-
- return out.toString();
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public String print()
- {
- return print(getSeqsAsArray());
- }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 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
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.io;
+
+import java.io.*;
+
+import jalview.datamodel.*;
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class FastaFile extends AlignFile
+{
+ /**
+ * Length of a sequence line
+ */
+ int len = 72;
+
+ StringBuffer out;
+
+ /**
+ * Creates a new FastaFile object.
+ */
+ public FastaFile()
+ {
+ }
+
+ /**
+ * Creates a new FastaFile object.
+ *
+ * @param inFile
+ * DOCUMENT ME!
+ * @param type
+ * DOCUMENT ME!
+ *
+ * @throws IOException
+ * DOCUMENT ME!
+ */
+ public FastaFile(String inFile, String type) throws IOException
+ {
+ super(inFile, type);
+ }
+
+ public FastaFile(FileParse source) throws IOException
+ {
+ super(source);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @throws IOException
+ * DOCUMENT ME!
+ */
+ public void parse() throws IOException
+ {
+ StringBuffer sb = new StringBuffer();
+ boolean firstLine = true;
+
+ String line,uline;
+ Sequence seq = null;
+
+ boolean annotation = false;
+
+ while ((uline = nextLine()) != null)
+ {
+ line = uline.trim();
+ if (line.length() > 0)
+ {
+ if (line.charAt(0) == '>')
+ {
+ if (line.startsWith(">#_"))
+ {
+ if (annotation)
+ {
+ annotations.addElement(makeAnnotation(seq, sb));
+ }
+ }
+ else
+ {
+ annotation = false;
+ }
+
+ if (!firstLine)
+ {
+ seq.setSequence(sb.toString());
+
+ if (!annotation)
+ {
+ seqs.addElement(seq);
+ }
+ }
+
+ seq = parseId(line.substring(1));
+ firstLine = false;
+
+ sb = new StringBuffer();
+
+ if (line.startsWith(">#_"))
+ {
+ annotation = true;
+ }
+ }
+ else
+ {
+ sb.append(annotation ? uline : line);
+ }
+ }
+ }
+
+ if (annotation)
+ {
+ annotations.addElement(makeAnnotation(seq, sb));
+ }
+
+ else if (!firstLine)
+ {
+ seq.setSequence(sb.toString());
+ seqs.addElement(seq);
+ }
+ }
+ private AlignmentAnnotation makeAnnotation(SequenceI seq, StringBuffer sb)
+ {
+ Annotation[] anots = new Annotation[sb.length()];
+ char cb;
+ for (int i=0;i" + printId(s[i]));
+ if (s[i].getDescription() != null)
+ {
+ out.append(" " + s[i].getDescription());
+ }
+
+ out.append(newline);
+
+ int nochunks = (s[i].getLength() / len) + 1;
+
+ for (int j = 0; j < nochunks; j++)
+ {
+ int start = j * len;
+ int end = start + len;
+
+ if (end < s[i].getLength())
+ {
+ out.append(s[i].getSequenceAsString(start, end) + newline);
+ }
+ else if (start < s[i].getLength())
+ {
+ out.append(s[i].getSequenceAsString(start, s[i].getLength())
+ + newline);
+ }
+ }
+
+ i++;
+ }
+
+ return out.toString();
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public String print()
+ {
+ return print(getSeqsAsArray());
+ }
+}