X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureViewerBase.java;h=91d71309c7c57ff198eb650efd0310aed15ab70a;hb=483e7163b1fb8d4bcb9393014816c944befce328;hp=800d525ab160e6267a5692c48bb726a34496e09b;hpb=70f62620b5f6158be5cd42560d549b2ea4e20c52;p=jalview.git diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java index 800d525..91d7130 100644 --- a/src/jalview/gui/StructureViewerBase.java +++ b/src/jalview/gui/StructureViewerBase.java @@ -336,17 +336,17 @@ public abstract class StructureViewerBase extends GStructureViewer * * @param pdbId * @param view - * @return YES, NO or CANCEL JOptionPane code + * @return YES, NO or CANCEL JvOptionPane code */ protected int chooseAlignStructureToViewer(String pdbId, StructureViewerBase view) { - int option = JOptionPane.showInternalConfirmDialog(Desktop.desktop, + int option = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, MessageManager.formatMessage("label.add_pdbentry_to_view", new Object[] { pdbId, view.getTitle() }), MessageManager .getString("label.align_to_existing_structure_view"), - JOptionPane.YES_NO_CANCEL_OPTION); + JvOptionPane.YES_NO_CANCEL_OPTION); return option; } @@ -381,11 +381,11 @@ public abstract class StructureViewerBase extends GStructureViewer continue; } int option = chooseAlignStructureToViewer(pdbId, view); - if (option == JOptionPane.CANCEL_OPTION) + if (option == JvOptionPane.CANCEL_OPTION) { return true; } - else if (option == JOptionPane.YES_OPTION) + else if (option == JvOptionPane.YES_OPTION) { view.useAlignmentPanelForSuperposition(apanel); view.addStructure(pdbentry, seq, chains, true, apanel.alignFrame); @@ -481,19 +481,19 @@ public abstract class StructureViewerBase extends GStructureViewer /* * the PDB file is already loaded */ - int option = JOptionPane.showInternalConfirmDialog(Desktop.desktop, + int option = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, MessageManager.formatMessage( "label.pdb_entry_is_already_displayed", new Object[] { pdbId }), MessageManager .formatMessage( "label.map_sequences_to_visible_window", new Object[] { pdbId }), - JOptionPane.YES_NO_CANCEL_OPTION); - if (option == JOptionPane.CANCEL_OPTION) + JvOptionPane.YES_NO_CANCEL_OPTION); + if (option == JvOptionPane.CANCEL_OPTION) { finished = true; } - else if (option == JOptionPane.YES_OPTION) + else if (option == JvOptionPane.YES_OPTION) { addSequenceMappingsToStructure(seq, chains, apanel, alreadyMapped); finished = true;