From f2cd37c3b51d78aa72b04a85e083d73e9365d9a0 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 19 May 2005 17:48:21 +0000 Subject: [PATCH] remove redundant menuitems --- src/jalview/appletgui/APopupMenu.java | 160 +++++++-------------------------- 1 file changed, 30 insertions(+), 130 deletions(-) diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index b6d43ea..83e4407 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -9,10 +9,6 @@ import java.awt.event.*; public class APopupMenu extends java.awt.PopupMenu { Menu groupMenu = new Menu(); - Menu analyze = new Menu(); - Menu defineMenu = new Menu(); - Menu groupName = new Menu(); - Menu groupAnnotation = new Menu(); protected MenuItem clustalColour = new MenuItem(); protected MenuItem zappoColour = new MenuItem(); protected MenuItem taylorColour = new MenuItem(); @@ -32,12 +28,8 @@ public class APopupMenu extends java.awt.PopupMenu AlignmentPanel ap; Menu sequenceMenu = new Menu(); MenuItem sequenceName = new MenuItem(); - Menu residueMenu = new Menu(); - MenuItem annotateResidue = new MenuItem(); - Sequence sequence; MenuItem unGroupMenuItem = new MenuItem(); - MenuItem outline = new MenuItem(); MenuItem nucleotideMenuItem = new MenuItem(); public APopupMenu(AlignmentPanel ap, Sequence seq) @@ -58,54 +50,23 @@ public class APopupMenu extends java.awt.PopupMenu { e.printStackTrace(); } - if(seq!=null) - residueMenu.setEnabled(false); - else - sequenceMenu.setEnabled(false); + SequenceGroup sg = ap.av.getSelectionGroup(); + + if( !ap.av.alignment.getGroups().contains(sg)) + groupMenu.remove(unGroupMenuItem); + + if(seq==null) + remove(sequenceMenu); + } private void jbInit() throws Exception { groupMenu.setLabel("Group"); - analyze.setLabel("Analyze"); - analyze.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - analyze_actionPerformed(e); - } - }); - defineMenu.setLabel("Define"); - groupName.setLabel("Name"); - groupName.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - groupName_actionPerformed(e); - } - }); - groupAnnotation.setEnabled(false); - groupAnnotation.setLabel("Annotation"); - groupAnnotation.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - groupAnnotation_actionPerformed(e); - } - }); + groupMenu.setLabel("Define"); + sequenceMenu.setLabel("Sequence"); sequenceName.setLabel("Edit name"); - sequenceName.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - sequenceName_actionPerformed(e); - } - }); - residueMenu.setLabel("Residue"); - annotateResidue.setEnabled(false); - annotateResidue.setActionCommand("annotate residue"); - annotateResidue.setLabel("annotate residue???"); unGroupMenuItem.setLabel("Remove Group"); unGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -115,14 +76,7 @@ public class APopupMenu extends java.awt.PopupMenu } }); - outline.setLabel("Border colour"); - outline.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - outline_actionPerformed(e); - } - }); + nucleotideMenuItem.setLabel("Nucleotide"); nucleotideMenuItem.addActionListener(new ActionListener() { @@ -134,38 +88,28 @@ public class APopupMenu extends java.awt.PopupMenu add(groupMenu); this.add(sequenceMenu); - this.add(residueMenu); - groupMenu.add(defineMenu); groupMenu.add(unGroupMenuItem); + groupMenu.add(noColourmenuItem); + groupMenu.add(clustalColour); + groupMenu.add(BLOSUM62Colour); + groupMenu.add(PIDColour); + + groupMenu.add(zappoColour); + groupMenu.add(taylorColour); + groupMenu.add(hydrophobicityColour); + groupMenu.add(helixColour); + groupMenu.add(strandColour); + groupMenu.add(turnColour); + groupMenu.add(buriedColour); + groupMenu.add(nucleotideMenuItem); + + groupMenu.add(userDefinedColour); + groupMenu.addSeparator(); - groupMenu.add(analyze); - defineMenu.add(groupName); - defineMenu.add(groupAnnotation); - defineMenu.addSeparator(); - defineMenu.add(outline); - defineMenu.addSeparator(); - defineMenu.add(noColourmenuItem); - defineMenu.add(clustalColour); - defineMenu.add(BLOSUM62Colour); - defineMenu.add(PIDColour); - - defineMenu.add(zappoColour); - defineMenu.add(taylorColour); - defineMenu.add(hydrophobicityColour); - defineMenu.add(helixColour); - defineMenu.add(strandColour); - defineMenu.add(turnColour); - defineMenu.add(buriedColour); - defineMenu.add(nucleotideMenuItem); - - defineMenu.add(userDefinedColour); - - defineMenu.addSeparator(); - defineMenu.add(abovePIDColour); - defineMenu.add(conservationMenuItem); + groupMenu.add(abovePIDColour); + groupMenu.add(conservationMenuItem); sequenceMenu.add(sequenceName); - residueMenu.add(annotateResidue); noColourmenuItem.setLabel("None"); noColourmenuItem.addActionListener(new java.awt.event.ActionListener() @@ -292,7 +236,7 @@ public class APopupMenu extends java.awt.PopupMenu if( superG !=null) superG.setSuperGroupProperties( sg ); - ap.seqPanel.repaint(); + ap.seqPanel.seqCanvas.repaint(); } protected void clustalColour_actionPerformed(ActionEvent e) @@ -442,22 +386,6 @@ public class APopupMenu extends java.awt.PopupMenu refresh(); } - protected void groupAnnotation_actionPerformed(ActionEvent e) - { - - } - - protected void groupName_actionPerformed(ActionEvent e) - { - /* SequenceGroup sg = getGroup(); - String reply = JOptionPane.showInternalInputDialog(Desktop.desktop, "Enter new group name", "Edit group name", JOptionPane.QUESTION_MESSAGE); - if(reply==null) - return; - - sg.setName(reply); - groupName.setLabel(reply);*/ - } - protected void analyze_actionPerformed(ActionEvent e) { @@ -490,26 +418,6 @@ public class APopupMenu extends java.awt.PopupMenu return sg; } - void sequenceName_actionPerformed(ActionEvent e) - { - /* String id = sequence.getName(); - String s = (String)JOptionPane.showInternalInputDialog( - ap, - "Edit sequence name", - "Edit sequence name ("+sequence.getName()+")", - JOptionPane.PLAIN_MESSAGE, - null, - null, - id); - - if(s!=null) - { - sequence.setName(s); - ap.repaint(); - }*/ - - } - void unGroupMenuItem_actionPerformed(ActionEvent e) { SequenceGroup sg = ap.av.getSelectionGroup(); @@ -519,12 +427,4 @@ public class APopupMenu extends java.awt.PopupMenu } - protected void outline_actionPerformed(ActionEvent e) - { - /* SequenceGroup sg = getGroup(); - Color col = JColorChooser.showDialog(this, "Select Outline Colour", Color.BLUE); - if(col!=null) - sg.setOutlineColour(col);*/ - } - } -- 1.7.10.2