From: amwaterhouse Date: Thu, 1 Feb 2007 12:36:22 +0000 (+0000) Subject: One class for edit name/description X-Git-Tag: Release_2_3~399 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6f707193c7997803f7e7ae9d17359e6e32b4a7e4;p=jalview.git One class for edit name/description --- diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 5e48190..0d4e3e1 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -32,6 +32,7 @@ public class APopupMenu extends java.awt.PopupMenu implements ActionListener, ItemListener { Menu groupMenu = new Menu(); + MenuItem editGroupName = new MenuItem(); protected MenuItem clustalColour = new MenuItem(); protected MenuItem zappoColour = new MenuItem(); protected MenuItem taylorColour = new MenuItem(); @@ -71,10 +72,6 @@ public class APopupMenu MenuItem revealAll = new MenuItem(); Menu menu1 = new Menu(); - Dialog editNameDialog; - Button okDialog = new Button("Accept"); - Button cancelDialog = new Button("Cancel"); - public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links) { /////////////////////////////////////////////////////////// @@ -108,6 +105,7 @@ public class APopupMenu if (sg != null && sg.getSize()>0) { + editGroupName.setLabel(sg.getName()); showText.setState(sg.getDisplayText()); showColourText.setState(sg.getColourText()); showBoxes.setState(sg.getDisplayBoxes()); @@ -225,12 +223,6 @@ public class APopupMenu else if(source == sequenceName) editName(); - else if (source==okDialog || source==cancelDialog) - { - editNameDialog.setVisible(false); - if(source==cancelDialog) - editNameDialog = null; - } else if(source == pdb) addPDB(); else if(source == hideSeqs) @@ -242,6 +234,24 @@ public class APopupMenu ap.av.showAllHiddenSeqs(); } + else if(source==editGroupName) + { + EditNameDialog dialog = new EditNameDialog( + getGroup().getName(), + getGroup().getDescription(), + " Group Name", + "Group Description", + ap, + "Edit Group Name / Description"); + + if (dialog.accept) + { + + getGroup().setName(dialog.getName().replace(' ', '_')); + getGroup().setDescription(dialog.getDescription()); + } + + } else if(source==copy) ap.alignFrame.copy_actionPerformed(); else if(source==cut) @@ -342,43 +352,18 @@ public class APopupMenu void editName() { - TextField id = new TextField(seq.getName(), 40); - TextField description = new TextField(seq.getDescription(), 40); - Panel panel = new Panel(new BorderLayout()); - Panel panel2 = new Panel(new BorderLayout()); - panel2.add(new Label(" Sequence Name "), BorderLayout.WEST); - panel2.add(id, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.NORTH); - panel2 = new Panel(new BorderLayout()); - panel2.add(new Label("Sequence Description "), BorderLayout.WEST); - panel2.add(description, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.CENTER); - - panel2 = new Panel(new FlowLayout()); - - panel2.add(okDialog); - panel2.add(cancelDialog); - - panel.add(panel2, BorderLayout.SOUTH); - - editNameDialog = new Dialog(ap.alignFrame, - "Edit Sequence Name / Description", - true); - - editNameDialog.add(panel, BorderLayout.NORTH); - - editNameDialog.setBounds(ap.alignFrame.getBounds().x - +(ap.alignFrame.getSize().width-500)/2 , - ap.alignFrame.getBounds().y - +(ap.alignFrame.getSize().height-120)/2, - 500, 130); - - editNameDialog.show(); - - if (editNameDialog != null) + EditNameDialog dialog = new EditNameDialog( + seq.getName(), + seq.getDescription(), + " Sequence Name ", + "Sequence Description ", + ap, + "Edit Sequence Name / Description"); + + if (dialog.accept) { - seq.setName(id.getText()); - seq.setDescription(description.getText()); + seq.setName(dialog.getName()); + seq.setDescription(dialog.getDescription()); ap.repaint(); } } @@ -399,6 +384,7 @@ public class APopupMenu groupMenu.setLabel("Group"); groupMenu.setLabel("Selection"); + editGroupName.addActionListener(this); unGroupMenuItem.setLabel("Remove Group"); unGroupMenuItem.addActionListener(this); @@ -427,6 +413,7 @@ public class APopupMenu this.add(seqMenu); this.add(hideSeqs); this.add(revealAll); + groupMenu.add(editGroupName); groupMenu.add(editMenu); groupMenu.add(outputmenu); groupMenu.add(menu1); @@ -498,9 +485,6 @@ public class APopupMenu hideSeqs.addActionListener(this); repGroup.addActionListener(this); revealAll.addActionListener(this); - okDialog.addActionListener(this); - cancelDialog.addActionListener(this); - } void refresh() diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index 0935500..7bf438f 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -46,11 +46,6 @@ public class AnnotationLabels Tooltip tooltip; - Dialog editNameDialog; - Button okDialog = new Button("Accept"); - Button cancelDialog = new Button("Cancel"); - - public AnnotationLabels(AlignmentPanel ap) { this.ap = ap; @@ -58,8 +53,6 @@ public class AnnotationLabels setLayout(null); addMouseListener(this); addMouseMotionListener(this); - okDialog.addActionListener(this); - cancelDialog.addActionListener(this); } public AnnotationLabels(AlignViewport av) @@ -105,57 +98,25 @@ public class AnnotationLabels if(evt.getActionCommand().equals(EDITNAME)) { - TextField id = new TextField(aa[selectedRow].label, 40); - TextField description = new TextField(aa[selectedRow].description, 40); - Panel panel = new Panel(new BorderLayout()); - Panel panel2 = new Panel(new BorderLayout()); - panel2.add(new Label(" Annotation Label "), BorderLayout.WEST); - panel2.add(id, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.NORTH); - panel2 = new Panel(new BorderLayout()); - panel2.add(new Label("Annotation Description "), BorderLayout.WEST); - panel2.add(description, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.CENTER); - - panel2 = new Panel(new FlowLayout()); - - panel2.add(okDialog); - panel2.add(cancelDialog); - - panel.add(panel2, BorderLayout.SOUTH); - - editNameDialog = new Dialog(ap.alignFrame, - "Edit Annotation Name / Description", - true); - - editNameDialog.add(panel, BorderLayout.NORTH); - - editNameDialog.setBounds(ap.alignFrame.getBounds().x - +(ap.alignFrame.getSize().width-500)/2 , - ap.alignFrame.getBounds().y - +(ap.alignFrame.getSize().height-120)/2, - 500, 130); - - editNameDialog.show(); - - if (editNameDialog != null) + EditNameDialog dialog = new EditNameDialog( + aa[selectedRow].label, + aa[selectedRow].description, + " Annotation Label", + "Annotation Description", + ap, + "Edit Annotation Name / Description"); + + if (dialog.accept) { - aa[selectedRow].label=id.getText(); - aa[selectedRow].description=description.getText(); + aa[selectedRow].label = dialog.getName(); + aa[selectedRow].description = dialog.getDescription(); repaint(); } - } if (evt.getActionCommand().equals(HIDE)) { aa[selectedRow].visible = false; } - else if (evt.getSource() == okDialog || evt.getSource() == cancelDialog) - { - editNameDialog.setVisible(false); - if (evt.getSource() == cancelDialog) - editNameDialog = null; - } else if (evt.getActionCommand().equals(SHOWALL)) { for (int i = 0; i < aa.length; i++) @@ -200,9 +161,6 @@ public class AnnotationLabels else tooltip.setTip(ap.av.alignment. getAlignmentAnnotation()[selectedRow].description); - - tooltip.repaint(); - } else if (tooltip != null) { diff --git a/src/jalview/appletgui/EditNameDialog.java b/src/jalview/appletgui/EditNameDialog.java new file mode 100644 index 0000000..b80aca7 --- /dev/null +++ b/src/jalview/appletgui/EditNameDialog.java @@ -0,0 +1,93 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer + * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package jalview.appletgui; + +import java.awt.*; +import java.awt.event.*; + +public class EditNameDialog extends Dialog implements ActionListener +{ + TextField id, description; + Button ok = new Button("Accept"); + Button cancel = new Button("Cancel"); + boolean accept = false; + + public String getName() + { + return id.getText(); + } + + public String getDescription() + { + if (description.getText().length() < 1) + return null; + else + return description.getText(); + } + + public EditNameDialog(String name, + String desc, + String label1, + String label2, + AlignmentPanel ap, + String title) + { + super(ap.alignFrame, title, true); + + id = new TextField(name, 40); + description = new TextField(desc, 40); + Panel panel = new Panel(new BorderLayout()); + Panel panel2 = new Panel(new BorderLayout()); + panel2.add(new Label(label1), BorderLayout.WEST); + panel2.add(id, BorderLayout.CENTER); + panel.add(panel2, BorderLayout.NORTH); + panel2 = new Panel(new BorderLayout()); + panel2.add(new Label(label2), BorderLayout.WEST); + panel2.add(description, BorderLayout.CENTER); + panel.add(panel2, BorderLayout.CENTER); + + panel2 = new Panel(new FlowLayout()); + + panel2.add(ok); + panel2.add(cancel); + ok.addActionListener(this); + cancel.addActionListener(this); + + panel.add(panel2, BorderLayout.SOUTH); + + add(panel, BorderLayout.NORTH); + + setBounds(ap.alignFrame.getBounds().x + + (ap.alignFrame.getSize().width - 500) / 2, + ap.alignFrame.getBounds().y + + (ap.alignFrame.getSize().height - 120) / 2, + 500, 130); + + show(); + } + + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==ok) + accept = true; + + setVisible(false); + } +} diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index a454cf9..e4c074b 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -226,37 +226,20 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ boolean editLabelDescription(AlignmentAnnotation annotation) { - JLabel idlabel = new JLabel( " Annotation Label "); - JLabel desclabel = new JLabel("Annotation Description "); - idlabel.setFont(new Font("Courier", Font.PLAIN, 12)); - desclabel.setFont(new Font("Courier", Font.PLAIN, 12)); - JTextField id = new JTextField(annotation.label, 40); - JTextField description = new JTextField(annotation.description, 40); - JPanel panel = new JPanel(new BorderLayout()); - JPanel panel2 = new JPanel(new BorderLayout()); - panel2.add(idlabel, BorderLayout.WEST); - panel2.add(id, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.NORTH); - panel2 = new JPanel(new BorderLayout()); - panel2.add(desclabel, BorderLayout.WEST); - panel2.add(description, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.SOUTH); - - - int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop, - panel, "Edit Annotation Name/Description", - JOptionPane.OK_CANCEL_OPTION ); - - - if (reply != JOptionPane.OK_OPTION ) - { - return false; - } + EditNameDialog dialog = new EditNameDialog(annotation.label, + annotation.description, + " Annotation Name ", + "Annotation Description ", + "Edit Annotation Name/Description"); + if (!dialog.accept) + { + return false; + } - annotation.label = id.getText().trim(); + annotation.label = dialog.getName(); - String text = description.getText().trim(); + String text = dialog.getDescription(); if(text.length()==0) text = null; annotation.description = text; diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java new file mode 100644 index 0000000..2b1ee72 --- /dev/null +++ b/src/jalview/gui/EditNameDialog.java @@ -0,0 +1,78 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer + * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package jalview.gui; + +import java.awt.*; +import javax.swing.*; + +public class EditNameDialog +{ + JTextField id, description; + JButton ok = new JButton("Accept"); + JButton cancel = new JButton("Cancel"); + boolean accept = false; + + + public String getName() + { + return id.getText(); + } + + public String getDescription() + { + if (description.getText().length() < 1) + return null; + else + return description.getText(); + } + + public EditNameDialog(String name, + String desc, + String label1, + String label2, + String title) + { + JLabel idlabel = new JLabel( label1); + JLabel desclabel = new JLabel(label2); + idlabel.setFont(new Font("Courier", Font.PLAIN, 12)); + desclabel.setFont(new Font("Courier", Font.PLAIN, 12)); + id = new JTextField(name, 40); + description = new JTextField(desc, 40); + JPanel panel = new JPanel(new BorderLayout()); + JPanel panel2 = new JPanel(new BorderLayout()); + panel2.add(idlabel, BorderLayout.WEST); + panel2.add(id, BorderLayout.CENTER); + panel.add(panel2, BorderLayout.NORTH); + panel2 = new JPanel(new BorderLayout()); + panel2.add(desclabel, BorderLayout.WEST); + panel2.add(description, BorderLayout.CENTER); + panel.add(panel2, BorderLayout.SOUTH); + + + int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop, + panel, title, + JOptionPane.OK_CANCEL_OPTION ); + + if (reply == JOptionPane.OK_OPTION) + { + accept = true; + } + } +} diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index 9ed81ab..9ee8e2b 100755 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -372,7 +372,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - groupName_actionPerformed(e); + groupName_actionPerformed(); } }); sequenceMenu.setText("Sequence"); @@ -381,7 +381,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - sequenceName_actionPerformed(e); + sequenceName_actionPerformed(); } }); PIDColour.setFocusPainted(false); @@ -390,7 +390,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - unGroupMenuItem_actionPerformed(e); + unGroupMenuItem_actionPerformed(); } }); @@ -399,7 +399,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - outline_actionPerformed(e); + outline_actionPerformed(); } }); nucleotideMenuItem.setText("Nucleotide"); @@ -407,7 +407,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - nucleotideMenuItem_actionPerformed(e); + nucleotideMenuItem_actionPerformed(); } }); colourMenu.setText("Group Colour"); @@ -417,7 +417,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - showBoxes_actionPerformed(e); + showBoxes_actionPerformed(); } }); showText.setText("Text"); @@ -426,7 +426,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - showText_actionPerformed(e); + showText_actionPerformed(); } }); showColourText.setText("Colour Text"); @@ -434,7 +434,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - showColourText_actionPerformed(e); + showColourText_actionPerformed(); } }); editMenu.setText("Edit"); @@ -443,7 +443,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - cut_actionPerformed(e); + cut_actionPerformed(); } }); upperCase.setText("To Upper Case"); @@ -459,7 +459,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - copy_actionPerformed(e); + copy_actionPerformed(); } }); lowerCase.setText("To Lower Case"); @@ -484,7 +484,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - pdbFromFile_actionPerformed(e); + pdbFromFile_actionPerformed(); } }); enterPDB.setText("Enter PDB Id"); @@ -492,7 +492,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - enterPDB_actionPerformed(e); + enterPDB_actionPerformed(); } }); discoverPDB.setText("Discover PDB ids"); @@ -500,7 +500,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - discoverPDB_actionPerformed(e); + discoverPDB_actionPerformed(); } }); outputMenu.setText("Output to Textbox..."); @@ -509,7 +509,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - sequenceFeature_actionPerformed(e); + sequenceFeature_actionPerformed(); } }); textColour.setText("Text Colour"); @@ -517,7 +517,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - textColour_actionPerformed(e); + textColour_actionPerformed(); } }); jMenu1.setText("Group"); @@ -589,7 +589,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - noColourmenuItem_actionPerformed(e); + noColourmenuItem_actionPerformed(); } }); @@ -598,7 +598,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - clustalColour_actionPerformed(e); + clustalColour_actionPerformed(); } }); zappoColour.setText("Zappo"); @@ -606,7 +606,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - zappoColour_actionPerformed(e); + zappoColour_actionPerformed(); } }); taylorColour.setText("Taylor"); @@ -614,7 +614,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - taylorColour_actionPerformed(e); + taylorColour_actionPerformed(); } }); hydrophobicityColour.setText("Hydrophobicity"); @@ -622,7 +622,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - hydrophobicityColour_actionPerformed(e); + hydrophobicityColour_actionPerformed(); } }); helixColour.setText("Helix propensity"); @@ -630,7 +630,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - helixColour_actionPerformed(e); + helixColour_actionPerformed(); } }); strandColour.setText("Strand propensity"); @@ -638,7 +638,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - strandColour_actionPerformed(e); + strandColour_actionPerformed(); } }); turnColour.setText("Turn propensity"); @@ -646,7 +646,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - turnColour_actionPerformed(e); + turnColour_actionPerformed(); } }); buriedColour.setText("Buried Index"); @@ -654,7 +654,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - buriedColour_actionPerformed(e); + buriedColour_actionPerformed(); } }); abovePIDColour.setText("Above % Identity"); @@ -662,7 +662,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - abovePIDColour_actionPerformed(e); + abovePIDColour_actionPerformed(); } }); userDefinedColour.setText("User Defined..."); @@ -678,7 +678,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - PIDColour_actionPerformed(e); + PIDColour_actionPerformed(); } }); BLOSUM62Colour.setText("BLOSUM62"); @@ -686,7 +686,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - BLOSUM62Colour_actionPerformed(e); + BLOSUM62Colour_actionPerformed(); } }); conservationMenuItem.setText("Conservation"); @@ -694,7 +694,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - conservationMenuItem_actionPerformed(e); + conservationMenuItem_actionPerformed(); } }); } @@ -715,7 +715,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void clustalColour_actionPerformed(ActionEvent e) + protected void clustalColour_actionPerformed() { SequenceGroup sg = getGroup(); sg.cs = new ClustalxColourScheme(sg.getSequences(ap.av.hiddenRepSequences), @@ -728,7 +728,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void zappoColour_actionPerformed(ActionEvent e) + protected void zappoColour_actionPerformed() { getGroup().cs = new ZappoColourScheme(); refresh(); @@ -739,7 +739,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void taylorColour_actionPerformed(ActionEvent e) + protected void taylorColour_actionPerformed() { getGroup().cs = new TaylorColourScheme(); refresh(); @@ -750,7 +750,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void hydrophobicityColour_actionPerformed(ActionEvent e) + protected void hydrophobicityColour_actionPerformed() { getGroup().cs = new HydrophobicColourScheme(); refresh(); @@ -761,7 +761,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void helixColour_actionPerformed(ActionEvent e) + protected void helixColour_actionPerformed() { getGroup().cs = new HelixColourScheme(); refresh(); @@ -772,7 +772,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void strandColour_actionPerformed(ActionEvent e) + protected void strandColour_actionPerformed() { getGroup().cs = new StrandColourScheme(); refresh(); @@ -783,7 +783,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void turnColour_actionPerformed(ActionEvent e) + protected void turnColour_actionPerformed() { getGroup().cs = new TurnColourScheme(); refresh(); @@ -794,7 +794,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void buriedColour_actionPerformed(ActionEvent e) + protected void buriedColour_actionPerformed() { getGroup().cs = new BuriedColourScheme(); refresh(); @@ -805,7 +805,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - public void nucleotideMenuItem_actionPerformed(ActionEvent e) + public void nucleotideMenuItem_actionPerformed() { getGroup().cs = new NucleotideColourScheme(); refresh(); @@ -816,7 +816,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void abovePIDColour_actionPerformed(ActionEvent e) + protected void abovePIDColour_actionPerformed() { SequenceGroup sg = getGroup(); if(sg.cs==null) @@ -868,7 +868,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void PIDColour_actionPerformed(ActionEvent e) + protected void PIDColour_actionPerformed() { SequenceGroup sg = getGroup(); sg.cs = new PIDColourScheme(); @@ -883,7 +883,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void BLOSUM62Colour_actionPerformed(ActionEvent e) + protected void BLOSUM62Colour_actionPerformed() { SequenceGroup sg = getGroup(); @@ -901,7 +901,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void noColourmenuItem_actionPerformed(ActionEvent e) + protected void noColourmenuItem_actionPerformed() { getGroup().cs = null; refresh(); @@ -912,7 +912,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void conservationMenuItem_actionPerformed(ActionEvent e) + protected void conservationMenuItem_actionPerformed() { SequenceGroup sg = getGroup(); if(sg.cs==null) @@ -947,20 +947,23 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void groupName_actionPerformed(ActionEvent e) + protected void groupName_actionPerformed() { - SequenceGroup sg = getGroup(); - String reply = JOptionPane.showInternalInputDialog(Desktop.desktop, - "Enter new group name", "Edit group name", - JOptionPane.QUESTION_MESSAGE); - if (reply == null) - { - return; - } + SequenceGroup sg = getGroup(); + EditNameDialog dialog = new EditNameDialog(sg.getName(), + sg.getDescription(), + " Group Name ", + "Group Description ", + "Edit Group Name/Description"); + + if (!dialog.accept) + { + return; + } - sg.setName(reply); - groupName.setText(reply); + sg.setName(dialog.getName()); + groupName.setText(dialog.getDescription()); } @@ -984,40 +987,22 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - void sequenceName_actionPerformed(ActionEvent e) + void sequenceName_actionPerformed() { - JLabel idlabel = new JLabel( " Sequence Name "); - JLabel desclabel = new JLabel("Sequence Description "); - idlabel.setFont(new Font("Courier", Font.PLAIN, 12)); - desclabel.setFont(new Font("Courier", Font.PLAIN, 12)); - JTextField id = new JTextField(sequence.getName(), 40); - JTextField description = new JTextField(sequence.getDescription(), 40); - JPanel panel = new JPanel(new BorderLayout()); - JPanel panel2 = new JPanel(new BorderLayout()); - panel2.add(idlabel, BorderLayout.WEST); - panel2.add(id, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.NORTH); - panel2 = new JPanel(new BorderLayout()); - panel2.add(desclabel, BorderLayout.WEST); - panel2.add(description, BorderLayout.CENTER); - panel.add(panel2, BorderLayout.SOUTH); - - - int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop, - panel, "Edit Sequence Name/Description", - JOptionPane.OK_CANCEL_OPTION ); - - - if (reply != JOptionPane.OK_OPTION ) + EditNameDialog dialog = new EditNameDialog(sequence.getName(), + sequence.getDescription(), + " Sequence Name ", + "Sequence Description ", + "Edit Sequence Name/Description"); + + if (!dialog.accept) { return; } - String s = id.getText(); - - if (s != null) + if (dialog.getName() != null) { - if (s.indexOf(" ") > -1) + if (dialog.getName().indexOf(" ") > -1) { JOptionPane.showMessageDialog(ap, "Spaces have been converted to \"_\"", @@ -1025,12 +1010,11 @@ public class PopupMenu extends JPopupMenu JOptionPane.WARNING_MESSAGE); } - s = s.replace(' ', '_'); - sequence.setName(s); + sequence.setName(dialog.getName().replace(' ', '_')); ap.repaint(); } - sequence.setDescription(description.getText()); + sequence.setDescription(dialog.getDescription()); ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences()); @@ -1042,7 +1026,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - void unGroupMenuItem_actionPerformed(ActionEvent e) + void unGroupMenuItem_actionPerformed() { SequenceGroup sg = ap.av.getSelectionGroup(); ap.av.alignment.deleteGroup(sg); @@ -1056,7 +1040,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - protected void outline_actionPerformed(ActionEvent e) + protected void outline_actionPerformed() { SequenceGroup sg = getGroup(); Color col = JColorChooser.showDialog(this, "Select Outline Colour", @@ -1075,7 +1059,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - public void showBoxes_actionPerformed(ActionEvent e) + public void showBoxes_actionPerformed() { getGroup().setDisplayBoxes(showBoxes.isSelected()); refresh(); @@ -1086,7 +1070,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - public void showText_actionPerformed(ActionEvent e) + public void showText_actionPerformed() { getGroup().setDisplayText(showText.isSelected()); refresh(); @@ -1097,7 +1081,7 @@ public class PopupMenu extends JPopupMenu * * @param e DOCUMENT ME! */ - public void showColourText_actionPerformed(ActionEvent e) + public void showColourText_actionPerformed() { getGroup().setColourText(showColourText.isSelected()); refresh(); @@ -1153,12 +1137,12 @@ public class PopupMenu extends JPopupMenu ap.av.hideSequence(hseqs); } - public void copy_actionPerformed(ActionEvent e) + public void copy_actionPerformed() { ap.alignFrame.copy_actionPerformed(null); } - public void cut_actionPerformed(ActionEvent e) + public void cut_actionPerformed() { ap.alignFrame.cut_actionPerformed(null); } @@ -1261,7 +1245,7 @@ public class PopupMenu extends JPopupMenu } - public void pdbFromFile_actionPerformed(ActionEvent e) + public void pdbFromFile_actionPerformed() { jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache. @@ -1309,7 +1293,7 @@ public class PopupMenu extends JPopupMenu } - public void enterPDB_actionPerformed(ActionEvent e) + public void enterPDB_actionPerformed() { String id = JOptionPane.showInternalInputDialog(Desktop.desktop, "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE); @@ -1323,13 +1307,13 @@ public class PopupMenu extends JPopupMenu } } - public void discoverPDB_actionPerformed(ActionEvent e) + public void discoverPDB_actionPerformed() { new jalview.io.DBRefFetcher( ap.av.getAlignment(), ap.alignFrame).fetchDBRefs(false); } - public void sequenceFeature_actionPerformed(ActionEvent e) + public void sequenceFeature_actionPerformed() { SequenceGroup sg = ap.av.getSelectionGroup(); if(sg==null) @@ -1356,7 +1340,7 @@ public class PopupMenu extends JPopupMenu } } - public void textColour_actionPerformed(ActionEvent e) + public void textColour_actionPerformed() { SequenceGroup sg = getGroup(); if (sg != null)