X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FChimeraViewFrame.java;fp=src%2Fjalview%2Fgui%2FChimeraViewFrame.java;h=4c38898604f817da581651a6f72f796f3a88c758;hb=5965127c38ff1a35d10d806c4b4537cdc1e39579;hp=e76f11e73c0e33bbac4ea0d2fd56ea01a6b9bd90;hpb=7d8f40032746ee633dd980d5609c4d517a40421a;p=jalview.git diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index e76f11e..4c38898 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -29,7 +29,7 @@ import jalview.datamodel.SequenceI; import jalview.ext.rbvi.chimera.ChimeraCommands; import jalview.ext.rbvi.chimera.JalviewChimeraBinding; import jalview.gui.StructureViewer.ViewerType; -import jalview.io.AppletFormatAdapter; +import jalview.io.DataSourceType; import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; import jalview.io.StructureFile; @@ -469,10 +469,10 @@ public class ChimeraViewFrame extends StructureViewerBase if (!jmb.launchChimera()) { - JOptionPane.showMessageDialog(Desktop.desktop, + JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager.getString("label.chimera_failed"), MessageManager.getString("label.error_loading_file"), - JOptionPane.ERROR_MESSAGE); + JvOptionPane.ERROR_MESSAGE); this.dispose(); return; } @@ -586,18 +586,18 @@ public class ChimeraViewFrame extends StructureViewerBase "label.confirm_close_chimera", new Object[] { jmb.getViewerTitle("Chimera", false) }); prompt = JvSwingUtils.wrapTooltip(true, prompt); - int confirm = JOptionPane.showConfirmDialog(this, prompt, + int confirm = JvOptionPane.showConfirmDialog(this, prompt, MessageManager.getString("label.close_viewer"), - JOptionPane.YES_NO_CANCEL_OPTION); + JvOptionPane.YES_NO_CANCEL_OPTION); /* * abort closure if user hits escape or Cancel */ - if (confirm == JOptionPane.CANCEL_OPTION - || confirm == JOptionPane.CLOSED_OPTION) + if (confirm == JvOptionPane.CANCEL_OPTION + || confirm == JvOptionPane.CLOSED_OPTION) { return; } - closeChimera = confirm == JOptionPane.YES_OPTION; + closeChimera = confirm == JvOptionPane.YES_OPTION; } jmb.closeViewer(closeChimera); } @@ -686,11 +686,11 @@ public class ChimeraViewFrame extends StructureViewerBase if (errormsgs.length() > 0) { - JOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager + JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager .formatMessage("label.pdb_entries_couldnt_be_retrieved", new Object[] { errormsgs.toString() }), MessageManager.getString("label.couldnt_load_file"), - JOptionPane.ERROR_MESSAGE); + JvOptionPane.ERROR_MESSAGE); } if (files.length() > 0) @@ -721,12 +721,12 @@ public class ChimeraViewFrame extends StructureViewerBase jmb.openFile(pe); jmb.addSequence(pos, jmb.getSequence()[pos]); File fl = new File(pe.getFile()); - String protocol = AppletFormatAdapter.URL; + DataSourceType protocol = DataSourceType.URL; try { if (fl.exists()) { - protocol = AppletFormatAdapter.FILE; + protocol = DataSourceType.FILE; } } catch (Throwable e) {