X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAssociatePdbFileWithSeq.java;h=fe0aedfc79c99440d6f6d8f5e42c3093d3b859f7;hb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;hp=e2637a95cf603d9eccf2e0377beb1bc6d36fa31e;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git diff --git a/src/jalview/gui/AssociatePdbFileWithSeq.java b/src/jalview/gui/AssociatePdbFileWithSeq.java index e2637a9..fe0aedf 100644 --- a/src/jalview/gui/AssociatePdbFileWithSeq.java +++ b/src/jalview/gui/AssociatePdbFileWithSeq.java @@ -23,6 +23,7 @@ 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.StructureSelectionManager; import jalview.util.MessageManager; @@ -44,15 +45,15 @@ 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) { PDBEntry entry = new PDBEntry(); StructureFile pdbfile = null; pdbfile = StructureSelectionManager.getStructureSelectionManager(ssmp) - .setMapping(false, new SequenceI[] { sequence }, null, choice, - protocol); + .setMapping(false, new SequenceI[] + { sequence }, null, choice, file); if (pdbfile == null) { // stacktrace already thrown so just return @@ -64,11 +65,11 @@ public class AssociatePdbFileWithSeq if (prompt) { - reply = JOptionPane.showInternalInputDialog(Desktop.desktop, + reply = JvOptionPane.showInternalInputDialog(Desktop.desktop, MessageManager .getString("label.couldnt_find_pdb_id_in_file"), MessageManager.getString("label.no_pdb_id_in_file"), - JOptionPane.QUESTION_MESSAGE); + JvOptionPane.QUESTION_MESSAGE); } if (reply == null) {