X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPfamFile.java;h=4c90bca4979caa8f967b5ee1ebb41c8f9822177f;hb=a96d51f58325f8429c5792ae554243de5628d62a;hp=ec52bace0cbccfe55adc613272303e32d428642b;hpb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;p=jalview.git

diff --git a/src/jalview/io/PfamFile.java b/src/jalview/io/PfamFile.java
index ec52bac..4c90bca 100755
--- a/src/jalview/io/PfamFile.java
+++ b/src/jalview/io/PfamFile.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, 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
@@ -32,11 +32,6 @@ public class PfamFile
   {
   }
 
-  public PfamFile(String inStr)
-  {
-    super(inStr);
-  }
-
   public PfamFile(String inFile, String type)
       throws IOException
   {
@@ -111,16 +106,10 @@ public class PfamFile
               .length();
         }
 
-
         Sequence newSeq = parseId(headers.elementAt(i).toString());
-        newSeq.setSequence( seqhash.get(headers.elementAt(i).toString()).toString());
+        newSeq.setSequence(seqhash.get(headers.elementAt(i).toString()).
+                           toString());
         seqs.addElement(newSeq);
-
-        if (!isValidProteinSequence(newSeq.getSequence()))
-        {
-          throw new IOException(
-              "Not a valid protein sequence - (PFAM input)");
-        }
       }
       else
       {
@@ -143,9 +132,9 @@ public class PfamFile
     {
       String tmp = printId(s[i]);
 
-      if (s[i].getSequence().length() > max)
+      if (s[i].getSequence().length > max)
       {
-        max = s[i].getSequence().length();
+        max = s[i].getSequence().length;
       }
 
       if (tmp.length() > maxid)
@@ -165,9 +154,9 @@ public class PfamFile
 
     while ( (j < s.length) && (s[j] != null))
     {
-      out.append(new Format("%-" + maxid + "s").form( printId(s[j])+" "));
+      out.append(new Format("%-" + maxid + "s").form(printId(s[j]) + " "));
 
-      out.append(s[j].getSequence() + "\n");
+      out.append(s[j].getSequenceAsString() + "\n");
       j++;
     }