X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=f1a38f5475b4193e0f2077803b049d566f193a89;hb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;hp=c2bf72934fdaec59b99f7341cde7d603f972de77;hpb=c97c8a9e4fd58a4927e040e314c5be3c5356745e;p=jalview.git diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index c2bf729..f1a38f5 100755 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * 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 @@ -18,23 +18,18 @@ */ package jalview.gui; -import MCview.*; - -import jalview.analysis.*; - -import jalview.datamodel.*; - - -import jalview.schemes.*; +import java.util.*; import java.awt.*; import java.awt.event.*; - import javax.swing.*; -import java.util.Vector; -import jalview.io.FormatAdapter; - +import MCview.*; +import jalview.analysis.*; +import jalview.commands.*; +import jalview.datamodel.*; +import jalview.io.*; +import jalview.schemes.*; /** * DOCUMENT ME! @@ -42,35 +37,37 @@ import jalview.io.FormatAdapter; * @author $author$ * @version $Revision$ */ -public class PopupMenu extends JPopupMenu +public class PopupMenu + extends JPopupMenu { - JMenu groupMenu = new JMenu(); - JMenuItem groupName = new JMenuItem(); - protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem taylorColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem hydrophobicityColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem helixColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem(); - protected JCheckBoxMenuItem abovePIDColour = new JCheckBoxMenuItem(); - protected JRadioButtonMenuItem userDefinedColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem PIDColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem(); - JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem(); - protected JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem(); - AlignmentPanel ap; - JMenu sequenceMenu = new JMenu(); - JMenuItem sequenceName = new JMenuItem(); - Sequence sequence; - JMenuItem unGroupMenuItem = new JMenuItem(); - JMenuItem outline = new JMenuItem(); - JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem(); - JMenu colourMenu = new JMenu(); - JCheckBoxMenuItem showBoxes = new JCheckBoxMenuItem(); - JCheckBoxMenuItem showText = new JCheckBoxMenuItem(); - JCheckBoxMenuItem showColourText = new JCheckBoxMenuItem(); + JMenu groupMenu = new JMenu(); + JMenuItem groupName = new JMenuItem(); + protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem taylorColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem hydrophobicityColour = new + JRadioButtonMenuItem(); + protected JRadioButtonMenuItem helixColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem(); + protected JCheckBoxMenuItem abovePIDColour = new JCheckBoxMenuItem(); + protected JRadioButtonMenuItem userDefinedColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem PIDColour = new JRadioButtonMenuItem(); + protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem(); + JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem(); + protected JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem(); + AlignmentPanel ap; + JMenu sequenceMenu = new JMenu(); + JMenuItem sequenceName = new JMenuItem(); + Sequence sequence; + JMenuItem unGroupMenuItem = new JMenuItem(); + JMenuItem outline = new JMenuItem(); + JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem(); + JMenu colourMenu = new JMenu(); + JCheckBoxMenuItem showBoxes = new JCheckBoxMenuItem(); + JCheckBoxMenuItem showText = new JCheckBoxMenuItem(); + JCheckBoxMenuItem showColourText = new JCheckBoxMenuItem(); JMenu editMenu = new JMenu(); JMenuItem cut = new JMenuItem(); JMenuItem copy = new JMenuItem(); @@ -82,368 +79,376 @@ public class PopupMenu extends JPopupMenu JMenuItem enterPDB = new JMenuItem(); JMenuItem discoverPDB = new JMenuItem(); JMenu outputMenu = new JMenu(); + JMenuItem sequenceFeature = new JMenuItem(); + JMenuItem textColour = new JMenuItem(); + JMenu jMenu1 = new JMenu(); /** - * Creates a new PopupMenu object. - * - * @param ap DOCUMENT ME! - * @param seq DOCUMENT ME! - */ - public PopupMenu(final AlignmentPanel ap, Sequence seq, Vector links) - { - /////////////////////////////////////////////////////////// - // If this is activated from the sequence panel, the user may want to - // edit or annotate a particular residue. Therefore display the residue menu - // - // If from the IDPanel, we must display the sequence menu - ////////////////////////////////////////////////////////// - this.ap = ap; - sequence = seq; - - ButtonGroup colours = new ButtonGroup(); - colours.add(noColourmenuItem); - colours.add(clustalColour); - colours.add(zappoColour); - colours.add(taylorColour); - colours.add(hydrophobicityColour); - colours.add(helixColour); - colours.add(strandColour); - colours.add(turnColour); - colours.add(buriedColour); - colours.add(abovePIDColour); - colours.add(userDefinedColour); - colours.add(PIDColour); - colours.add(BLOSUM62Colour); - - for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++) + * Creates a new PopupMenu object. + * + * @param ap DOCUMENT ME! + * @param seq DOCUMENT ME! + */ + public PopupMenu(final AlignmentPanel ap, Sequence seq, Vector links) + { + /////////////////////////////////////////////////////////// + // If this is activated from the sequence panel, the user may want to + // edit or annotate a particular residue. Therefore display the residue menu + // + // If from the IDPanel, we must display the sequence menu + ////////////////////////////////////////////////////////// + this.ap = ap; + sequence = seq; + + ButtonGroup colours = new ButtonGroup(); + colours.add(noColourmenuItem); + colours.add(clustalColour); + colours.add(zappoColour); + colours.add(taylorColour); + colours.add(hydrophobicityColour); + colours.add(helixColour); + colours.add(strandColour); + colours.add(turnColour); + colours.add(buriedColour); + colours.add(abovePIDColour); + colours.add(userDefinedColour); + colours.add(PIDColour); + colours.add(BLOSUM62Colour); + + for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++) + { + JMenuItem item = new JMenuItem(jalview.io.FormatAdapter.WRITEABLE_FORMATS[ + i]); + + item.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + outputText_actionPerformed(e); + } + }); + + outputMenu.add(item); + } + + try + { + jbInit(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + if (seq != null) + { + sequenceMenu.setText(sequence.getName()); + + JMenuItem menuItem; + if (seq.getDatasetSequence().getPDBId() != null) + { + java.util.Enumeration e = seq.getDatasetSequence().getPDBId(). + elements(); + + while (e.hasMoreElements()) { - JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] ); + final PDBEntry pdb = (PDBEntry) e.nextElement(); - item.addActionListener(new java.awt.event.ActionListener() + menuItem = new JMenuItem(); + menuItem.setText("View PDB entry: " + pdb.getId()); + menuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { - outputText_actionPerformed(e); + new PDBViewer(pdb, sequence, ap.seqPanel.seqCanvas); } }); - - outputMenu.add(item); + sequenceMenu.add(menuItem); } + } - - try - { - jbInit(); - } - catch (Exception e) + menuItem = new JMenuItem("Hide Sequences"); + menuItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) { - e.printStackTrace(); + hideSequences(false); } + }); + add(menuItem); - - if (seq != null) + if (ap.av.getSelectionGroup() != null + && ap.av.getSelectionGroup().getSize() > 1) + { + menuItem = new JMenuItem("Represent Group with " + seq.getName()); + menuItem.addActionListener(new java.awt.event.ActionListener() { - int start = Math.max(sequence.getName().length()-15, 0); - sequenceMenu.setText(sequence.getName().substring(start)); - - JMenuItem menuItem; - if( seq.getDatasetSequence().getPDBId() != null) + public void actionPerformed(ActionEvent e) { - java.util.Enumeration e = seq.getDatasetSequence().getPDBId(). - elements(); - - while (e.hasMoreElements()) - { - final PDBEntry pdb = (PDBEntry) e.nextElement(); - - menuItem = new JMenuItem(); - menuItem.setText("View PDB entry: " + pdb.getId()); - menuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - new PDBViewer(pdb, sequence, ap.seqPanel.seqCanvas); - } - }); - sequenceMenu.add(menuItem); - } + hideSequences(true); } + }); + sequenceMenu.add(menuItem); + } - menuItem = new JMenuItem("Hide Sequences"); - menuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - hideSequences(false); - } - }); - add(menuItem); + if (ap.av.hasHiddenRows) + { + final int index = ap.av.alignment.findIndex(seq); - if(ap.av.getSelectionGroup() !=null - && ap.av.getSelectionGroup().getSize(false)>1) + if (ap.av.adjustForHiddenSeqs(index) - + ap.av.adjustForHiddenSeqs(index - 1) > 1) + { + menuItem = new JMenuItem("Reveal Sequences"); + menuItem.addActionListener(new ActionListener() { - menuItem = new JMenuItem("Represent Group with " + seq.getName()); - menuItem.addActionListener(new java.awt.event.ActionListener() + public void actionPerformed(ActionEvent e) { - public void actionPerformed(ActionEvent e) + ap.av.showSequence(index); + if (ap.overviewPanel != null) { - hideSequences(true); + ap.overviewPanel.updateOverviewImage(); } - }); - sequenceMenu.add(menuItem); - } + } + }); + add(menuItem); + } - if (ap.av.hasHiddenRows) + menuItem = new JMenuItem("Reveal All"); + menuItem.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) { - final int index = ap.av.alignment.findIndex(seq); - - if (ap.av.adjustForHiddenSeqs(index) - - ap.av.adjustForHiddenSeqs(index - 1) > 1) + ap.av.showAllHiddenSeqs(); + if (ap.overviewPanel != null) { - menuItem = new JMenuItem("Reveal Sequences"); - menuItem.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - ap.av.showSequence(index); - if (ap.overviewPanel != null) - ap.overviewPanel.updateOverviewImage(); - } - }); - add(menuItem); + ap.overviewPanel.updateOverviewImage(); } - - menuItem = new JMenuItem("Reveal All"); - menuItem.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - ap.av.showAllHiddenSeqs(); - if (ap.overviewPanel != null) - ap.overviewPanel.updateOverviewImage(); - } - }); - - add(menuItem); } + }); + add(menuItem); + } - } + } + SequenceGroup sg = ap.av.getSelectionGroup(); + if (sg != null) + { + groupName.setText(sg.getName()); - SequenceGroup sg = ap.av.getSelectionGroup(); + if (sg.cs instanceof ZappoColourScheme) + { + zappoColour.setSelected(true); + } + else if (sg.cs instanceof TaylorColourScheme) + { + taylorColour.setSelected(true); + } + else if (sg.cs instanceof PIDColourScheme) + { + PIDColour.setSelected(true); + } + else if (sg.cs instanceof Blosum62ColourScheme) + { + BLOSUM62Colour.setSelected(true); + } + else if (sg.cs instanceof UserColourScheme) + { + userDefinedColour.setSelected(true); + } + else if (sg.cs instanceof HydrophobicColourScheme) + { + hydrophobicityColour.setSelected(true); + } + else if (sg.cs instanceof HelixColourScheme) + { + helixColour.setSelected(true); + } + else if (sg.cs instanceof StrandColourScheme) + { + strandColour.setSelected(true); + } + else if (sg.cs instanceof TurnColourScheme) + { + turnColour.setSelected(true); + } + else if (sg.cs instanceof BuriedColourScheme) + { + buriedColour.setSelected(true); + } + else if (sg.cs instanceof ClustalxColourScheme) + { + clustalColour.setSelected(true); + } + else + { + noColourmenuItem.setSelected(true); + } - if (sg != null) - { - groupName.setText(sg.getName()); + if (sg.cs != null && sg.cs.conservationApplied()) + { + conservationMenuItem.setSelected(true); + } - if (sg.cs instanceof ZappoColourScheme) - { - zappoColour.setSelected(true); - } - else if (sg.cs instanceof TaylorColourScheme) - { - taylorColour.setSelected(true); - } - else if (sg.cs instanceof PIDColourScheme) - { - PIDColour.setSelected(true); - } - else if (sg.cs instanceof Blosum62ColourScheme) - { - BLOSUM62Colour.setSelected(true); - } - else if (sg.cs instanceof UserColourScheme) - { - userDefinedColour.setSelected(true); - } - else if (sg.cs instanceof HydrophobicColourScheme) - { - hydrophobicityColour.setSelected(true); - } - else if (sg.cs instanceof HelixColourScheme) - { - helixColour.setSelected(true); - } - else if (sg.cs instanceof StrandColourScheme) - { - strandColour.setSelected(true); - } - else if (sg.cs instanceof TurnColourScheme) - { - turnColour.setSelected(true); - } - else if (sg.cs instanceof BuriedColourScheme) - { - buriedColour.setSelected(true); - } - else if (sg.cs instanceof ClustalxColourScheme) - { - clustalColour.setSelected(true); - } - else - { - noColourmenuItem.setSelected(true); - } + showText.setSelected(sg.getDisplayText()); + showColourText.setSelected(sg.getColourText()); + showBoxes.setSelected(sg.getDisplayBoxes()); + } + else + { + groupMenu.setVisible(false); + editMenu.setVisible(false); + } - if (sg.cs!=null && sg.cs.conservationApplied()) - { - conservationMenuItem.setSelected(true); - } + if (!ap.av.alignment.getGroups().contains(sg)) + { + unGroupMenuItem.setVisible(false); + } - showText.setSelected(sg.getDisplayText()); - showColourText.setSelected(sg.getColourText()); - showBoxes.setSelected(sg.getDisplayBoxes()); - } - else - { - groupMenu.setVisible(false); - editMenu.setVisible(false); - } + if (seq == null) + { + sequenceMenu.setVisible(false); + pdbMenu.setVisible(false); + } - if (!ap.av.alignment.getGroups().contains(sg)) - { - unGroupMenuItem.setVisible(false); - } + if (links != null && links.size() > 0) + { + JMenu linkMenu = new JMenu("Link"); + JMenuItem item; + for (int i = 0; i < links.size(); i++) + { + String link = links.elementAt(i).toString(); + final String label = link.substring(0, link.indexOf("|")); + item = new JMenuItem(label); + final String url; + if (link.indexOf("$SEQUENCE_ID$") > -1) + { + String id = seq.getName(); + if (id.indexOf("|") > -1) + { + id = id.substring(id.lastIndexOf("|") + 1); + } - if (seq == null) + url = link.substring(link.indexOf("|") + 1, + link.indexOf("$SEQUENCE_ID$")) + + id + + link.substring(link.indexOf("$SEQUENCE_ID$") + 13); + } + else { - sequenceMenu.setVisible(false); - pdbMenu.setVisible(false); + url = link.substring(link.lastIndexOf("|") + 1); } - if(links != null && links.size()>0) + item.addActionListener(new java.awt.event.ActionListener() { - JMenu linkMenu = new JMenu("Link"); - JMenuItem item; - for(int i=0; i -1) - { - String id = seq.getName(); - if (id.indexOf("|") > -1) - id = id.substring(id.lastIndexOf("|") + 1); - - url = link.substring(link.indexOf("|") + 1, - link.indexOf("$SEQUENCE_ID$")) - + id + - link.substring(link.indexOf("$SEQUENCE_ID$") + 13); - } - else - url = link.substring(link.lastIndexOf("|")+1); - - - item.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - showLink(url); - } - }); - - linkMenu.add(item); + showLink(url); } - if(sequence!=null) - sequenceMenu.add(linkMenu); - else - add(linkMenu); - } + }); + + linkMenu.add(item); + } + if (sequence != null) + { + sequenceMenu.add(linkMenu); + } + else + { + add(linkMenu); + } } + } + /** + * DOCUMENT ME! + * + * @throws Exception DOCUMENT ME! + */ + private void jbInit() + throws Exception + { + groupMenu.setText("Group"); + groupMenu.setText("Selection"); + groupName.setText("Name"); + groupName.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + groupName_actionPerformed(); + } + }); + sequenceMenu.setText("Sequence"); + sequenceName.setText("Edit Name/Description"); + sequenceName.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + sequenceName_actionPerformed(); + } + }); + PIDColour.setFocusPainted(false); + unGroupMenuItem.setText("Remove Group"); + unGroupMenuItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + unGroupMenuItem_actionPerformed(); + } + }); - /** - * DOCUMENT ME! - * - * @throws Exception DOCUMENT ME! - */ - private void jbInit() throws Exception + outline.setText("Border colour"); + outline.addActionListener(new java.awt.event.ActionListener() { - groupMenu.setText("Group"); - groupMenu.setText("Selection"); - groupName.setText("Name"); - groupName.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - groupName_actionPerformed(e); - } - }); - sequenceMenu.setText("Sequence"); - sequenceName.setText("Edit Name/Description"); - sequenceName.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - sequenceName_actionPerformed(e); - } - }); - PIDColour.setFocusPainted(false); - unGroupMenuItem.setText("Remove Group"); - unGroupMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - unGroupMenuItem_actionPerformed(e); - } - }); - - outline.setText("Border colour"); - outline.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - outline_actionPerformed(e); - } - }); - nucleotideMenuItem.setText("Nucleotide"); - nucleotideMenuItem.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - nucleotideMenuItem_actionPerformed(e); - } - }); - colourMenu.setText("Group Colour"); - showBoxes.setText("Boxes"); - showBoxes.setState(true); - showBoxes.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - showBoxes_actionPerformed(e); - } - }); - showText.setText("Text"); - showText.setState(true); - showText.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - showText_actionPerformed(e); - } - }); - showColourText.setText("Colour Text"); - showColourText.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - showColourText_actionPerformed(e); - } - }); + public void actionPerformed(ActionEvent e) + { + outline_actionPerformed(); + } + }); + nucleotideMenuItem.setText("Nucleotide"); + nucleotideMenuItem.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + nucleotideMenuItem_actionPerformed(); + } + }); + colourMenu.setText("Group Colour"); + showBoxes.setText("Boxes"); + showBoxes.setState(true); + showBoxes.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + showBoxes_actionPerformed(); + } + }); + showText.setText("Text"); + showText.setState(true); + showText.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + showText_actionPerformed(); + } + }); + showColourText.setText("Colour Text"); + showColourText.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + showColourText_actionPerformed(); + } + }); editMenu.setText("Edit"); cut.setText("Cut"); cut.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - cut_actionPerformed(e); + cut_actionPerformed(); } }); upperCase.setText("To Upper Case"); @@ -451,7 +456,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - upperCase_actionPerformed(e); + changeCase(e); } }); copy.setText("Copy"); @@ -459,7 +464,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - copy_actionPerformed(e); + copy_actionPerformed(); } }); lowerCase.setText("To Lower Case"); @@ -467,7 +472,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - lowerCase_actionPerformed(e); + changeCase(e); } }); toggle.setText("Toggle Case"); @@ -475,7 +480,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - toggle_actionPerformed(e); + changeCase(e); } }); pdbMenu.setText("Associate Structure with Sequence"); @@ -484,7 +489,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - pdbFromFile_actionPerformed(e); + pdbFromFile_actionPerformed(); } }); enterPDB.setText("Enter PDB Id"); @@ -492,7 +497,7 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - enterPDB_actionPerformed(e); + enterPDB_actionPerformed(); } }); discoverPDB.setText("Discover PDB ids"); @@ -500,63 +505,74 @@ public class PopupMenu extends JPopupMenu { public void actionPerformed(ActionEvent e) { - discoverPDB_actionPerformed(e); + discoverPDB_actionPerformed(); } }); outputMenu.setText("Output to Textbox..."); + sequenceFeature.setText("Create Sequence Feature"); + sequenceFeature.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + sequenceFeature_actionPerformed(); + } + }); + textColour.setText("Text Colour"); + textColour.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + textColour_actionPerformed(); + } + }); + jMenu1.setText("Group"); add(groupMenu); add(sequenceMenu); groupMenu.add(editMenu); groupMenu.add(outputMenu); - groupMenu.addSeparator(); - groupMenu.add(groupName); - groupMenu.add(unGroupMenuItem); - groupMenu.add(colourMenu); - groupMenu.add(showBoxes); - groupMenu.add(showText); - groupMenu.add(showColourText); - groupMenu.add(outline); - sequenceMenu.add(sequenceName); + groupMenu.add(sequenceFeature); + groupMenu.add(jMenu1); + sequenceMenu.add(sequenceName); sequenceMenu.add(pdbMenu); + colourMenu.add(textColour); colourMenu.add(noColourmenuItem); - colourMenu.add(clustalColour); - colourMenu.add(BLOSUM62Colour); - colourMenu.add(PIDColour); - colourMenu.add(zappoColour); - colourMenu.add(taylorColour); - colourMenu.add(hydrophobicityColour); - colourMenu.add(helixColour); - colourMenu.add(strandColour); - colourMenu.add(turnColour); - colourMenu.add(buriedColour); - colourMenu.add(nucleotideMenuItem); - colourMenu.add(userDefinedColour); - - if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null) - { - java.util.Enumeration userColours = jalview.gui.UserDefinedColours. - getUserColourSchemes().keys(); + colourMenu.add(clustalColour); + colourMenu.add(BLOSUM62Colour); + colourMenu.add(PIDColour); + colourMenu.add(zappoColour); + colourMenu.add(taylorColour); + colourMenu.add(hydrophobicityColour); + colourMenu.add(helixColour); + colourMenu.add(strandColour); + colourMenu.add(turnColour); + colourMenu.add(buriedColour); + colourMenu.add(nucleotideMenuItem); + colourMenu.add(userDefinedColour); + + if (jalview.gui.UserDefinedColours.getUserColourSchemes() != null) + { + java.util.Enumeration userColours = jalview.gui.UserDefinedColours. + getUserColourSchemes().keys(); - while (userColours.hasMoreElements()) + while (userColours.hasMoreElements()) + { + JMenuItem item = new JMenuItem(userColours. + nextElement().toString()); + item.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent evt) { - JMenuItem item = new JMenuItem(userColours. - nextElement().toString()); - item.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - userDefinedColour_actionPerformed(evt); - } - }); - colourMenu.add(item); + userDefinedColour_actionPerformed(evt); } - } - + }); + colourMenu.add(item); + } + } - colourMenu.addSeparator(); - colourMenu.add(abovePIDColour); - colourMenu.add(conservationMenuItem); + colourMenu.addSeparator(); + colourMenu.add(abovePIDColour); + colourMenu.add(conservationMenuItem); editMenu.add(copy); editMenu.add(cut); editMenu.add(upperCase); @@ -565,671 +581,680 @@ public class PopupMenu extends JPopupMenu pdbMenu.add(pdbFromFile); pdbMenu.add(enterPDB); pdbMenu.add(discoverPDB); + jMenu1.add(groupName); + jMenu1.add(unGroupMenuItem); + jMenu1.add(colourMenu); + jMenu1.add(showBoxes); + jMenu1.add(showText); + jMenu1.add(showColourText); + jMenu1.add(outline); noColourmenuItem.setText("None"); - noColourmenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - noColourmenuItem_actionPerformed(e); - } - }); - - clustalColour.setText("Clustalx colours"); - clustalColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - clustalColour_actionPerformed(e); - } - }); - zappoColour.setText("Zappo"); - zappoColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - zappoColour_actionPerformed(e); - } - }); - taylorColour.setText("Taylor"); - taylorColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - taylorColour_actionPerformed(e); - } - }); - hydrophobicityColour.setText("Hydrophobicity"); - hydrophobicityColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - hydrophobicityColour_actionPerformed(e); - } - }); - helixColour.setText("Helix propensity"); - helixColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - helixColour_actionPerformed(e); - } - }); - strandColour.setText("Strand propensity"); - strandColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - strandColour_actionPerformed(e); - } - }); - turnColour.setText("Turn propensity"); - turnColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - turnColour_actionPerformed(e); - } - }); - buriedColour.setText("Buried Index"); - buriedColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - buriedColour_actionPerformed(e); - } - }); - abovePIDColour.setText("Above % Identity"); - abovePIDColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - abovePIDColour_actionPerformed(e); - } - }); - userDefinedColour.setText("User Defined..."); - userDefinedColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - userDefinedColour_actionPerformed(e); - } - }); - PIDColour.setText("Percentage Identity"); - PIDColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - PIDColour_actionPerformed(e); - } - }); - BLOSUM62Colour.setText("BLOSUM62"); - BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - BLOSUM62Colour_actionPerformed(e); - } - }); - conservationMenuItem.setText("Conservation"); - conservationMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - conservationMenuItem_actionPerformed(e); - } - }); - } - - /** - * DOCUMENT ME! - */ - void refresh() - { - if (ap.overviewPanel != null) - ap.overviewPanel.updateOverviewImage(); - - PaintRefresher.Refresh(this, ap.av.getSequenceSetId()); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void clustalColour_actionPerformed(ActionEvent e) - { - SequenceGroup sg = getGroup(); - sg.cs = new ClustalxColourScheme(sg.getSequences(true), - ap.av.alignment.getWidth()); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void zappoColour_actionPerformed(ActionEvent e) + noColourmenuItem.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new ZappoColourScheme(); - refresh(); - } + public void actionPerformed(ActionEvent e) + { + noColourmenuItem_actionPerformed(); + } + }); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void taylorColour_actionPerformed(ActionEvent e) + clustalColour.setText("Clustalx colours"); + clustalColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new TaylorColourScheme(); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void hydrophobicityColour_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) + { + clustalColour_actionPerformed(); + } + }); + zappoColour.setText("Zappo"); + zappoColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new HydrophobicColourScheme(); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void helixColour_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) + { + zappoColour_actionPerformed(); + } + }); + taylorColour.setText("Taylor"); + taylorColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new HelixColourScheme(); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void strandColour_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) + { + taylorColour_actionPerformed(); + } + }); + hydrophobicityColour.setText("Hydrophobicity"); + hydrophobicityColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new StrandColourScheme(); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void turnColour_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) + { + hydrophobicityColour_actionPerformed(); + } + }); + helixColour.setText("Helix propensity"); + helixColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new TurnColourScheme(); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void buriedColour_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) + { + helixColour_actionPerformed(); + } + }); + strandColour.setText("Strand propensity"); + strandColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new BuriedColourScheme(); - refresh(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void nucleotideMenuItem_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) + { + strandColour_actionPerformed(); + } + }); + turnColour.setText("Turn propensity"); + turnColour.addActionListener(new java.awt.event.ActionListener() { - getGroup().cs = new NucleotideColourScheme(); - refresh(); - } + public void actionPerformed(ActionEvent e) + { + turnColour_actionPerformed(); + } + }); + buriedColour.setText("Buried Index"); + buriedColour.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + buriedColour_actionPerformed(); + } + }); + abovePIDColour.setText("Above % Identity"); + abovePIDColour.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + abovePIDColour_actionPerformed(); + } + }); + userDefinedColour.setText("User Defined..."); + userDefinedColour.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + userDefinedColour_actionPerformed(e); + } + }); + PIDColour.setText("Percentage Identity"); + PIDColour.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + PIDColour_actionPerformed(); + } + }); + BLOSUM62Colour.setText("BLOSUM62"); + BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + BLOSUM62Colour_actionPerformed(); + } + }); + conservationMenuItem.setText("Conservation"); + conservationMenuItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + conservationMenuItem_actionPerformed(); + } + }); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void abovePIDColour_actionPerformed(ActionEvent e) + /** + * DOCUMENT ME! + */ + void refresh() + { + if (ap.overviewPanel != null) { - SequenceGroup sg = getGroup(); - if(sg.cs==null) - return; + ap.overviewPanel.updateOverviewImage(); + } - if (abovePIDColour.isSelected()) - { - sg.cs.setConsensus(AAFrequency.calculate( - sg.getSequences(true), 0, - ap.av.alignment.getWidth())); + PaintRefresher.Refresh(this, ap.av.getSequenceSetId()); + } - int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, - getGroup().getName()); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void clustalColour_actionPerformed() + { + SequenceGroup sg = getGroup(); + sg.cs = new ClustalxColourScheme(sg.getSequences(ap.av.hiddenRepSequences), + ap.av.alignment.getWidth()); + refresh(); + } - sg.cs.setThreshold(threshold, ap.av.getIgnoreGapsConsensus()); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void zappoColour_actionPerformed() + { + getGroup().cs = new ZappoColourScheme(); + refresh(); + } - SliderPanel.showPIDSlider(); - } - else // remove PIDColouring - { - sg.cs.setThreshold(0, ap.av.getIgnoreGapsConsensus()); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void taylorColour_actionPerformed() + { + getGroup().cs = new TaylorColourScheme(); + refresh(); + } - refresh(); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void hydrophobicityColour_actionPerformed() + { + getGroup().cs = new HydrophobicColourScheme(); + refresh(); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void userDefinedColour_actionPerformed(ActionEvent e) - { - SequenceGroup sg = getGroup(); - - if (e.getActionCommand().equals("User Defined...")) - new UserDefinedColours(ap, sg); - else - { - UserColourScheme udc = (UserColourScheme) UserDefinedColours. - getUserColourSchemes().get(e.getActionCommand()); - - sg.cs = udc; - } - } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void PIDColour_actionPerformed(ActionEvent e) - { - SequenceGroup sg = getGroup(); - sg.cs = new PIDColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, - ap.av.alignment.getWidth())); - refresh(); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void helixColour_actionPerformed() + { + getGroup().cs = new HelixColourScheme(); + refresh(); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void BLOSUM62Colour_actionPerformed(ActionEvent e) - { - SequenceGroup sg = getGroup(); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void strandColour_actionPerformed() + { + getGroup().cs = new StrandColourScheme(); + refresh(); + } - sg.cs = new Blosum62ColourScheme(); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void turnColour_actionPerformed() + { + getGroup().cs = new TurnColourScheme(); + refresh(); + } - sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, - ap.av.alignment.getWidth())); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void buriedColour_actionPerformed() + { + getGroup().cs = new BuriedColourScheme(); + refresh(); + } - refresh(); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void nucleotideMenuItem_actionPerformed() + { + getGroup().cs = new NucleotideColourScheme(); + refresh(); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void noColourmenuItem_actionPerformed(ActionEvent e) + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void abovePIDColour_actionPerformed() + { + SequenceGroup sg = getGroup(); + if (sg.cs == null) { - getGroup().cs = null; - refresh(); + return; } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void conservationMenuItem_actionPerformed(ActionEvent e) + if (abovePIDColour.isSelected()) { - SequenceGroup sg = getGroup(); - if(sg.cs==null) - return; - - if (conservationMenuItem.isSelected()) - { - Conservation c = new Conservation("Group", - ResidueProperties.propHash, 3, - sg.getSequences(true), 0, - ap.av.alignment.getWidth()); - - c.calculate(); - c.verdict(false, ap.av.ConsPercGaps); + sg.cs.setConsensus(AAFrequency.calculate( + sg.getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), + sg.getEndRes() + 1)); - sg.cs.setConservation(c); + int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, + getGroup().getName()); - SliderPanel.setConservationSlider(ap, sg.cs, sg.getName()); - SliderPanel.showConservationSlider(); - } - else // remove ConservationColouring - { - sg.cs.setConservation(null); - } + sg.cs.setThreshold(threshold, ap.av.getIgnoreGapsConsensus()); - refresh(); + SliderPanel.showPIDSlider(); } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void groupName_actionPerformed(ActionEvent e) + else // remove PIDColouring { - 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.setText(reply); + sg.cs.setThreshold(0, ap.av.getIgnoreGapsConsensus()); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void analyze_actionPerformed(ActionEvent e) - { - CutAndPasteTransfer cap = new CutAndPasteTransfer(); - JInternalFrame frame = new JInternalFrame(); - frame.setContentPane(cap); - Desktop.addInternalFrame(frame, "Analyze this - ", 400, 300); - - SequenceGroup sg = getGroup(); - StringBuffer sb = new StringBuffer(); + refresh(); + } - for (int i = 0; i < sg.getSize(false); i++) - { - Sequence tmp = (Sequence) sg.getSequences(false).elementAt(i); - sb.append(tmp.getSequence(sg.getStartRes(), sg.getEndRes() + 1)); - sb.append("\n"); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void userDefinedColour_actionPerformed(ActionEvent e) + { + SequenceGroup sg = getGroup(); - sb.append("Something amazing will happen soon"); - cap.setText(sb.toString()); + if (e.getActionCommand().equals("User Defined...")) + { + new UserDefinedColours(ap, sg); } - - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - SequenceGroup getGroup() + else { - SequenceGroup sg = ap.av.getSelectionGroup(); - // this method won't add a new group if it already exists - if(sg!=null) - ap.av.alignment.addGroup(sg); + UserColourScheme udc = (UserColourScheme) UserDefinedColours. + getUserColourSchemes().get(e.getActionCommand()); - return sg; + sg.cs = udc; } + refresh(); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - void sequenceName_actionPerformed(ActionEvent e) - { - 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 ) - { - return; - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void PIDColour_actionPerformed() + { + SequenceGroup sg = getGroup(); + sg.cs = new PIDColourScheme(); + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av. + hiddenRepSequences), + sg.getStartRes(), + sg.getEndRes() + 1)); + refresh(); + } - String s = id.getText(); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void BLOSUM62Colour_actionPerformed() + { + SequenceGroup sg = getGroup(); - if (s != null) - { - if (s.indexOf(" ") > -1) - { - JOptionPane.showMessageDialog(ap, - "Spaces have been converted to \"_\"", - "No spaces allowed in Sequence Name", - JOptionPane.WARNING_MESSAGE); - } + sg.cs = new Blosum62ColourScheme(); - s = s.replace(' ', '_'); - sequence.getDatasetSequence().setName(s); - sequence.setName(s); - ap.repaint(); - } + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av. + hiddenRepSequences), + sg.getStartRes(), + sg.getEndRes() + 1)); - sequence.getDatasetSequence().setDescription(description.getText()); - sequence.setDescription(description.getText()); - } + refresh(); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - void unGroupMenuItem_actionPerformed(ActionEvent e) - { - SequenceGroup sg = ap.av.getSelectionGroup(); - ap.av.alignment.deleteGroup(sg); - ap.av.setSelectionGroup(null); - refresh(); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void noColourmenuItem_actionPerformed() + { + getGroup().cs = null; + refresh(); + } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void conservationMenuItem_actionPerformed() + { + SequenceGroup sg = getGroup(); + if (sg.cs == null) + { + return; + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void outline_actionPerformed(ActionEvent e) + if (conservationMenuItem.isSelected()) { - SequenceGroup sg = getGroup(); - Color col = JColorChooser.showDialog(this, "Select Outline Colour", - Color.BLUE); + Conservation c = new Conservation("Group", + ResidueProperties.propHash, 3, + sg.getSequences(ap.av. + hiddenRepSequences), + sg.getStartRes(), + sg.getEndRes() + 1); - if (col != null) - { - sg.setOutlineColour(col); - } + c.calculate(); + c.verdict(false, ap.av.ConsPercGaps); - refresh(); - } + sg.cs.setConservation(c); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void showBoxes_actionPerformed(ActionEvent e) + SliderPanel.setConservationSlider(ap, sg.cs, sg.getName()); + SliderPanel.showConservationSlider(); + } + else // remove ConservationColouring { - getGroup().setDisplayBoxes(showBoxes.isSelected()); - refresh(); + sg.cs.setConservation(null); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void showText_actionPerformed(ActionEvent e) + refresh(); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void groupName_actionPerformed() + { + + SequenceGroup sg = getGroup(); + EditNameDialog dialog = new EditNameDialog(sg.getName(), + sg.getDescription(), + " Group Name ", + "Group Description ", + "Edit Group Name/Description"); + + if (!dialog.accept) { - getGroup().setDisplayText(showText.isSelected()); - refresh(); + return; } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void showColourText_actionPerformed(ActionEvent e) + sg.setName(dialog.getName()); + sg.setDescription(dialog.getDescription()); + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + SequenceGroup getGroup() + { + SequenceGroup sg = ap.av.getSelectionGroup(); + // this method won't add a new group if it already exists + if (sg != null) { - getGroup().setColourText(showColourText.isSelected()); - refresh(); + ap.av.alignment.addGroup(sg); } - public void showLink(String url) - { - try - { - jalview.util.BrowserLauncher.openURL(url); - } - catch (Exception ex) - { - JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Unixers: Couldn't find default web browser." - +"\nAdd the full path to your browser in Preferences.", - "Web browser not found", JOptionPane.WARNING_MESSAGE ); + return sg; + } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + void sequenceName_actionPerformed() + { + EditNameDialog dialog = new EditNameDialog(sequence.getName(), + sequence.getDescription(), + " Sequence Name ", + "Sequence Description ", + "Edit Sequence Name/Description"); - ex.printStackTrace(); - } + if (!dialog.accept) + { + return; } - void hideSequences(boolean representGroup) + if (dialog.getName() != null) { - SequenceGroup sg = ap.av.getSelectionGroup(); - if(sg==null || sg.getSize(false)<1) + if (dialog.getName().indexOf(" ") > -1) { - ap.av.hideSequence(new SequenceI[]{sequence}); - return; + JOptionPane.showMessageDialog(ap, + "Spaces have been converted to \"_\"", + "No spaces allowed in Sequence Name", + JOptionPane.WARNING_MESSAGE); } - int gsize = sg.getSize(false); - SequenceI [] hseqs; + sequence.setName(dialog.getName().replace(' ', '_')); + ap.repaint(); + } - hseqs = new SequenceI[ representGroup ? gsize-1 : gsize ]; + sequence.setDescription(dialog.getDescription()); - int index = 0; - for(int i=0; i sg.getEndRes()) - end = sg.getEndRes() + 1; + start = ap.av.colSel.adjustForHiddenColumns(start); } - if (source == toggle) - ( (SequenceI) sg.getSequences(true).elementAt(g)) - .toggleCase(start, end); - else - ( (SequenceI) sg.getSequences(true).elementAt(g)) - .changeCase(source == upperCase, start, end); - - if (ap.av.hasHiddenColumns) + end = ap.av.colSel.getHiddenBoundaryRight(start); + if (start == end) { - start = ap.av.colSel.adjustForHiddenColumns(end); - start = ap.av.colSel.getHiddenBoundaryLeft(start) + 1; + end = sg.getEndRes() + 1; } + if (end > sg.getEndRes()) + { + end = sg.getEndRes() + 1; + } + } + regions.addElement(new int[] + {start, end}); + + if (ap.av.hasHiddenColumns) + { + start = ap.av.colSel.adjustForHiddenColumns(end); + start = ap.av.colSel.getHiddenBoundaryLeft(start) + 1; } - while (end < sg.getEndRes()); } - PaintRefresher.Refresh(this, ap.av.getSequenceSetId()); + while (end < sg.getEndRes()); + + int[][] startEnd = new int[regions.size()][2]; + for (int i = 0; i < regions.size(); i++) + { + startEnd[i] = (int[]) regions.elementAt(i); + } + + String description; + int caseChange; + + if (source == toggle) + { + description = "Toggle Case"; + caseChange = ChangeCaseCommand.TOGGLE_CASE; + } + else if (source == upperCase) + { + description = "To Upper Case"; + caseChange = ChangeCaseCommand.TO_UPPER; + } + else + { + description = "To Lower Case"; + caseChange = ChangeCaseCommand.TO_LOWER; + } + + ChangeCaseCommand caseCommand = new ChangeCaseCommand( + description, sg.getSequencesAsArray(ap.av.hiddenRepSequences), + startEnd, caseChange + ); + + ap.alignFrame.addHistoryItem(caseCommand); + + ap.av.firePropertyChange("alignment", null, + ap.av.getAlignment().getSequences()); + } } public void outputText_actionPerformed(ActionEvent e) { CutAndPasteTransfer cap = new CutAndPasteTransfer(); + cap.setForInput(null); Desktop.addInternalFrame(cap, "Alignment output - " + e.getActionCommand(), 600, 500); - String [] omitHidden = null; + String[] omitHidden = null; - if(ap.av.hasHiddenColumns) + if (ap.av.hasHiddenColumns) { System.out.println("PROMPT USER HERE"); omitHidden = ap.av.getViewAsString(true); @@ -1241,56 +1266,59 @@ public class PopupMenu extends JPopupMenu omitHidden)); } - - public void pdbFromFile_actionPerformed(ActionEvent e) + public void pdbFromFile_actionPerformed() { - jalview.io.JalviewFileChooser chooser - = new jalview.io.JalviewFileChooser(jalview.bin.Cache. - getProperty( - "LAST_DIRECTORY")); - chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle("Select a PDB file"); - chooser.setToolTipText("Load a PDB file"); - - int value = chooser.showOpenDialog(null); - - if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION) - { - PDBEntry entry = new PDBEntry(); - String choice = chooser.getSelectedFile().getPath(); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice); - try - { - MCview.PDBfile pdbfile = new MCview.PDBfile(choice, - jalview.io.AppletFormatAdapter.FILE); - - if (pdbfile.id == null) - { - String reply = JOptionPane.showInternalInputDialog( - Desktop.desktop, - "Couldn't find a PDB id in the file supplied." - + "Please enter an Id to identify this structure.", - "No PDB Id in File", JOptionPane.QUESTION_MESSAGE); - if (reply == null) - return; - - entry.setId(reply); - } - else - entry.setId(pdbfile.id); - } - catch (java.io.IOException ex) - { - ex.printStackTrace(); - } - - entry.setFile(choice); - sequence.getDatasetSequence().addPDBId(entry); - } + jalview.io.JalviewFileChooser chooser + = new jalview.io.JalviewFileChooser(jalview.bin.Cache. + getProperty( + "LAST_DIRECTORY")); + chooser.setFileView(new jalview.io.JalviewFileView()); + chooser.setDialogTitle("Select a PDB file"); + chooser.setToolTipText("Load a PDB file"); + + int value = chooser.showOpenDialog(null); + + if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION) + { + PDBEntry entry = new PDBEntry(); + String choice = chooser.getSelectedFile().getPath(); + jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice); + try + { + MCview.PDBfile pdbfile = new MCview.PDBfile(choice, + jalview.io.AppletFormatAdapter.FILE); + + if (pdbfile.id == null) + { + String reply = JOptionPane.showInternalInputDialog( + Desktop.desktop, + "Couldn't find a PDB id in the file supplied." + + "Please enter an Id to identify this structure.", + "No PDB Id in File", JOptionPane.QUESTION_MESSAGE); + if (reply == null) + { + return; + } + + entry.setId(reply); + } + else + { + entry.setId(pdbfile.id); + } + } + catch (java.io.IOException ex) + { + ex.printStackTrace(); + } + + entry.setFile(choice); + sequence.getDatasetSequence().addPDBId(entry); + } } - 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); @@ -1304,9 +1332,47 @@ 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); + ap.av.getAlignment(), ap.alignFrame).fetchDBRefs(false); + } + + public void sequenceFeature_actionPerformed() + { + SequenceGroup sg = ap.av.getSelectionGroup(); + if (sg == null) + { + return; + } + + int gSize = sg.getSize(); + SequenceI[] seqs = new SequenceI[gSize]; + SequenceFeature[] features = new SequenceFeature[gSize]; + + for (int i = 0; i < gSize; i++) + { + seqs[i] = sg.getSequenceAt(i).getDatasetSequence(); + int start = sg.getSequenceAt(i).findPosition(sg.getStartRes()); + int end = sg.findEndRes(sg.getSequenceAt(i)); + features[i] = new SequenceFeature(null, null, null, start, end, "Jalview"); + } + + if (ap.seqPanel.seqCanvas.getFeatureRenderer() + .createNewFeatures(seqs, features)) + { + ap.alignFrame.showSeqFeatures.setSelected(true); + ap.av.setShowSequenceFeatures(true); + ap.highlightSearchResults(null); + } + } + + public void textColour_actionPerformed() + { + SequenceGroup sg = getGroup(); + if (sg != null) + { + new TextColourChooser().chooseColour(ap, sg); + } } }