private int myHeight = 150;
- private JMenuItem writeFeatures=null;
+ private JMenuItem writeFeatures = null;
- private JMenu fetchAttributes=null;
-/**
+ private JMenu fetchAttributes = null;
+
+ /**
* Initialise menu options.
*/
@Override
writeFeatures = new JMenuItem(
MessageManager.getString("label.create_viewer_attributes"));
- writeFeatures.setToolTipText(MessageManager
- .getString("label.create_viewer_attributes_tip"));
+ writeFeatures.setToolTipText(
+ MessageManager.getString("label.create_viewer_attributes_tip"));
writeFeatures.addActionListener(new ActionListener()
{
@Override
});
viewerActionMenu.add(writeFeatures);
- fetchAttributes = new JMenu(
- MessageManager.formatMessage("label.fetch_viewer_attributes",getViewerName()));
- fetchAttributes.setToolTipText(
- MessageManager.formatMessage("label.fetch_viewer_attributes_tip",getViewerName()));
+ fetchAttributes = new JMenu(MessageManager.formatMessage(
+ "label.fetch_viewer_attributes", getViewerName()));
+ fetchAttributes.setToolTipText(MessageManager.formatMessage(
+ "label.fetch_viewer_attributes_tip", getViewerName()));
fetchAttributes.addMouseListener(new MouseAdapter()
{
});
viewerActionMenu.add(fetchAttributes);
}
+
@Override
protected void buildActionMenu()
{
// add these back in after menu is refreshed
viewerActionMenu.add(writeFeatures);
viewerActionMenu.add(fetchAttributes);
-
+
};
+
/**
* Query the structure viewer for its residue attribute names and add them as
* items off the attributes menu
{
// todo pull up?
int count = jmb.sendFeaturesToViewer(getAlignmentPanel());
- statusBar.setText(
- MessageManager.formatMessage("label.attributes_set", count, getViewerName()));
+ statusBar.setText(MessageManager.formatMessage("label.attributes_set",
+ count, getViewerName()));
}
/**
* @param ap
*/
public ChimeraViewFrame(PDBEntry[] pe, boolean alignAdded,
- SequenceI[][] seqs,
- AlignmentPanel ap)
+ SequenceI[][] seqs, AlignmentPanel ap)
{
this();
setAlignAddedStructures(alignAdded);
getViewerName()),
MessageManager.getString("label.error_loading_file"),
JvOptionPane.ERROR_MESSAGE);
+ jmb.closeViewer(true);
this.dispose();
return;
}
boolean opened = jmb.openSession(chimeraSessionFile);
if (!opened)
{
- System.err.println("An error occurred opening Chimera session file "
- + chimeraSessionFile);
+ jalview.bin.Console.errPrintln(
+ "An error occurred opening Chimera session file "
+ + chimeraSessionFile);
}
}
Console.error("Couldn't open Chimera viewer!", ex);
}
}
+ if (!jmb.isViewerRunning())
+ {
+ // nothing to do
+ // TODO: ensure we tidy up JAL-3619
+ return;
+ }
int num = -1;
for (PDBEntry pe : filePDB)
{