X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FStructureFile.java;fp=src%2Fjalview%2Fio%2FStructureFile.java;h=084f8869e5a85e6468bdef9ec61574ef8e7db6fc;hb=ec8f3cedf60fb1feed6d34de6b49f6bfa78b9dd8;hp=3025907fe46adc023add9e13001dddebcf85dae2;hpb=056dad85a910551cc95e44d451a61f6b8c4dd35d;p=jalview.git

diff --git a/src/jalview/io/StructureFile.java b/src/jalview/io/StructureFile.java
index 3025907..084f886 100644
--- a/src/jalview/io/StructureFile.java
+++ b/src/jalview/io/StructureFile.java
@@ -38,7 +38,7 @@ import java.lang.reflect.Constructor;
 import java.util.List;
 import java.util.Vector;
 
-import MCview.PDBChain;
+import mc_view.PDBChain;
 
 public abstract class StructureFile extends AlignFile
 {
@@ -68,7 +68,7 @@ public abstract class StructureFile extends AlignFile
 
   private boolean pdbIdAvailable;
 
-  public StructureFile(String inFile, DataSourceType sourceType)
+  public StructureFile(Object inFile, DataSourceType sourceType)
           throws IOException
   {
     super(inFile, sourceType);
@@ -98,7 +98,7 @@ public abstract class StructureFile extends AlignFile
 
   }
 
-  public StructureFile(boolean parseImmediately, String dataObject,
+  public StructureFile(boolean parseImmediately, Object dataObject,
           DataSourceType sourceType) throws IOException
   {
     super(parseImmediately, dataObject, sourceType);
@@ -341,8 +341,15 @@ public abstract class StructureFile extends AlignFile
     }
     StructureImportSettings.setShowSeqFeatures(true);
   }
-
-  public PDBChain findChain(String id) throws Exception
+  
+  /**
+   * Answers the first PDBChain found matching the given id, or null if none 
+   * is found
+   * 
+   * @param id
+   * @return
+   */
+  public PDBChain findChain(String id)
   {
     for (PDBChain chain : getChains())
     {
@@ -351,7 +358,7 @@ public abstract class StructureFile extends AlignFile
         return chain;
       }
     }
-    throw new Exception("PDB chain not Found!");
+    return null;
   }
 
   public void makeResidueList()