X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FPDBfile.java;h=4d2a8d529d5c324737697c8d494a73f3f7d47439;hb=a2aa22698dd5bbcfb8578fb39c8a4e8025ac243b;hp=36eecb8471f24e76b50b4659232b69456c7dd6a5;hpb=1e8006f71404e0afb34bcb2d754abce7f6d3fe25;p=jalview.git

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 36eecb8..4d2a8d5 100755
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.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
@@ -18,13 +18,10 @@
 */
 package MCview;
 
-import jalview.io.AppletFormatAdapter;
 import jalview.datamodel.*;
 
 import java.io.*;
 
-import java.net.*;
-
 import java.util.*;
 import java.awt.Color;
 
@@ -45,6 +42,7 @@ public class PDBfile extends jalview.io.AlignFile {
 
     public void parse() throws IOException
     {
+      try{
         chains = new Vector();
 
         PDBChain tmpchain;
@@ -52,75 +50,84 @@ public class PDBfile extends jalview.io.AlignFile {
         boolean modelFlag = false;
         boolean terFlag = false;
 
-
         int index = 0;
-        while((line = nextLine())!=null)
+        while ( (line = nextLine()) != null)
         {
-           if (line.indexOf("HEADER") == 0)
-           {
-             id = line.substring(62, 67).trim();
-             continue;
-           }
+          if (line.indexOf("HEADER") == 0)
+          {
+            id = line.substring(62, 67).trim();
+            continue;
+          }
+
+          if (line.indexOf("MODEL") == 0)
+            modelFlag = true;
 
-           if(line.indexOf("MODEL")==0)
-             modelFlag = true;
+          if (line.indexOf("TER") == 0)
+            terFlag = true;
 
-           if(line.indexOf("TER")==0)
-             terFlag = true;
+          if (modelFlag && line.indexOf("ENDMDL") == 0)
+            break;
 
-           if(modelFlag && line.indexOf("ENDMDL")==0)
-             break;
+          if (line.indexOf("ATOM") == 0
+              || (line.indexOf("HETATM") == 0 && !terFlag)
+              )
+          {
+            terFlag = false;
 
-           if (    line.indexOf("ATOM")==0
-               || (line.indexOf("HETATM")==0 && !terFlag)
-             )
+            //Jalview is only interested in CA bonds????
+            if (!line.substring(12, 15).trim().equals("CA"))
+            {
+              continue;
+            }
+
+            Atom tmpatom = new Atom(line);
+            tmpchain = findChain(tmpatom.chain);
+            if (tmpchain != null)
+            {
+              tmpchain.atoms.addElement(tmpatom);
+            }
+            else
             {
-              terFlag = false;
-
-
-              //Jalview is only interested in CA bonds????
-              if (!line.substring(12, 15).trim().equals("CA"))
-              {
-                continue;
-              }
-
-              Atom tmpatom = new Atom(line);
-              tmpchain = findChain(tmpatom.chain);
-              if (tmpchain != null)
-              {
-                tmpchain.atoms.addElement(tmpatom);
-              }
-              else
-              {
-                tmpchain = new PDBChain(tmpatom.chain);
-                chains.addElement(tmpchain);
-                tmpchain.atoms.addElement(tmpatom);
-              }
+              tmpchain = new PDBChain(tmpatom.chain);
+              chains.addElement(tmpchain);
+              tmpchain.atoms.addElement(tmpatom);
+            }
           }
-          index ++;
+          index++;
         }
 
-       makeResidueList();
-       makeCaBondList();
+        makeResidueList();
+        makeCaBondList();
 
-       for (int i = 0; i < chains.size(); i++)
-       {
-         SequenceI seq = ( (PDBChain) chains.elementAt(i)).
-             sequence;
-         seq.setName(id + "|" + seq.getName());
-         Sequence dataset = new Sequence(seq.
-             getName(),
-             seq.getSequence().toString(), seq.getStart(), seq.getEnd());
-
-         PDBEntry entry = new PDBEntry();
-         entry.setId(id);
-         entry.setFile(inFile.getAbsolutePath());
-
-         seq.setDatasetSequence(dataset);
-         dataset.addPDBId(entry);
-
-         getSeqs().addElement(seq);
-       }
+        if (id == null)
+        {
+          id = inFile.getName();
+        }
+        for (int i = 0; i < chains.size(); i++)
+        {
+          SequenceI seq = ( (PDBChain) chains.elementAt(i)).
+              sequence;
+          seq.setName(id + "|" + seq.getName());
+          Sequence dataset = new Sequence(seq.
+                                          getName(),
+                                          seq.getSequence().toString(),
+                                          seq.getStart(), seq.getEnd());
+
+          PDBEntry entry = new PDBEntry();
+          entry.setId(id);
+          if (inFile != null)
+            entry.setFile(inFile.getAbsolutePath());
+
+          seq.setDatasetSequence(dataset);
+          dataset.addPDBId(entry);
+
+          getSeqs().addElement(seq);
+        }
+      }catch(OutOfMemoryError er)
+      {
+        System.out.println("OUT OF MEMORY LOADING PDB FILE");
+        throw new IOException("Out of memory loading PDB File");
+      }
     }
 
     public void makeResidueList() {