X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=c2cf6670248d3cd2efba126a9f63da1e0c243cc5;hb=9c19686c86fc6060c8734478ea6e73954684a597;hp=497f0a580836af85016458f6f32c3ecd97adc9a3;hpb=6fd29e7e2753c9066fa31b76ab71827f96d471ff;p=jalview.git

diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 497f0a5..c2cf667 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -112,7 +112,7 @@ public abstract class AlignFile extends FileParse
    * @param sourceType
    *          What type of file to read from (File, URL, Pasted String)
    */
-  public AlignFile(String dataObject, DataSourceType sourceType)
+  public AlignFile(Object dataObject, DataSourceType sourceType)
           throws IOException
   {
     this(true, dataObject, sourceType);
@@ -130,9 +130,10 @@ public abstract class AlignFile extends FileParse
    *          What type of file to read from (File, URL)
    * @throws IOException
    */
-  public AlignFile(boolean parseImmediately, String dataObject,
+  public AlignFile(boolean parseImmediately, Object dataObject,
           DataSourceType sourceType) throws IOException
   {
+    // BH allows File or String
     super(dataObject, sourceType);
     initData();
     if (parseImmediately)
@@ -322,14 +323,15 @@ public abstract class AlignFile extends FileParse
    */
   protected void initData()
   {
-    seqs = new Vector<SequenceI>();
-    annotations = new Vector<AlignmentAnnotation>();
-    seqGroups = new ArrayList<SequenceGroup>();
+    seqs = new Vector<>();
+    annotations = new Vector<>();
+    seqGroups = new ArrayList<>();
     parseCalled = false;
   }
 
   /**
-   * DOCUMENT ME!
+   * Create the seqs Vector from a set of parsed sequences in an AlignFile,
+   * FeaturesFile, RnamlFile, or StockholmFile.
    * 
    * @param s
    *          DOCUMENT ME!
@@ -337,7 +339,7 @@ public abstract class AlignFile extends FileParse
   @Override
   public void setSeqs(SequenceI[] s)
   {
-    seqs = new Vector<SequenceI>();
+    seqs = new Vector<>();
 
     for (int i = 0; i < s.length; i++)
     {
@@ -408,7 +410,7 @@ public abstract class AlignFile extends FileParse
   {
     if (newickStrings == null)
     {
-      newickStrings = new Vector<String[]>();
+      newickStrings = new Vector<>();
     }
     newickStrings.addElement(new String[] { treeName, newickString });
   }