X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=661ebae135ec184b8b2f1c35b2a73693d55f6de1;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=2ad32f0787e97f9ea99e2ca342503440a2061880;hpb=3a993bbe274824870c78bd7695c42fa93908cb30;p=jalview.git
diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 2ad32f0..661ebae 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -1,91 +1,166 @@
/*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * 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.
- *
- * 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.
- *
+ *
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
-import jalview.datamodel.*;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
* @version $Revision$
*/
-public abstract class AlignFile
- extends FileParse
+public abstract class AlignFile extends FileParse
{
int noSeqs = 0;
+
int maxLength = 0;
+
/**
* Sequences to be added to form a new alignment.
*/
- protected Vector seqs;
+ protected Vector seqs;
+
/**
* annotation to be added to generated alignment object
*/
- protected Vector annotations;
+ protected Vector annotations;
+
/**
* Properties to be added to generated alignment object
*/
protected Hashtable properties;
+
long start;
+
long end;
+
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();
}
/**
* Constructor which parses the data from a file of some specified type.
- * @param inFile Filename to read from.
- * @param type What type of file to read from (File, URL)
+ *
+ * @param inFile
+ * Filename to read from.
+ * @param type
+ * What type of file to read from (File, URL)
*/
- public AlignFile(String inFile, String type)
- throws IOException
+ 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();
+ if (parseImmediately) {
+ doParse();
+ }
}
/**
- * Attempt to read from the position where some other parsing process left off.
+ * Attempt to read from the position where some other parsing process left
+ * off.
+ *
* @param source
* @throws IOException
*/
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++)
+ {
+ seqs.get(i).setIndex(i);
+ }
}
+
+
/**
* Return the seqs Vector
*/
- public Vector getSeqs()
+ public Vector getSeqs()
{
return seqs;
}
@@ -104,10 +179,11 @@ public abstract class AlignFile
return s;
}
+
/**
- * called by AppletFormatAdapter to generate
- * an annotated alignment, rather than bare
- * sequences.
+ * called by AppletFormatAdapter to generate an annotated alignment, rather
+ * than bare sequences.
+ *
* @param al
*/
public void addAnnotations(Alignment al)
@@ -115,21 +191,31 @@ public abstract class AlignFile
addProperties(al);
for (int i = 0; i < annotations.size(); i++)
{
- al.addAnnotation(
- (AlignmentAnnotation) annotations.elementAt(i)
- );
+ // detect if annotations.elementAt(i) rna secondary structure
+ // if so then do:
+ /*
+ * SequenceFeature[] pairArray =
+ * Rna.GetBasePairsFromAlignmentAnnotation(annotations.elementAt(i));
+ * Rna.HelixMap(pairArray);
+ */
+ AlignmentAnnotation an = (AlignmentAnnotation) annotations
+ .elementAt(i);
+ an.validateRangeAndDisplay();
+ al.addAnnotation(an);
}
}
+
/**
- * Add any additional information extracted
- * from the file to the alignment properties.
+ * Add any additional information extracted from the file to the alignment
+ * properties.
+ *
* @note implicitly called by addAnnotations()
* @param al
*/
public void addProperties(Alignment al)
{
- if (properties!=null && properties.size()>0)
+ if (properties != null && properties.size() > 0)
{
Enumeration keys = properties.keys();
Enumeration vals = properties.elements();
@@ -139,36 +225,43 @@ public abstract class AlignFile
}
}
}
+
/**
- * Store a non-null key-value pair in a hashtable used to set alignment properties
- * note: null keys will raise an error, null values will result in the key/value pair being silently ignored.
- * @param key - non-null key object
- * @param value - non-null value
+ * Store a non-null key-value pair in a hashtable used to set alignment
+ * properties note: null keys will raise an error, null values will result in
+ * the key/value pair being silently ignored.
+ *
+ * @param key
+ * - non-null key object
+ * @param value
+ * - non-null value
*/
protected void setAlignmentProperty(Object key, Object value)
{
- if (key==null)
+ 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)
+ if (value == null)
{
return; // null properties are ignored.
}
- if (properties==null)
+ if (properties == null)
{
properties = new Hashtable();
}
properties.put(key, value);
}
+
protected Object getAlignmentProperty(Object key)
{
- if (properties!=null && key!=null)
+ if (properties != null && key != null)
{
return properties.get(key);
}
return null;
}
+
/**
* Initialise objects to store sequence data in.
*/
@@ -176,12 +269,14 @@ public abstract class AlignFile
{
seqs = new Vector();
annotations = new Vector();
+ parseCalled=false;
}
/**
* DOCUMENT ME!
- *
- * @param s DOCUMENT ME!
+ *
+ * @param s
+ * DOCUMENT ME!
*/
protected void setSeqs(SequenceI[] s)
{
@@ -196,8 +291,7 @@ public abstract class AlignFile
/**
* This method must be implemented to parse the contents of the file.
*/
- public abstract void parse()
- throws IOException;
+ public abstract void parse() throws IOException;
/**
* Print out in alignment file format the Sequences in the seqs Vector.
@@ -211,7 +305,7 @@ public abstract class AlignFile
/**
* A general parser for ids.
- *
+ *
* @String id Id to be parsed
*/
Sequence parseId(String id)
@@ -233,20 +327,20 @@ public abstract class AlignFile
}
/**
- * Creates the output id.
- * Adds prefix Uniprot format source|id
- * And suffix Jalview /start-end
- *
+ * Creates the output id. Adds prefix Uniprot format source|id And suffix
+ * Jalview /start-end
+ *
* @String id Id to be parsed
*/
String printId(SequenceI seq)
{
return seq.getDisplayId(jvSuffix);
}
+
/**
* vector of String[] treeName, newickString pairs
*/
- Vector newickStrings=null;
+ Vector newickStrings = null;
protected void addNewickTree(String treeName, String newickString)
{
@@ -254,12 +348,13 @@ public abstract class AlignFile
{
newickStrings = new Vector();
}
- newickStrings.addElement(new String[] { treeName, newickString});
+ newickStrings.addElement(new String[]
+ { treeName, newickString });
}
protected int getTreeCount()
{
- if (newickStrings==null)
+ if (newickStrings == null)
{
return 0;
}