X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=7e0cabd07b58c1345ce4c6297d732bf2639638f5;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=3b46760719f3e964ef5274c2c9510166ad9de37e;hpb=619cc880371f3228e6a1fb33c6bfb6e7a7e2622c;p=jalview.git

diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 3b46760..7e0cabd 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -97,9 +97,10 @@ public abstract class AlignFile extends FileParse
   {
     this(true, inFile, type);
   }
-  
+
   /**
-   * Constructor which (optionally delays) parsing of data from a file of some specified 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
@@ -109,14 +110,17 @@ public abstract class AlignFile extends FileParse
    *          What type of file to read from (File, URL)
    * @throws IOException
    */
-  public AlignFile(boolean parseImmediately, String inFile, String type) throws IOException
+  public AlignFile(boolean parseImmediately, String inFile, String type)
+          throws IOException
   {
     super(inFile, type);
     initData();
-    if (parseImmediately) {
+    if (parseImmediately)
+    {
       doParse();
     }
   }
+
   /**
    * Attempt to read from the position where some other parsing process left
    * off.
@@ -126,25 +130,31 @@ public abstract class AlignFile extends FileParse
    */
   public AlignFile(FileParse source) throws IOException
   {
-    this(true,source);
+    this(true, source);
   }
+
   /**
-   * Construct a new parser to read from the position where some other parsing process left
+   * 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
+  public AlignFile(boolean parseImmediately, FileParse source)
+          throws IOException
   {
     super(source);
     initData();
-    if (parseImmediately) {
+    if (parseImmediately)
+    {
       doParse();
     }
   }
+
   /**
    * called if parsing was delayed till after parser was constructed
+   * 
    * @throws IOException
    */
   public void doParse() throws IOException
@@ -155,7 +165,7 @@ public abstract class AlignFile extends FileParse
               "Implementation error: Parser called twice for same data.\n"
                       + "Need to call initData() again before parsing can be reattempted.");
     }
-    parseCalled=true;
+    parseCalled = true;
     parse();
     // sets the index of each sequence in the alignment
     for (int i = 0, c = seqs.size(); i < c; i++)
@@ -164,7 +174,6 @@ public abstract class AlignFile extends FileParse
     }
   }
 
-
   /**
    * Return the seqs Vector
    */
@@ -211,8 +220,7 @@ public abstract class AlignFile extends FileParse
        * Rna.GetBasePairsFromAlignmentAnnotation(annotations.elementAt(i));
        * Rna.HelixMap(pairArray);
        */
-      AlignmentAnnotation an = annotations
-              .elementAt(i);
+      AlignmentAnnotation an = annotations.elementAt(i);
       an.validateRangeAndDisplay();
       al.addAnnotation(an);
     }
@@ -264,7 +272,9 @@ public abstract class AlignFile extends FileParse
   {
     if (key == null)
     {
-      throw new Error(MessageManager.getString("error.implementation_error_cannot_have_null_alignment"));
+      throw new Error(
+              MessageManager
+                      .getString("error.implementation_error_cannot_have_null_alignment"));
     }
     if (value == null)
     {
@@ -294,7 +304,7 @@ public abstract class AlignFile extends FileParse
     seqs = new Vector<SequenceI>();
     annotations = new Vector<AlignmentAnnotation>();
     seqGroups = new ArrayList<SequenceGroup>();
-    parseCalled=false;
+    parseCalled = false;
   }
 
   /**
@@ -373,8 +383,7 @@ public abstract class AlignFile extends FileParse
     {
       newickStrings = new Vector<String[]>();
     }
-    newickStrings.addElement(new String[]
-    { treeName, newickString });
+    newickStrings.addElement(new String[] { treeName, newickString });
   }
 
   protected int getTreeCount()