fix merge conflicts for finess on JAL-1140 (introduced by 1a8f953dd71a9e319e910261927...

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

diff --git a/src/MCview/PDBViewer.java b/src/MCview/PDBViewer.java
index 714cbd1..c8dbe66 100755 (executable)
--- a/src/MCview/PDBViewer.java
+++ b/src/MCview/PDBViewer.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
@@ -21,14 +21,6 @@ import java.io.*;
 
 import java.awt.event.*;
 import javax.swing.*;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.SAXException;
-
-import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax;
-import fr.orsay.lri.varna.exceptions.ExceptionLoadingFailed;
-import fr.orsay.lri.varna.exceptions.ExceptionPermissionDenied;
-import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;
 
 import jalview.datamodel.*;
 import jalview.gui.*;
@@ -36,8 +28,6 @@ import jalview.io.*;
 import jalview.schemes.*;
 import jalview.ws.ebi.EBIFetchClient;
 
-import java.awt.BorderLayout;
-
 public class PDBViewer extends JInternalFrame implements Runnable
 {
 
@@ -59,8 +49,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
   String tmpPDBFile;
 
   public PDBViewer(PDBEntry pdbentry, SequenceI[] seq, String[] chains,
-          AlignmentPanel ap, String protocol) throws ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException, ExceptionUnmatchedClosingParentheses
-
+          AlignmentPanel ap, String protocol)
   {
     this.pdbentry = pdbentry;
     this.seq = seq;
@@ -693,6 +682,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
           }
         }
         out.close();
+        in.close();
       } catch (Exception ex)
       {
         ex.printStackTrace();