Merge branch 'Jalview-JS/develop' into develop

[jalview.git] / src / mc_view / PDBfile.java

diff --git a/src/MCview/PDBfile.java b/src/mc_view/PDBfile.java
similarity index 95%
rename from src/MCview/PDBfile.java
rename to src/mc_view/PDBfile.java
index ebc52aa..04eda42 100755 (executable)
--- a/src/MCview/PDBfile.java
+++ b/src/mc_view/PDBfile.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.DBRefSource;
@@ -143,16 +143,16 @@ public class PDBfile extends StructureFile
           }
 
           Atom tmpatom = new Atom(line);
-          try
+          if (tmpatom.resNumIns.trim().equals(lastID))
+          {
+            // phosphorylated protein - seen both CA and P..
+            continue;
+          }
+          tmpchain = findChain(tmpatom.chain);
+          if (tmpchain != null)
           {
-            tmpchain = findChain(tmpatom.chain);
-            if (tmpatom.resNumIns.trim().equals(lastID))
-            {
-              // phosphorylated protein - seen both CA and P..
-              continue;
-            }
             tmpchain.atoms.addElement(tmpatom);
-          } catch (Exception e)
+          } else
           {
             tmpchain = new PDBChain(getId(), tmpatom.chain);
             getChains().add(tmpchain);