X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=c3c86d6c8a93a645b807e5494812f457f22b607f;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=a4fb83064032610e75fb73708b50ec56d98c9118;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index a4fb830..c3c86d6 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -1,26 +1,34 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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.
- *
+ * 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 java.io.*;
-import java.util.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
-import jalview.datamodel.*;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
/**
* DOCUMENT ME!
@@ -37,7 +45,7 @@ public abstract class AlignFile extends FileParse
/**
* Sequences to be added to form a new alignment.
*/
- protected Vector seqs;
+ protected Vector seqs;
/**
* annotation to be added to generated alignment object
@@ -60,6 +68,10 @@ public abstract class AlignFile extends FileParse
*/
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();
}
/**
@@ -73,10 +85,13 @@ public abstract class AlignFile extends FileParse
public AlignFile(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);
+ }
}
/**
@@ -91,12 +106,17 @@ public abstract class AlignFile extends FileParse
super(source);
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);
+ }
}
/**
* Return the seqs Vector
*/
- public Vector getSeqs()
+ public Vector getSeqs()
{
return seqs;
}