X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAssociatePdbFileWithSeq.java;h=420e2cbf7a0891ffa9ead3a5c95e2d247e81aa3a;hb=06379070d6c2267efe3a30926d84c51a48d1cdce;hp=f0cee7c39e287e42dcf6c8d366124a65101fc0ce;hpb=fee1b781ca14aadea5d112fc554fe14879c787c5;p=jalview.git

diff --git a/src/jalview/gui/AssociatePdbFileWithSeq.java b/src/jalview/gui/AssociatePdbFileWithSeq.java
index f0cee7c..420e2cb 100644
--- a/src/jalview/gui/AssociatePdbFileWithSeq.java
+++ b/src/jalview/gui/AssociatePdbFileWithSeq.java
@@ -23,12 +23,12 @@ package jalview.gui;
 import jalview.api.StructureSelectionManagerProvider;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
+import jalview.io.DataSourceType;
 import jalview.io.StructureFile;
+import jalview.structure.StructureImportSettings.TFType;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
 
-import javax.swing.JOptionPane;
-
 /**
  * GUI related routines for associating PDB files with sequences
  * 
@@ -44,15 +44,24 @@ public class AssociatePdbFileWithSeq
    * @param choice
    * @param sequence
    */
-  public PDBEntry associatePdbWithSeq(String choice, String protocol,
+  public PDBEntry associatePdbWithSeq(String choice, DataSourceType file,
           SequenceI sequence, boolean prompt,
           StructureSelectionManagerProvider ssmp)
   {
+    return associatePdbWithSeq(choice, file, sequence, prompt, ssmp,
+            TFType.DEFAULT, null);
+  }
+
+  public PDBEntry associatePdbWithSeq(String choice, DataSourceType file,
+          SequenceI sequence, boolean prompt,
+          StructureSelectionManagerProvider ssmp, TFType tft,
+          String paeFilename)
+  {
     PDBEntry entry = new PDBEntry();
-    StructureFile pdbfile = null;
-    pdbfile = StructureSelectionManager.getStructureSelectionManager(ssmp)
-            .setMapping(false, new SequenceI[] { sequence }, null, choice,
-                    protocol);
+    StructureFile pdbfile = StructureSelectionManager
+            .getStructureSelectionManager(ssmp)
+            .setMapping(false, new SequenceI[]
+            { sequence }, null, choice, file, tft, paeFilename);
     if (pdbfile == null)
     {
       // stacktrace already thrown so just return
@@ -89,7 +98,12 @@ public class AssociatePdbFileWithSeq
       sequence.getDatasetSequence().addPDBId(entry);
       StructureSelectionManager.getStructureSelectionManager(ssmp)
               .registerPDBEntry(entry);
+      entry.setStructureFile(pdbfile);
     }
+    if (tft != null)
+      entry.setProperty("TFType", tft.name());
+    if (paeFilename != null)
+      entry.setProperty("PAEFile", paeFilename);
     return entry;
   }
 }