X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBfile.java;h=5fd3d10a476afc610935dff9ff56bf6ba3548f92;hb=94fdc0bf7dfe9639a0eb8c53313f873b66f98eba;hp=e5ad5656ceba031559ce5f015732a5637d7b3449;hpb=3a993bbe274824870c78bd7695c42fa93908cb30;p=jalview.git diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java index e5ad565..5fd3d10 100755 --- a/src/MCview/PDBfile.java +++ b/src/MCview/PDBfile.java @@ -1,17 +1,17 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) + * Copyright (C) 2008 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 * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * 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. - * + * * 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 @@ -26,18 +26,18 @@ import java.awt.*; import jalview.datamodel.*; import jalview.io.FileParse; -public class PDBfile - extends jalview.io.AlignFile +public class PDBfile extends jalview.io.AlignFile { public Vector chains; + public String id; /** * set to true to add chain alignment annotation as visible annotation. */ - boolean VisibleChainAnnotation=false; - public PDBfile(String inFile, String inType) - throws IOException + boolean VisibleChainAnnotation = false; + + public PDBfile(String inFile, String inType) throws IOException { super(inFile, inType); } @@ -52,11 +52,10 @@ public class PDBfile return null; } - public void parse() - throws IOException + public void parse() throws IOException { - // TODO set the filename sensibly - id = (inFile==null) ? "PDBFILE" : inFile.getName(); + // TODO set the filename sensibly + id = (inFile == null) ? "PDBFILE" : inFile.getName(); try { chains = new Vector(); @@ -67,7 +66,7 @@ public class PDBfile boolean terFlag = false; int index = 0; - while ( (line = nextLine()) != null) + while ((line = nextLine()) != null) { if (line.indexOf("HEADER") == 0) { @@ -94,12 +93,11 @@ public class PDBfile break; } if (line.indexOf("ATOM") == 0 - || (line.indexOf("HETATM") == 0 && !terFlag) - ) + || (line.indexOf("HETATM") == 0 && !terFlag)) { terFlag = false; - //Jalview is only interested in CA bonds???? + // Jalview is only interested in CA bonds???? if (!line.substring(12, 15).trim().equals("CA")) { continue; @@ -130,8 +128,7 @@ public class PDBfile } for (int i = 0; i < chains.size(); i++) { - SequenceI dataset = ( (PDBChain) chains.elementAt(i)). - sequence; + SequenceI dataset = ((PDBChain) chains.elementAt(i)).sequence; dataset.setName(id + "|" + dataset.getName()); PDBEntry entry = new PDBEntry(); entry.setId(id); @@ -140,20 +137,21 @@ public class PDBfile entry.setFile(inFile.getAbsolutePath()); } dataset.addPDBId(entry); - SequenceI chainseq = dataset.deriveSequence(); // PDBChain objects maintain reference to dataset + SequenceI chainseq = dataset.deriveSequence(); // PDBChain objects + // maintain reference to + // dataset seqs.addElement(chainseq); AlignmentAnnotation[] chainannot = chainseq.getAnnotation(); - if (chainannot!=null) + if (chainannot != null) { - for (int ai=0; ai