X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=3b46760719f3e964ef5274c2c9510166ad9de37e;hb=6dd554fdbf34db6b79595d5027159d20225f4894;hp=7550a5bc8a3251e1feedde9bea716ec172321a90;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 7550a5b..3b46760 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -1,31 +1,37 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * 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.
+ * 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 .
+ * 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 jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.List;
import java.util.Vector;
/**
@@ -48,7 +54,12 @@ public abstract class AlignFile extends FileParse
/**
* annotation to be added to generated alignment object
*/
- protected Vector annotations;
+ protected Vector annotations;
+
+ /**
+ * SequenceGroups to be added to the alignment object
+ */
+ protected List seqGroups;
/**
* Properties to be added to generated alignment object
@@ -61,11 +72,17 @@ public abstract class AlignFile extends FileParse
boolean jvSuffix = true;
+ private boolean parseCalled;
+
/**
* Creates a new AlignFile object.
*/
public AlignFile()
{
+ // Shouldn't we init data structures (JBPNote: not sure - initData is for
+ // initialising the structures used for reading from a datasource, and the
+ // bare constructor hasn't got any datasource)
+ initData();
}
/**
@@ -78,16 +95,28 @@ public abstract class AlignFile extends FileParse
*/
public AlignFile(String inFile, String type) throws IOException
{
+ this(true, inFile, type);
+ }
+
+ /**
+ * Constructor which (optionally delays) parsing of data from a file of some specified type.
+ *
+ * @param parseImmediately
+ * if false, need to call 'doParse()' to begin parsing data
+ * @param inFile
+ * Filename to read from.
+ * @param type
+ * What type of file to read from (File, URL)
+ * @throws IOException
+ */
+ public AlignFile(boolean parseImmediately, String inFile, String type) throws IOException
+ {
super(inFile, type);
initData();
- parse();
- // sets the index of each sequence in the alignment
- for (int i = 0, c = seqs.size(); i < c; i++)
- {
- seqs.get(i).setIndex(i);
+ if (parseImmediately) {
+ doParse();
}
}
-
/**
* Attempt to read from the position where some other parsing process left
* off.
@@ -97,8 +126,36 @@ public abstract class AlignFile extends FileParse
*/
public AlignFile(FileParse source) throws IOException
{
+ this(true,source);
+ }
+ /**
+ * Construct a new parser to read from the position where some other parsing process left
+ *
+ * @param parseImmediately
+ * if false, need to call 'doParse()' to begin parsing data
+ * @param source
+ */
+ public AlignFile(boolean parseImmediately, FileParse source) throws IOException
+ {
super(source);
initData();
+ if (parseImmediately) {
+ doParse();
+ }
+ }
+ /**
+ * called if parsing was delayed till after parser was constructed
+ * @throws IOException
+ */
+ public void doParse() throws IOException
+ {
+ if (parseCalled)
+ {
+ throw new IOException(
+ "Implementation error: Parser called twice for same data.\n"
+ + "Need to call initData() again before parsing can be reattempted.");
+ }
+ parseCalled=true;
parse();
// sets the index of each sequence in the alignment
for (int i = 0, c = seqs.size(); i < c; i++)
@@ -107,6 +164,7 @@ public abstract class AlignFile extends FileParse
}
}
+
/**
* Return the seqs Vector
*/
@@ -115,6 +173,11 @@ public abstract class AlignFile extends FileParse
return seqs;
}
+ public List getSeqGroups()
+ {
+ return seqGroups;
+ }
+
/**
* Return the Sequences in the seqs Vector as an array of Sequences
*/
@@ -124,7 +187,7 @@ public abstract class AlignFile extends FileParse
for (int i = 0; i < seqs.size(); i++)
{
- s[i] = (SequenceI) seqs.elementAt(i);
+ s[i] = seqs.elementAt(i);
}
return s;
@@ -136,7 +199,7 @@ public abstract class AlignFile extends FileParse
*
* @param al
*/
- public void addAnnotations(Alignment al)
+ public void addAnnotations(AlignmentI al)
{
addProperties(al);
for (int i = 0; i < annotations.size(); i++)
@@ -148,7 +211,7 @@ public abstract class AlignFile extends FileParse
* Rna.GetBasePairsFromAlignmentAnnotation(annotations.elementAt(i));
* Rna.HelixMap(pairArray);
*/
- AlignmentAnnotation an = (AlignmentAnnotation) annotations
+ AlignmentAnnotation an = annotations
.elementAt(i);
an.validateRangeAndDisplay();
al.addAnnotation(an);
@@ -157,13 +220,24 @@ public abstract class AlignFile extends FileParse
}
/**
+ * register sequence groups on the alignment for **output**
+ *
+ * @param al
+ */
+ public void addSeqGroups(AlignmentI al)
+ {
+ this.seqGroups = al.getGroups();
+
+ }
+
+ /**
* Add any additional information extracted from the file to the alignment
* properties.
*
* @note implicitly called by addAnnotations()
* @param al
*/
- public void addProperties(Alignment al)
+ public void addProperties(AlignmentI al)
{
if (properties != null && properties.size() > 0)
{
@@ -190,8 +264,7 @@ public abstract class AlignFile extends FileParse
{
if (key == null)
{
- throw new Error(
- "Implementation error: Cannot have null alignment property key.");
+ throw new Error(MessageManager.getString("error.implementation_error_cannot_have_null_alignment"));
}
if (value == null)
{
@@ -218,8 +291,10 @@ public abstract class AlignFile extends FileParse
*/
protected void initData()
{
- seqs = new Vector();
- annotations = new Vector();
+ seqs = new Vector();
+ annotations = new Vector();
+ seqGroups = new ArrayList();
+ parseCalled=false;
}
/**
@@ -230,7 +305,7 @@ public abstract class AlignFile extends FileParse
*/
protected void setSeqs(SequenceI[] s)
{
- seqs = new Vector();
+ seqs = new Vector();
for (int i = 0; i < s.length; i++)
{
@@ -290,13 +365,13 @@ public abstract class AlignFile extends FileParse
/**
* vector of String[] treeName, newickString pairs
*/
- Vector newickStrings = null;
+ Vector newickStrings = null;
protected void addNewickTree(String treeName, String newickString)
{
if (newickStrings == null)
{
- newickStrings = new Vector();
+ newickStrings = new Vector();
}
newickStrings.addElement(new String[]
{ treeName, newickString });
@@ -304,11 +379,16 @@ public abstract class AlignFile extends FileParse
protected int getTreeCount()
{
- if (newickStrings == null)
+ return newickStrings == null ? 0 : newickStrings.size();
+ }
+
+ public void addGroups(AlignmentI al)
+ {
+
+ for (SequenceGroup sg : getSeqGroups())
{
- return 0;
+ al.addGroup(sg);
}
- return newickStrings.size();
}
}