X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMCview%2FPDBfile.java;h=f9d842fd087c298dd08de0207aacf9495dc4e857;hb=08044f16da407871ea84ccbfbc09e34cceb74080;hp=1937a8f0aaba0f3eed94408ab8678ad78fe190a8;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 1937a8f..f9d842f 100755
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -16,149 +16,136 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
-
 package MCview;
 
-import jalview.datamodel.*;
 import java.io.*;
+
 import java.net.*;
+
 import java.util.*;
 
 
 public class PDBfile extends jalview.io.FileParse {
+    public Vector chains = new Vector();
+    Vector lineArray = new Vector();
 
-  public Vector chains = new Vector();
+    public PDBfile(String[] lines) {
+        for (int i = 0; i < lines.length; i++)
+            lineArray.addElement(lines[i]);
 
-  Vector lineArray = new Vector();
+        noLines = lineArray.size();
+        parse();
+    }
 
-  public PDBfile(String [] lines)
-  {
-    for(int i=0; i<lines.length; i++)
-      lineArray.addElement(lines[i]);
+    public PDBfile(String inFile, String inType) throws IOException {
+        super(inFile, inType);
 
-    noLines = lineArray.size();
-    parse();
-  }
+        String line;
+        this.lineArray = new Vector();
 
-  public PDBfile(String inFile, String inType) throws IOException {
+        BufferedReader dataIn;
 
-    super(inFile,inType);
+        if (inType.equals("File")) {
+            dataIn = new BufferedReader(new FileReader(inFile));
+        }
+        else if(inType.equals("Paste"))
+        {
+            dataIn = new BufferedReader(new StringReader(inFile));
+        }
+        else {
+            URL url = new URL(inFile);
+            this.fileSize = 0;
+            dataIn = new BufferedReader(new InputStreamReader(url.openStream()));
+        }
 
-    String line;
-    this.lineArray = new Vector();
-    BufferedReader dataIn;
+        while ((line = dataIn.readLine()) != null) {
+            lineArray.addElement(line);
+        }
 
-    if (inType.equals("File"))
-      dataIn =  new BufferedReader(new FileReader( inFile ));
+        noLines = lineArray.size();
 
-    else
-    {
-      URL url = new URL(inFile);
-      this.fileSize = 0;
-      dataIn = new BufferedReader(new InputStreamReader(url.openStream()));
+        parse();
     }
 
-    while ((line = dataIn.readLine()) != null) {
-      lineArray.addElement(line);
-    }
-    noLines = lineArray.size();
+    public void parse() {
+        for (int i = 0; i < lineArray.size(); i++) {
+            StringTokenizer str = new StringTokenizer(lineArray.elementAt(i)
+                                                               .toString());
+
+            if (str.hasMoreTokens()) {
+                String inStr = str.nextToken();
+
+                if (inStr.indexOf("ATOM") != -1) {
+                    try {
+                        myAtom tmpatom = new myAtom(str);
+
+                        if (findChain(tmpatom.chain) != null) {
+                            //   System.out.println("Adding to chain " + tmpatom.chain);
+                            findChain(tmpatom.chain).atoms.addElement(tmpatom);
+                        } else {
+                            PDBChain tmpchain = new PDBChain(tmpatom.chain);
+                            chains.addElement(tmpchain);
+                            tmpchain.atoms.addElement(tmpatom);
+                        }
+                    } catch (NumberFormatException e) {
+                        System.err.println("Caught" + e);
+                        System.err.println("Record not added to PDB model:" +
+                            lineArray.elementAt(i).toString());
+                    }
+                }
+            }
+        }
 
-    parse();
+        makeResidueList();
+        makeCaBondList();
+    }
 
-}
+    public void makeResidueList() {
+        for (int i = 0; i < chains.size(); i++) {
+            ((PDBChain) chains.elementAt(i)).makeResidueList();
+        }
+    }
 
+    public void makeCaBondList() {
+        for (int i = 0; i < chains.size(); i++) {
+            ((PDBChain) chains.elementAt(i)).makeCaBondList();
+        }
+    }
 
-  public void parse() {
-
-    for (int i = 0; i < lineArray.size(); i++) {
-      StringTokenizer str = new StringTokenizer(lineArray.elementAt(i).toString());
-      if (str.hasMoreTokens()) {
-        String inStr = str.nextToken();
-
-        if (inStr.indexOf("ATOM") != -1) {
-          try {
-            myAtom tmpatom = new myAtom(str);
-            if (findChain(tmpatom.chain) != null) {
-           //   System.out.println("Adding to chain " + tmpatom.chain);
-              findChain(tmpatom.chain).atoms.addElement(tmpatom);
-            } else {
-            //  System.out.println("Making chain " + tmpatom.chain);
-              PDBChain tmpchain = new PDBChain(tmpatom.chain);
-              chains.addElement(tmpchain);
-              tmpchain.atoms.addElement(tmpatom);
+    public PDBChain findChain(String id) {
+        for (int i = 0; i < chains.size(); i++) {
+            // System.out.println("ID = " + id + " " +((PDBChain)chains.elementAt(i)).id);
+            if (((PDBChain) chains.elementAt(i)).id.equals(id)) {
+                return (PDBChain) chains.elementAt(i);
             }
-          } catch(NumberFormatException e) {
-            System.err.println("Caught" +  e);
-            System.err.println("Record not added to PDB model:"+lineArray.elementAt(i).toString());
-          }
         }
-      }
-    }
-    makeResidueList();
-    makeCaBondList();
-    //    for (int i=0; i < chains.size() ; i++) {
-    //  String pog = ((PDBChain)chains.elementAt(i)).print();
-    //  System.out.println(pog);
-    // }
-  }
-
-  public void makeResidueList() {
-    for (int i=0; i < chains.size() ; i++) {
-      ((PDBChain)chains.elementAt(i)).makeResidueList();
-    }
-  }
-  public void makeCaBondList() {
-    for (int i=0; i < chains.size() ; i++) {
-      ((PDBChain)chains.elementAt(i)).makeCaBondList();
-    }
-  }
-
-  public PDBChain findChain(String id) {
-    for (int i=0; i < chains.size(); i++) {
-      // System.out.println("ID = " + id + " " +((PDBChain)chains.elementAt(i)).id);
-      if (((PDBChain)chains.elementAt(i)).id.equals(id)) {
-        return (PDBChain)chains.elementAt(i);
-      }
-    }
-    return null;
-  }
 
+        return null;
+    }
 
-  public void setChargeColours() {
-    for (int i=0; i < chains.size(); i++) {
-      ((PDBChain)chains.elementAt(i)).setChargeColours();
+    public void setChargeColours() {
+        for (int i = 0; i < chains.size(); i++) {
+            ((PDBChain) chains.elementAt(i)).setChargeColours();
+        }
     }
-  }
 
-  public void setHydrophobicityColours() {
-    for (int i=0; i < chains.size(); i++) {
-      ((PDBChain)chains.elementAt(i)).setHydrophobicityColours();
+    public void setHydrophobicityColours() {
+        for (int i = 0; i < chains.size(); i++) {
+            ((PDBChain) chains.elementAt(i)).setHydrophobicityColours();
+        }
     }
-  }
-
-  public void colourBySequence(Sequence seq) {
-//SMJS TODO
-//    int max = seq.maxchain;
-//    if (seq.maxchain != -1) {
-//      ((PDBChain)chains.elementAt(max)).colourBySequence(seq);
-//    }
-  }
-
-  public void setChainColours() {
-    for (int i=0; i < chains.size(); i++) {
-      ((PDBChain)chains.elementAt(i)).setChainColours();
+
+    public void colourBySequence()//jalview.gui.SequenceRenderer sr,
+                                // jalview.gui.FeatureRenderer fr)
+                                {
+            for (int i = 0; i < chains.size(); i++) {
+              //((PDBChain)chains.elementAt(i)).colourBySequence(sr,fr);
+            }
     }
-  }
-  public static void main(String[] args) {
-    try {
-      PDBfile pdb = new PDBfile("enkp1.pdb","File");
-    } catch(IOException e) {
-      System.out.println(e);
-      e.printStackTrace();
-      System.exit(0);
+
+    public void setChainColours() {
+        for (int i = 0; i < chains.size(); i++) {
+            ((PDBChain) chains.elementAt(i)).setChainColours();
+        }
     }
-  }
 }
-
-
-