jalview 2.5 release banner

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

diff --git a/src/jalview/io/PfamFile.java b/src/jalview/io/PfamFile.java
index 7e0a976..8ba1f6e 100755 (executable)
--- a/src/jalview/io/PfamFile.java
+++ b/src/jalview/io/PfamFile.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, 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
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * 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 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.
  * 
- * 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
+ * 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/>.
  */
 package jalview.io;
 
@@ -60,6 +59,8 @@ public class PfamFile extends AlignFile
       {
         if (line.indexOf("#") != 0)
         {
+          // TODO: verify pfam format requires spaces and not tab characters -
+          // if not upgrade to use stevesoft regex and look for whitespace.
           StringTokenizer str = new StringTokenizer(line, " ");
           String id = "";
 
@@ -83,8 +84,10 @@ public class PfamFile extends AlignFile
             {
               headers.addElement(id);
             }
-
-            tempseq.append(str.nextToken());
+            if (str.hasMoreTokens())
+            {
+              tempseq.append(str.nextToken());
+            }
           }
         }
       }