JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / io / BLCFile.java

diff --git a/src/jalview/io/BLCFile.java b/src/jalview/io/BLCFile.java
index 5b02b59..a499f75 100755 (executable)
--- a/src/jalview/io/BLCFile.java
+++ b/src/jalview/io/BLCFile.java
@@ -1,26 +1,30 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
 
-import jalview.datamodel.*;
+import java.io.IOException;
+import java.util.Vector;
 
 /**
  * DOCUMENT ME!
@@ -112,7 +116,9 @@ public class BLCFile extends AlignFile
       {
         line = nextLine();
         if (line == null)
+        {
           break;
+        }
         // seek end of ids
         if (line.indexOf("*") > -1)
         {
@@ -147,7 +153,9 @@ public class BLCFile extends AlignFile
         }
       } while (!idsFound);
       if (line == null)
+      {
         break; // end of file.
+      }
       int starCol = line.indexOf("*");
       seqstrings = new StringBuffer[seqs.size()];
 
@@ -195,9 +203,11 @@ public class BLCFile extends AlignFile
     }
     if (seqs.size() > 0)
     {
-      if (headerLines.length() > 1 + numHeaderLines) // could see if buffer is
+      if (headerLines.length() > 1 + numHeaderLines)
+      {
         // just whitespace or not.
         setAlignmentProperty("Comments", headerLines.toString());
+      }
       setAlignmentProperty("iteration", "" + iterationCount);
     }
   }