userColourSchemes = UserDefinedColours
+ .getUserColourSchemes();
+ if (userColourSchemes != null)
{
- java.util.Enumeration userColours = jalview.gui.UserDefinedColours.
- getUserColourSchemes().keys();
-
- while (userColours.hasMoreElements())
+ for (String userColour : userColourSchemes.keySet())
{
final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
- userColours.
- nextElement().toString());
+ userColour);
radioItem.setName("USER_DEFINED");
radioItem.addMouseListener(new MouseAdapter()
{
+ @Override
public void mousePressed(MouseEvent evt)
{
- if (evt.isControlDown() || SwingUtilities.isRightMouseButton(evt))
+ if (evt.isPopupTrigger()) // Mac
{
- radioItem.removeActionListener(radioItem.getActionListeners()[0]);
-
- int option = JOptionPane.showInternalConfirmDialog(jalview.gui.
- Desktop.desktop,
- "Remove from default list?",
- "Remove user defined colour",
- JOptionPane.YES_NO_OPTION);
- if (option == JOptionPane.YES_OPTION)
- {
- jalview.gui.UserDefinedColours.removeColourFromDefaults(
- radioItem.getText());
- coloursMenu.remove(radioItem);
- }
- else
+ offerRemoval(radioItem);
+ }
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent evt)
+ {
+ if (evt.isPopupTrigger()) // Windows
+ {
+ offerRemoval(radioItem);
+ }
+ }
+
+ /**
+ * @param radioItem
+ */
+ void offerRemoval(final JRadioButtonMenuItem radioItem)
+ {
+ radioItem.removeActionListener(radioItem.getActionListeners()[0]);
+
+ int option = JvOptionPane.showInternalConfirmDialog(
+ jalview.gui.Desktop.desktop, MessageManager
+ .getString("label.remove_from_default_list"),
+ MessageManager
+ .getString("label.remove_user_defined_colour"),
+ JvOptionPane.YES_NO_OPTION);
+ if (option == JvOptionPane.YES_OPTION)
+ {
+ jalview.gui.UserDefinedColours
+ .removeColourFromDefaults(radioItem.getText());
+ coloursMenu.remove(radioItem);
+ }
+ else
+ {
+ radioItem.addActionListener(new ActionListener()
{
- radioItem.addActionListener(new ActionListener()
+ @Override
+ public void actionPerformed(ActionEvent evt)
{
- public void actionPerformed(ActionEvent evt)
- {
- user_actionPerformed(evt);
- }
- });
- }
+ user_actionPerformed(evt);
+ }
+ });
}
}
});
radioItem.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent evt)
{
user_actionPerformed(evt);
@@ -411,74 +488,102 @@ public class PDBViewer
}
JMenuBar jMenuBar1 = new JMenuBar();
+
JMenu fileMenu = new JMenu();
+
JMenu coloursMenu = new JMenu();
+
JMenu saveMenu = new JMenu();
+
JMenuItem png = new JMenuItem();
+
JMenuItem eps = new JMenuItem();
+
JMenuItem mapping = new JMenuItem();
+
JCheckBoxMenuItem wire = new JCheckBoxMenuItem();
+
JCheckBoxMenuItem depth = new JCheckBoxMenuItem();
+
JCheckBoxMenuItem zbuffer = new JCheckBoxMenuItem();
+
JCheckBoxMenuItem allchains = new JCheckBoxMenuItem();
JRadioButtonMenuItem charge = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem chain = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem seqButton = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem hydro = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem taylor = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem zappo = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem user = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem buried = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem turn = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem strand = new JRadioButtonMenuItem();
+
JRadioButtonMenuItem helix = new JRadioButtonMenuItem();
+
JMenu viewMenu = new JMenu();
+
JMenuItem background = new JMenuItem();
+
JMenuItem savePDB = new JMenuItem();
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void eps_actionPerformed(ActionEvent e)
{
- makePDBImage(jalview.util.ImageMaker.EPS);
+ makePDBImage(jalview.util.ImageMaker.TYPE.EPS);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void png_actionPerformed(ActionEvent e)
{
- makePDBImage(jalview.util.ImageMaker.PNG);
+ makePDBImage(jalview.util.ImageMaker.TYPE.PNG);
}
- void makePDBImage(int type)
+ void makePDBImage(jalview.util.ImageMaker.TYPE type)
{
int width = pdbcanvas.getWidth();
int height = pdbcanvas.getHeight();
jalview.util.ImageMaker im;
- if (type == jalview.util.ImageMaker.PNG)
+ if (type == jalview.util.ImageMaker.TYPE.PNG)
{
im = new jalview.util.ImageMaker(this,
- jalview.util.ImageMaker.PNG,
- "Make PNG image from view",
- width, height,
- null, null);
+ jalview.util.ImageMaker.TYPE.PNG, "Make PNG image from view",
+ width, height, null, null, null, 0, false);
+ }
+ else if (type == jalview.util.ImageMaker.TYPE.EPS)
+ {
+ im = new jalview.util.ImageMaker(this,
+ jalview.util.ImageMaker.TYPE.EPS, "Make EPS file from view",
+ width, height, null, this.getTitle(), null, 0, false);
}
else
{
+
im = new jalview.util.ImageMaker(this,
- jalview.util.ImageMaker.EPS,
- "Make EPS file from view",
- width, height,
- null, this.getTitle());
+ jalview.util.ImageMaker.TYPE.SVG, "Make SVG file from PCA",
+ width, height, null, this.getTitle(), null, 0, false);
}
if (im.getGraphics() != null)
@@ -549,8 +654,17 @@ public class PDBViewer
public void mapping_actionPerformed(ActionEvent e)
{
jalview.gui.CutAndPasteTransfer cap = new jalview.gui.CutAndPasteTransfer();
- Desktop.addInternalFrame(cap, "PDB - Sequence Mapping", 550, 600);
- cap.setText(pdbcanvas.mappingDetails.toString());
+ try
+ {
+ cap.setText(pdbcanvas.mappingDetails.toString());
+ Desktop.addInternalFrame(cap,
+ MessageManager.getString("label.pdb_sequence_mapping"), 550,
+ 600);
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("Opening sequence to structure mapping report", oom);
+ cap.dispose();
+ }
}
public void allchains_itemStateChanged(ItemEvent e)
@@ -558,7 +672,6 @@ public class PDBViewer
pdbcanvas.setAllchainsVisible(allchains.getState());
}
-
public void zappo_actionPerformed(ActionEvent e)
{
pdbcanvas.bysequence = false;
@@ -609,14 +722,15 @@ public class PDBViewer
public void user_actionPerformed(ActionEvent e)
{
- if (e.getActionCommand().equals("User Defined..."))
+ if (e.getActionCommand().equals(
+ MessageManager.getString("action.user_defined")))
{
- // new UserDefinedColours(pdbcanvas, null);
+ // new UserDefinedColours(pdbcanvas, null);
}
else
{
- UserColourScheme udc = (UserColourScheme) UserDefinedColours.
- getUserColourSchemes().get(e.getActionCommand());
+ UserColourScheme udc = UserDefinedColours
+ .getUserColourSchemes().get(e.getActionCommand());
pdbcanvas.pdb.setColours(udc);
pdbcanvas.redrawneeded = true;
@@ -626,9 +740,9 @@ public class PDBViewer
public void background_actionPerformed(ActionEvent e)
{
- java.awt.Color col = JColorChooser.showDialog(this,
- "Select Background Colour",
- pdbcanvas.backgroundColour);
+ Color col = JColorChooser.showDialog(this,
+ MessageManager.getString("label.select_background_colour"),
+ pdbcanvas.backgroundColour);
if (col != null)
{
@@ -641,12 +755,11 @@ public class PDBViewer
public void savePDB_actionPerformed(ActionEvent e)
{
JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty(
- "LAST_DIRECTORY"));
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save PDB File");
- chooser.setToolTipText("Save");
+ chooser.setDialogTitle(MessageManager.getString("label.save_pdb_file"));
+ chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
@@ -659,18 +772,16 @@ public class PDBViewer
PrintWriter out = new PrintWriter(new FileOutputStream(outFile));
String data;
- while ( (data = in.readLine()) != null)
+ while ((data = in.readLine()) != null)
{
- if (
- ! (data.indexOf("") > -1 || data.indexOf("
") > -1)
- )
+ if (!(data.indexOf("") > -1 || data.indexOf("
") > -1))
{
out.println(data);
}
}
out.close();
- }
- catch (Exception ex)
+ in.close();
+ } catch (Exception ex)
{
ex.printStackTrace();
}