X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAssociatePdbFileWithSeq.java;h=f13bb357004fccc69f967e664fe521e282d0fd10;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=9c31e3fa79958614796c966da0f153665e9aa25f;hpb=a9315b41e948f66f4632f7d419fda643bc0b9354;p=jalview.git

diff --git a/src/jalview/gui/AssociatePdbFileWithSeq.java b/src/jalview/gui/AssociatePdbFileWithSeq.java
index 9c31e3f..f13bb35 100644
--- a/src/jalview/gui/AssociatePdbFileWithSeq.java
+++ b/src/jalview/gui/AssociatePdbFileWithSeq.java
@@ -1,36 +1,33 @@
 /*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * 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.
+ * 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 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
-import javax.swing.JOptionPane;
-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.api.StructureSelectionManagerProvider;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
+import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
 
+import javax.swing.JOptionPane;
+
 /**
  * GUI related routines for associating PDB files with sequences
  * 
@@ -47,44 +44,50 @@ public class AssociatePdbFileWithSeq
    * @param sequence
    */
   public PDBEntry associatePdbWithSeq(String choice, String protocol,
-          SequenceI sequence, boolean prompt)
+          SequenceI sequence, boolean prompt,
+          StructureSelectionManagerProvider ssmp)
   {
     PDBEntry entry = new PDBEntry();
-    try
+    MCview.PDBfile pdbfile = null;
+    pdbfile = StructureSelectionManager.getStructureSelectionManager(ssmp)
+            .setMapping(false, new SequenceI[]
+            { sequence }, null, choice, protocol);
+    if (pdbfile == null)
     {
-      MCview.PDBfile pdbfile = new MCview.PDBfile(choice, protocol);
+      // stacktrace already thrown so just return
+      return null;
+    }
+    if (pdbfile.id == null)
+    {
+      String reply = null;
 
-      if (pdbfile.id == null)
+      if (prompt)
       {
-        String reply = null;
-
-        if (prompt)
-        {
-          reply = JOptionPane
-                  .showInternalInputDialog(
-                          Desktop.desktop,
-                          MessageManager.getString("label.couldnt_find_pdb_id_in_file"),
-                          MessageManager.getString("label.no_pdb_id_in_file"), JOptionPane.QUESTION_MESSAGE);
-        }
-        if (reply == null)
-        {
-          return null;
-        }
-
-        entry.setId(reply);
+        reply = JOptionPane.showInternalInputDialog(Desktop.desktop,
+                MessageManager
+                        .getString("label.couldnt_find_pdb_id_in_file"),
+                MessageManager.getString("label.no_pdb_id_in_file"),
+                JOptionPane.QUESTION_MESSAGE);
       }
-      else
+      if (reply == null)
       {
-        entry.setId(pdbfile.id);
+        return null;
       }
 
-    } catch (java.io.IOException ex)
+      entry.setId(reply);
+    }
+    else
     {
-      ex.printStackTrace();
+      entry.setId(pdbfile.id);
     }
 
-    entry.setFile(choice);
-    sequence.getDatasetSequence().addPDBId(entry);
+    if (pdbfile != null)
+    {
+      entry.setFile(choice);
+      sequence.getDatasetSequence().addPDBId(entry);
+      StructureSelectionManager.getStructureSelectionManager(ssmp)
+              .registerPDBEntry(entry);
+    }
     return entry;
   }
 }