X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBLCFile.java;h=624e134a0632d2a0f8f8e8c91df1726af590c707;hb=3d9d1f6c1c1da3b2657f9ebb95430d0bc8dde873;hp=687eef9cacef4f0a7e36bc5215695d9862a8e3e2;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git diff --git a/src/jalview/io/BLCFile.java b/src/jalview/io/BLCFile.java index 687eef9..624e134 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 @@ -25,40 +25,63 @@ import java.io.*; import java.util.*; -public class BLCFile extends AlignFile { +/** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ +public class BLCFile extends AlignFile +{ Vector titles; - public BLCFile() { + /** + * Creates a new BLCFile object. + */ + public BLCFile() + { } - public BLCFile(String inStr) { - super(inStr); - } - public BLCFile(String inFile, String type) throws IOException { + /** + * Creates a new BLCFile object. + * + * @param inFile DOCUMENT ME! + * @param type DOCUMENT ME! + * + * @throws IOException DOCUMENT ME! + */ + public BLCFile(String inFile, String type) throws IOException + { super(inFile, type); } - public void initData() { + /** + * DOCUMENT ME! + */ + public void initData() + { super.initData(); titles = new Vector(); } - public void parse() { + /** + * DOCUMENT ME! + */ + 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; - try { - do { + do + { line = nextLine(); // seek end of ids - if (line.indexOf("*") > -1) { + if (line.indexOf("*") > -1) + { idsFound = true; break; @@ -66,93 +89,88 @@ public class BLCFile extends AlignFile { int abracket = line.indexOf(">"); - if (abracket > -1) { - if (line.indexOf(" ") > -1) // - { - ///Colur it be this format? - //>54402046 0 1 137 137: - // or this?? - // 1 >L1H14 30539 343 - try { - ids.addElement(line.substring(abracket + 1, - line.indexOf(" ", abracket + 1))); - - // remove p Value - line = line.substring(abracket + 1); - line = line.substring(line.indexOf(" ") + 1); - line = line.trim(); - line = line.substring(line.indexOf(" ") + 1); - line = line.trim(); - - int value = Integer.parseInt(line.substring(0, - line.indexOf(" "))); - starts.addElement(value + ""); - line = line.substring(line.indexOf(" ") + 1); - line = line.trim(); - value = Integer.parseInt(line.substring(0, - line.indexOf(" "))); - ends.addElement(value + ""); - } catch (Exception ex) { - System.err.println("Error during blockfile read."); - ex.printStackTrace(); - starts.addElement("0"); - ends.addElement("0"); - } - } else { - ids.addElement(line.substring(abracket + 1, - line.indexOf("/"))); - line = line.substring(line.indexOf("/") + 1); - starts.addElement(line.substring(0, line.indexOf("-"))); - ends.addElement(line.substring(line.indexOf("-") + 1)); - } + if (abracket > -1) + { + line = line.substring(abracket+1); + + Sequence seq = parseId(line); + seqs.addElement(seq); } - } while (!idsFound); + } + while (!idsFound); int starCol = line.indexOf("*"); - seqstrings = new StringBuffer[ids.size()]; + seqstrings = new StringBuffer[seqs.size()]; - for (int i = 0; i < ids.size(); i++) { - if (seqstrings[i] == null) { + for (int i = 0; i < seqs.size(); i++) + { + if (seqstrings[i] == null) + { seqstrings[i] = new StringBuffer(); } } - while ((line = nextLine()).indexOf("*") == -1) { - for (int i = 0; i < ids.size(); i++) { - if (line.length() > (i + starCol)) { + while ((line = nextLine()).indexOf("*") == -1) + { + for (int i = 0; i < seqs.size(); i++) + { + if (line.length() > (i + starCol)) + { seqstrings[i].append(line.charAt(i + starCol)); } } } - for (int i = 0; i < ids.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())); - seqs.addElement(newSeq); + for (int i = 0; i < seqs.size(); i++) + { + Sequence newSeq = (Sequence) seqs.elementAt(i); + + newSeq.setSequence(seqstrings[i].toString()); } - } catch (Exception ex) { - ex.printStackTrace(); - } + } - public String print() { + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String print() + { return print(getSeqsAsArray()); } - public static String print(SequenceI[] s) { + /** + * DOCUMENT ME! + * + * @param s DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String print(SequenceI[] s) + { StringBuffer out = new StringBuffer(); - + /** + * A general parser for ids. Will look for dbrefs in + * Uniprot format source|id + * And also Jalview /start-end + * + * @String id Id to be parsed + */ int i = 0; int max = -1; - while ((i < s.length) && (s[i] != null)) { - out.append(">" + s[i].getName() + "/" + s[i].getStart() + "-" + - s[i].getEnd() + "\n"); + while ((i < s.length) && (s[i] != null)) + { + out.append(">" + printId(s[i])); + if(s[i].getDescription()!=null) + out.append(" "+s[i].getDescription()); - if (s[i].getSequence().length() > max) { - max = s[i].getSequence().length(); + out.append("\n"); + + if (s[i].getSequence().length > max) + { + max = s[i].getSequence().length; } i++; @@ -160,13 +178,18 @@ public class BLCFile extends AlignFile { out.append("* iteration 1\n"); - for (int j = 0; j < max; j++) { + for (int j = 0; j < max; j++) + { i = 0; - while ((i < s.length) && (s[i] != null)) { - if (s[i].getSequence().length() > j) { - out.append(s[i].getSequence().substring(j, j + 1)); - } else { + while ((i < s.length) && (s[i] != null)) + { + if (s[i].getSequence().length > j) + { + out.append(s[i].getSequenceAsString(j, j + 1)); + } + else + { out.append("-"); }