Merge remote-tracking branch 'origin/develop' into

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

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 6da867d..6d3d342 100755 (executable)
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -23,10 +23,9 @@ package MCview;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.DBRefSource;
 import jalview.datamodel.SequenceI;
-import jalview.io.FileParse;
 import jalview.io.DataSourceType;
+import jalview.io.FileParse;
 import jalview.io.StructureFile;
-import jalview.structure.StructureImportSettings;
 import jalview.util.MessageManager;
 
 import java.io.IOException;
@@ -58,8 +57,7 @@ public class PDBfile extends StructureFile
   }
 
   public PDBfile(boolean addAlignmentAnnotations, boolean predictSecStr,
-          boolean externalSecStr,
-          FileParse source) throws IOException
+          boolean externalSecStr, FileParse source) throws IOException
   {
     super(false, source);
     addSettings(addAlignmentAnnotations, predictSecStr, externalSecStr);
@@ -67,7 +65,7 @@ public class PDBfile extends StructureFile
   }
 
   @Override
-  public String print()
+  public String print(SequenceI[] seqs, boolean jvSuffix)
   {
     return null;
   }
@@ -134,8 +132,7 @@ public class PDBfile extends StructureFile
           break;
         }
         if (line.indexOf("ATOM") == 0
-                || (StructureImportSettings.isProcessHETATMs()
-                        && line.indexOf("HETATM") == 0 && !terFlag))
+                || (line.indexOf("HETATM") == 0 && !terFlag))
         {
           terFlag = false;
 
@@ -149,7 +146,7 @@ public class PDBfile extends StructureFile
           Atom tmpatom = new Atom(line);
           try
           {
-          tmpchain = findChain(tmpatom.chain);
+            tmpchain = findChain(tmpatom.chain);
             if (tmpatom.resNumIns.trim().equals(lastID))
             {
               // phosphorylated protein - seen both CA and P..
@@ -207,8 +204,6 @@ public class PDBfile extends StructureFile
     markCalcIds();
   }
 
-
-
   /**
    * Process a parsed chain to construct and return a Sequence, and add it to
    * the list of sequences parsed.