X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBLCFile.java;h=04867a2a8b2ab786889c0a21c13c93b30441f433;hb=f3349bc9021e8ef27cf56dd7bc8417f1762f31e3;hp=16cc9c081adf83bed5731f1ea77e212f2698145f;hpb=04011072920c5e2587a8d549869ee47e28ad7d81;p=jalview.git

diff --git a/src/jalview/io/BLCFile.java b/src/jalview/io/BLCFile.java
index 16cc9c0..04867a2 100755
--- a/src/jalview/io/BLCFile.java
+++ b/src/jalview/io/BLCFile.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) 2006 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
@@ -71,10 +71,7 @@ public class BLCFile extends AlignFile
     public void parse() throws IOException
     {
         boolean idsFound = false;
-        Vector ids = new Vector();
         StringBuffer[] seqstrings;
-        Vector starts = new Vector();
-        Vector ends = new Vector();
 
         String line = null;
 
@@ -94,27 +91,18 @@ public class BLCFile extends AlignFile
 
                 if (abracket > -1)
                 {
-                  if (line.indexOf(" ") > -1) //
-                  {
-                    line = line.substring(abracket + 1,
-                                          line.indexOf(" ", abracket + 1));
-                  }
-                  else
-                    line = line.substring(abracket+1);
-
+                  line = line.substring(abracket+1);
 
                   Sequence seq = parseId(line);
-                  ids.addElement(seq.getName());
-                  starts.addElement(seq.getStart() + "");
-                  ends.addElement(seq.getEnd() + "");
+                  seqs.addElement(seq);
                 }
             }
             while (!idsFound);
 
             int starCol = line.indexOf("*");
-            seqstrings = new StringBuffer[ids.size()];
+            seqstrings = new StringBuffer[seqs.size()];
 
-            for (int i = 0; i < ids.size(); i++)
+            for (int i = 0; i < seqs.size(); i++)
             {
                 if (seqstrings[i] == null)
                 {
@@ -124,7 +112,7 @@ public class BLCFile extends AlignFile
 
             while ((line = nextLine()).indexOf("*") == -1)
             {
-                for (int i = 0; i < ids.size(); i++)
+                for (int i = 0; i < seqs.size(); i++)
                 {
                     if (line.length() > (i + starCol))
                     {
@@ -133,23 +121,18 @@ public class BLCFile extends AlignFile
                 }
             }
 
-            for (int i = 0; i < ids.size(); i++)
+            for (int i = 0; i < seqs.size(); i++)
             {
-              Sequence newSeq = new Sequence(ids.elementAt(i).toString(),
-                                             seqstrings[i].toString(),
-                                             Integer.parseInt(starts.elementAt(i).
-                                                              toString()),
-                                             Integer.parseInt(ends.elementAt(i).toString()));
+              Sequence newSeq = (Sequence) seqs.elementAt(i);
 
               if (!isValidProteinSequence(newSeq.getSequence()))
               {
                 throw new IOException(AppletFormatAdapter.INVALID_CHARACTERS
                                +" : "+ newSeq.getName()
                                +" : "+invalidCharacter);
-
               }
 
-                seqs.addElement(newSeq);
+              newSeq.setSequence(seqstrings[i].toString());
             }
 
     }
@@ -186,11 +169,15 @@ public class BLCFile extends AlignFile
 
         while ((i < s.length) && (s[i] != null))
         {
-            out.append(">" + printId(s[i]) +"\n");
+            out.append(">" + printId(s[i]));
+            if(s[i].getDescription()!=null)
+              out.append(" "+s[i].getDescription());
+
+            out.append("\n");
 
-            if (s[i].getSequence().length() > max)
+            if (s[i].getSequence().length > max)
             {
-                max = s[i].getSequence().length();
+                max = s[i].getSequence().length;
             }
 
             i++;
@@ -204,9 +191,9 @@ public class BLCFile extends AlignFile
 
             while ((i < s.length) && (s[i] != null))
             {
-                if (s[i].getSequence().length() > j)
+                if (s[i].getSequence().length > j)
                 {
-                    out.append(s[i].getSequence().substring(j, j + 1));
+                    out.append(s[i].getSequenceAsString(j, j + 1));
                 }
                 else
                 {