From de468b0bf50850a89c6a8a7acfa4ff5b689ffed1 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 22 Dec 2005 16:00:57 +0000 Subject: [PATCH] Reduced jar size by 20% --- src/jalview/appletgui/APopupMenu.java | 240 +++--- src/jalview/appletgui/AlignFrame.java | 957 ++++++++++++------------ src/jalview/appletgui/AlignViewport.java | 6 +- src/jalview/appletgui/AlignmentPanel.java | 61 +- src/jalview/appletgui/AnnotationLabels.java | 4 +- src/jalview/appletgui/AnnotationPanel.java | 31 +- src/jalview/appletgui/CutAndPasteTransfer.java | 40 +- src/jalview/appletgui/Finder.java | 63 +- src/jalview/appletgui/FontChooser.java | 56 +- src/jalview/appletgui/OverviewPanel.java | 38 +- src/jalview/appletgui/PCAPanel.java | 66 +- src/jalview/appletgui/PairwiseAlignPanel.java | 16 +- src/jalview/appletgui/RedundancyPanel.java | 4 +- src/jalview/appletgui/SeqPanel.java | 126 ++-- src/jalview/appletgui/SliderPanel.java | 52 +- src/jalview/appletgui/TreePanel.java | 79 +- src/jalview/appletgui/UserDefinedColours.java | 108 ++- 17 files changed, 900 insertions(+), 1047 deletions(-) diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 8488dd8..c90af98 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -28,7 +28,7 @@ import jalview.datamodel.*; import jalview.schemes.*; public class APopupMenu - extends java.awt.PopupMenu + extends java.awt.PopupMenu implements ActionListener, ItemListener { Menu groupMenu = new Menu(); protected MenuItem clustalColour = new MenuItem(); @@ -131,6 +131,54 @@ public class APopupMenu } } + public void itemStateChanged(ItemEvent evt) + { + if(evt.getSource()==abovePIDColour) + abovePIDColour_itemStateChanged(); + else if(evt.getSource()==showColourText) + showColourText_itemStateChanged(); + else if(evt.getSource()==showText) + showText_itemStateChanged(); + else if(evt.getSource()==showBoxes) + showBoxes_itemStateChanged() ; + } + + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==clustalColour) + clustalColour_actionPerformed(); + else if(evt.getSource()==zappoColour) + zappoColour_actionPerformed(); + else if(evt.getSource()==taylorColour) + taylorColour_actionPerformed(); + else if(evt.getSource()==hydrophobicityColour) + hydrophobicityColour_actionPerformed(); + else if(evt.getSource()==helixColour) + helixColour_actionPerformed(); + else if(evt.getSource()==strandColour) + strandColour_actionPerformed(); + else if(evt.getSource()==clustalColour) + turnColour_actionPerformed(); + else if(evt.getSource()==buriedColour) + buriedColour_actionPerformed(); + else if(evt.getSource()==nucleotideMenuItem) + nucleotideMenuItem_actionPerformed(); + + else if(evt.getSource()==userDefinedColour) + userDefinedColour_actionPerformed(); + else if(evt.getSource()==PIDColour) + PIDColour_actionPerformed(); + else if(evt.getSource()==BLOSUM62Colour) + BLOSUM62Colour_actionPerformed(); + else if(evt.getSource()==noColourmenuItem) + noColourmenuItem_actionPerformed(); + else if(evt.getSource()==conservationMenuItem) + conservationMenuItem_itemStateChanged(); + else if(evt.getSource()==unGroupMenuItem) + unGroupMenuItem_actionPerformed(); + + } + void addPDB(Sequence seq) { CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame.applet); @@ -148,63 +196,21 @@ public class APopupMenu groupMenu.setLabel("Define"); unGroupMenuItem.setLabel("Remove Group"); - unGroupMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - unGroupMenuItem_actionPerformed(e); - } - }); + unGroupMenuItem.addActionListener(this); nucleotideMenuItem.setLabel("Nucleotide"); - nucleotideMenuItem.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - nucleotideMenuItem_actionPerformed(e); - } - }); - conservationMenuItem.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - conservationMenuItem_itemStateChanged(itemEvent); - } - }); - abovePIDColour.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - abovePIDColour_itemStateChanged(itemEvent); - } - }); + nucleotideMenuItem.addActionListener(this); + conservationMenuItem.addItemListener(this); + abovePIDColour.addItemListener(this); colourMenu.setLabel("Group Colour"); showBoxes.setLabel("Boxes"); showBoxes.setState(true); - showBoxes.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - showBoxes_itemStateChanged(itemEvent); - } - }); + showBoxes.addItemListener(this); showText.setLabel("Text"); - showText.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - showText_itemStateChanged(itemEvent); - } - }); + showText.addItemListener(this); showColourText.setLabel("Colour Text"); - showColourText.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - showColourText_itemStateChanged(itemEvent); - } - }); + showColourText.addItemListener(this); add(groupMenu); groupMenu.add(unGroupMenuItem); @@ -231,104 +237,32 @@ public class APopupMenu colourMenu.add(conservationMenuItem); noColourmenuItem.setLabel("None"); - noColourmenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - noColourmenuItem_actionPerformed(e); - } - }); + noColourmenuItem.addActionListener(this); clustalColour.setLabel("Clustalx colours"); - clustalColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - clustalColour_actionPerformed(e); - } - }); + clustalColour.addActionListener(this); zappoColour.setLabel("Zappo"); - zappoColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - zappoColour_actionPerformed(e); - } - }); + zappoColour.addActionListener(this); taylorColour.setLabel("Taylor"); - taylorColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - taylorColour_actionPerformed(e); - } - }); + taylorColour.addActionListener(this); hydrophobicityColour.setLabel("Hydrophobicity"); - hydrophobicityColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - hydrophobicityColour_actionPerformed(e); - } - }); + hydrophobicityColour.addActionListener(this); helixColour.setLabel("Helix propensity"); - helixColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - helixColour_actionPerformed(e); - } - }); + helixColour.addActionListener(this); strandColour.setLabel("Strand propensity"); - strandColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - strandColour_actionPerformed(e); - } - }); + strandColour.addActionListener(this); turnColour.setLabel("Turn propensity"); - turnColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - turnColour_actionPerformed(e); - } - }); + turnColour.addActionListener(this); buriedColour.setLabel("Buried Index"); - buriedColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - buriedColour_actionPerformed(e); - } - }); + buriedColour.addActionListener(this); abovePIDColour.setLabel("Above % Identity"); userDefinedColour.setLabel("User Defined"); - userDefinedColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - userDefinedColour_actionPerformed(e); - } - }); + userDefinedColour.addActionListener(this); PIDColour.setLabel("Percentage Identity"); - PIDColour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - PIDColour_actionPerformed(e); - } - }); + PIDColour.addActionListener(this); BLOSUM62Colour.setLabel("BLOSUM62"); - BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - BLOSUM62Colour_actionPerformed(e); - } - }); + BLOSUM62Colour.addActionListener(this); conservationMenuItem.setLabel("Conservation"); } @@ -350,62 +284,62 @@ public class APopupMenu ap.overviewPanel.updateOverviewImage(); } - protected void clustalColour_actionPerformed(ActionEvent e) + protected void clustalColour_actionPerformed() { SequenceGroup sg = getGroup(); sg.cs = new ClustalxColourScheme(sg.sequences, ap.av.alignment.getWidth()); refresh(); } - protected void zappoColour_actionPerformed(ActionEvent e) + protected void zappoColour_actionPerformed() { getGroup().cs = new ZappoColourScheme(); refresh(); } - protected void taylorColour_actionPerformed(ActionEvent e) + protected void taylorColour_actionPerformed() { getGroup().cs = new TaylorColourScheme(); refresh(); } - protected void hydrophobicityColour_actionPerformed(ActionEvent e) + protected void hydrophobicityColour_actionPerformed() { getGroup().cs = new HydrophobicColourScheme(); refresh(); } - protected void helixColour_actionPerformed(ActionEvent e) + protected void helixColour_actionPerformed() { getGroup().cs = new HelixColourScheme(); refresh(); } - protected void strandColour_actionPerformed(ActionEvent e) + protected void strandColour_actionPerformed() { getGroup().cs = new StrandColourScheme(); refresh(); } - protected void turnColour_actionPerformed(ActionEvent e) + protected void turnColour_actionPerformed() { getGroup().cs = new TurnColourScheme(); refresh(); } - protected void buriedColour_actionPerformed(ActionEvent e) + protected void buriedColour_actionPerformed() { getGroup().cs = new BuriedColourScheme(); refresh(); } - public void nucleotideMenuItem_actionPerformed(ActionEvent e) + public void nucleotideMenuItem_actionPerformed() { getGroup().cs = new NucleotideColourScheme(); refresh(); } - protected void abovePIDColour_itemStateChanged(ItemEvent ie) + protected void abovePIDColour_itemStateChanged() { SequenceGroup sg = getGroup(); if(sg.cs==null) @@ -432,12 +366,12 @@ public class APopupMenu } - protected void userDefinedColour_actionPerformed(ActionEvent e) + protected void userDefinedColour_actionPerformed() { new UserDefinedColours(ap, getGroup()); } - protected void PIDColour_actionPerformed(ActionEvent e) + protected void PIDColour_actionPerformed() { SequenceGroup sg = getGroup(); sg.cs = new PIDColourScheme(); @@ -446,7 +380,7 @@ public class APopupMenu refresh(); } - protected void BLOSUM62Colour_actionPerformed(ActionEvent e) + protected void BLOSUM62Colour_actionPerformed() { SequenceGroup sg = getGroup(); @@ -458,13 +392,13 @@ public class APopupMenu refresh(); } - protected void noColourmenuItem_actionPerformed(ActionEvent e) + protected void noColourmenuItem_actionPerformed() { getGroup().cs = null; refresh(); } - protected void conservationMenuItem_itemStateChanged(ItemEvent ie) + protected void conservationMenuItem_itemStateChanged() { SequenceGroup sg = getGroup(); if(sg.cs==null) @@ -506,7 +440,7 @@ public class APopupMenu return sg; } - void unGroupMenuItem_actionPerformed(ActionEvent e) + void unGroupMenuItem_actionPerformed() { SequenceGroup sg = ap.av.getSelectionGroup(); ap.av.alignment.deleteGroup(sg); @@ -514,19 +448,19 @@ public class APopupMenu ap.repaint(); } - public void showColourText_itemStateChanged(ItemEvent itemEvent) + public void showColourText_itemStateChanged() { getGroup().setColourText(showColourText.getState()); refresh(); } - public void showText_itemStateChanged(ItemEvent itemEvent) + public void showText_itemStateChanged() { getGroup().setDisplayText(showText.getState()); refresh(); } - public void showBoxes_itemStateChanged(ItemEvent itemEvent) + public void showBoxes_itemStateChanged() { getGroup().setDisplayBoxes(showBoxes.getState()); refresh(); diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 0670a31..ee84bd3 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -31,10 +31,11 @@ import java.io.BufferedReader; import java.net.URL; -public class AlignFrame extends Frame +public class AlignFrame extends Frame implements ActionListener, + ItemListener, KeyListener, MouseListener { - final AlignmentPanel alignPanel; - public final AlignViewport viewport; + public AlignmentPanel alignPanel; + public AlignViewport viewport; int NEW_WINDOW_WIDTH = 700; int NEW_WINDOW_HEIGHT = 500; jalview.bin.JalviewLite applet; @@ -52,8 +53,8 @@ public class AlignFrame extends Frame this.applet = applet; viewport = new AlignViewport(al, applet); alignPanel = new AlignmentPanel(this, viewport); - add(alignPanel); - alignPanel.validate(); + + annotationPanelMenuItem.setState(viewport.showAnnotation); if(applet!=null) { @@ -61,9 +62,9 @@ public class AlignFrame extends Frame if (param != null) { if (param.equalsIgnoreCase("Id")) - sortIDMenuItem_actionPerformed(null); + sortIDMenuItem_actionPerformed(); else if (param.equalsIgnoreCase("Pairwise Identity")) - sortPairwiseMenuItem_actionPerformed(null); + sortPairwiseMenuItem_actionPerformed(); } param = applet.getParameter("wrap"); @@ -72,7 +73,7 @@ public class AlignFrame extends Frame if (param.equalsIgnoreCase("true")) { wrapMenuItem.setState(true); - wrapMenuItem_actionPerformed(null); + wrapMenuItem_actionPerformed(); } } @@ -96,20 +97,11 @@ public class AlignFrame extends Frame } - MyKeyAdapter keyAdapter = new MyKeyAdapter(); //Some JVMS send keyevents to Top frame or lowest panel, //Havent worked out why yet. So add to both this frame and seqCanvas for now - this.addKeyListener(keyAdapter); - alignPanel.seqPanel.seqCanvas.addKeyListener(keyAdapter); - alignPanel.idPanel.idCanvas.addKeyListener(keyAdapter); - - this.addWindowListener(new WindowAdapter() - { - public void windowClosing(WindowEvent e) - { - closeMenuItem_actionPerformed(null); - } - }); + this.addKeyListener(this); + alignPanel.seqPanel.seqCanvas.addKeyListener(this); + alignPanel.idPanel.idCanvas.addKeyListener(this); viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener() { @@ -122,11 +114,13 @@ public class AlignFrame extends Frame } }); - jalview.bin.JalviewLite.addFrame(this, title, - NEW_WINDOW_WIDTH, - NEW_WINDOW_HEIGHT); - } + add(alignPanel, BorderLayout.CENTER); + jalview.bin.JalviewLite.addFrame(this, title, NEW_WINDOW_WIDTH, NEW_WINDOW_HEIGHT); + + alignPanel.validate(); + alignPanel.repaint(); + } public AlignViewport getAlignViewport() { return viewport; @@ -219,64 +213,199 @@ public class AlignFrame extends Frame } } - - class MyKeyAdapter extends KeyAdapter + public void keyPressed(KeyEvent evt) { - - public void keyPressed(KeyEvent evt) + switch (evt.getKeyCode()) { - switch (evt.getKeyCode()) - { - case 27: // escape key - deselectAllSequenceMenuItem_actionPerformed(null); - break; - case KeyEvent.VK_X: - if (evt.isControlDown() || evt.isMetaDown()) - { - cut_actionPerformed(null); - } - break; - case KeyEvent.VK_C: - if (evt.isControlDown() || evt.isMetaDown()) - { - copy_actionPerformed(null); - } - break; - case KeyEvent.VK_V: - if (evt.isControlDown() || evt.isMetaDown()) - { - paste(true); - } - break; - case KeyEvent.VK_A: - if (evt.isControlDown() || evt.isMetaDown()) - { - selectAllSequenceMenuItem_actionPerformed(null); - } - break; - case KeyEvent.VK_DOWN: - moveSelectedSequences(false); - break; - case KeyEvent.VK_UP: - moveSelectedSequences(true); - break; - case KeyEvent.VK_F: - if (evt.isControlDown()) - { - findMenuItem_actionPerformed(null); - } - break; - case KeyEvent.VK_BACK_SPACE: - case KeyEvent.VK_DELETE: - cut_actionPerformed(null); - break; - - } + case 27: // escape key + deselectAllSequenceMenuItem_actionPerformed(); + break; + case KeyEvent.VK_X: + if (evt.isControlDown() || evt.isMetaDown()) + { + cut_actionPerformed(); + } + break; + case KeyEvent.VK_C: + if (evt.isControlDown() || evt.isMetaDown()) + { + copy_actionPerformed(); + } + break; + case KeyEvent.VK_V: + if (evt.isControlDown() || evt.isMetaDown()) + { + paste(true); + } + break; + case KeyEvent.VK_A: + if (evt.isControlDown() || evt.isMetaDown()) + { + selectAllSequenceMenuItem_actionPerformed(); + } + break; + case KeyEvent.VK_DOWN: + moveSelectedSequences(false); + break; + case KeyEvent.VK_UP: + moveSelectedSequences(true); + break; + case KeyEvent.VK_F: + if (evt.isControlDown()) + { + findMenuItem_actionPerformed(); + } + break; + case KeyEvent.VK_BACK_SPACE: + case KeyEvent.VK_DELETE: + cut_actionPerformed(); + break; } } - - - public void inputText_actionPerformed(ActionEvent e) + public void keyReleased(KeyEvent evt) + {} + public void keyTyped(KeyEvent evt) + {} + +public void itemStateChanged(ItemEvent evt) + { + if(evt.getSource()==colourTextMenuItem) + colourTextMenuItem_actionPerformed(); + else if(evt.getSource()==wrapMenuItem) + wrapMenuItem_actionPerformed(); + else if(evt.getSource()==scaleAbove) + scaleAbove_actionPerformed(); + else if(evt.getSource()==scaleLeft) + scaleLeft_actionPerformed(); + else if(evt.getSource()==scaleRight) + scaleRight_actionPerformed(); + else if(evt.getSource()==seqLimits) + seqLimits_itemStateChanged(); + else if(evt.getSource()==viewBoxesMenuItem) + viewBoxesMenuItem_actionPerformed(); + else if(evt.getSource()==viewTextMenuItem) + viewTextMenuItem_actionPerformed(); + else if(evt.getSource()==renderGapsMenuItem) + renderGapsMenuItem_actionPerformed(); + else if(evt.getSource()==annotationPanelMenuItem) + annotationPanelMenuItem_actionPerformed(); + else if(evt.getSource()==conservationMenuItem) + conservationMenuItem_actionPerformed(); + else if(evt.getSource()==abovePIDThreshold) + abovePIDThreshold_actionPerformed(); + else if(evt.getSource()==applyToAllGroups) + applyToAllGroups_actionPerformed(); + } + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==inputText) + inputText_actionPerformed(); + else if(evt.getSource()==closeMenuItem) + closeMenuItem_actionPerformed(); + else if(evt.getSource()==copy) + copy_actionPerformed(); + else if(evt.getSource()==undoMenuItem) + undoMenuItem_actionPerformed(); + else if(evt.getSource()==redoMenuItem) + redoMenuItem_actionPerformed(); + else if(evt.getSource()==inputText) + inputText_actionPerformed(); + else if(evt.getSource()==closeMenuItem) + closeMenuItem_actionPerformed(); + else if(evt.getSource()==undoMenuItem) + undoMenuItem_actionPerformed(); + else if(evt.getSource()==redoMenuItem) + redoMenuItem_actionPerformed(); + else if(evt.getSource()==copy) + copy_actionPerformed(); + else if(evt.getSource()==pasteNew) + pasteNew_actionPerformed(); + else if(evt.getSource()==pasteThis) + pasteThis_actionPerformed(); + else if(evt.getSource()==cut) + cut_actionPerformed(); + else if(evt.getSource()==delete) + delete_actionPerformed(); + else if(evt.getSource()==deleteGroups) + deleteGroups_actionPerformed(); + else if(evt.getSource()==selectAllSequenceMenuItem) + selectAllSequenceMenuItem_actionPerformed(); + else if(evt.getSource()==deselectAllSequenceMenuItem) + deselectAllSequenceMenuItem_actionPerformed(); + else if(evt.getSource()==invertSequenceMenuItem) + invertSequenceMenuItem_actionPerformed(); + else if(evt.getSource()==remove2LeftMenuItem) + remove2LeftMenuItem_actionPerformed(); + else if(evt.getSource()==remove2RightMenuItem) + remove2RightMenuItem_actionPerformed(); + else if(evt.getSource()==removeGappedColumnMenuItem) + removeGappedColumnMenuItem_actionPerformed(); + else if(evt.getSource()==removeAllGapsMenuItem) + removeAllGapsMenuItem_actionPerformed(); + else if(evt.getSource()==findMenuItem) + findMenuItem_actionPerformed(); + else if(evt.getSource()==font) + font_actionPerformed(); + else if(evt.getSource()==overviewMenuItem) + overviewMenuItem_actionPerformed(); + else if(evt.getSource()==noColourmenuItem) + noColourmenuItem_actionPerformed(); + else if(evt.getSource()==clustalColour) + clustalColour_actionPerformed(); + else if(evt.getSource()==zappoColour) + zappoColour_actionPerformed(); + else if(evt.getSource()==taylorColour) + taylorColour_actionPerformed(); + else if(evt.getSource()==hydrophobicityColour) + hydrophobicityColour_actionPerformed(); + else if(evt.getSource()==helixColour) + helixColour_actionPerformed(); + else if(evt.getSource()==strandColour) + strandColour_actionPerformed(); + else if(evt.getSource()==turnColour) + turnColour_actionPerformed(); + else if(evt.getSource()==buriedColour) + buriedColour_actionPerformed(); + else if(evt.getSource()==nucleotideColour) + nucleotideColour_actionPerformed(); + else if(evt.getSource()==modifyPID) + modifyPID_actionPerformed(); + else if(evt.getSource()==modifyConservation) + modifyConservation_actionPerformed(); + else if(evt.getSource()==userDefinedColour) + userDefinedColour_actionPerformed(); + else if(evt.getSource()==PIDColour) + PIDColour_actionPerformed(); + else if(evt.getSource()==BLOSUM62Colour) + BLOSUM62Colour_actionPerformed(); + else if(evt.getSource()==sortPairwiseMenuItem) + sortPairwiseMenuItem_actionPerformed(); + else if(evt.getSource()==sortIDMenuItem) + sortIDMenuItem_actionPerformed(); + else if(evt.getSource()==sortGroupMenuItem) + sortGroupMenuItem_actionPerformed(); + else if(evt.getSource()==removeRedundancyMenuItem) + removeRedundancyMenuItem_actionPerformed(); + else if(evt.getSource()==pairwiseAlignmentMenuItem) + pairwiseAlignmentMenuItem_actionPerformed(); + else if(evt.getSource()==PCAMenuItem) + PCAMenuItem_actionPerformed(); + else if(evt.getSource()==averageDistanceTreeMenuItem) + averageDistanceTreeMenuItem_actionPerformed(); + else if(evt.getSource()==neighbourTreeMenuItem) + neighbourTreeMenuItem_actionPerformed(); + else if(evt.getSource()==njTreeBlosumMenuItem) + njTreeBlosumMenuItem_actionPerformed(); + else if(evt.getSource()==avDistanceTreeBlosumMenuItem) + avTreeBlosumMenuItem_actionPerformed(); + else if(evt.getSource()==documentation) + documentation_actionPerformed(); + else if(evt.getSource()==about) + about_actionPerformed(); + + } + + public void inputText_actionPerformed() { CutAndPasteTransfer cap = new CutAndPasteTransfer(true, applet); Frame frame = new Frame(); @@ -297,11 +426,13 @@ public class AlignFrame extends Frame viewport.showJVSuffix)); } - public void closeMenuItem_actionPerformed(ActionEvent e) + public void closeMenuItem_actionPerformed() { PaintRefresher.components.remove(viewport.alignment); if(PaintRefresher.components.size()==0 && applet==null) System.exit(0); + + this.dispose(); } Stack historyList = new Stack(); @@ -340,7 +471,7 @@ public class AlignFrame extends Frame updateEditMenuBar(); } - protected void undoMenuItem_actionPerformed(ActionEvent e) + protected void undoMenuItem_actionPerformed() { HistoryItem hi = (HistoryItem) historyList.pop(); redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment, @@ -349,7 +480,7 @@ public class AlignFrame extends Frame viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); } - protected void redoMenuItem_actionPerformed(ActionEvent e) + protected void redoMenuItem_actionPerformed() { HistoryItem hi = (HistoryItem) redoList.pop(); restoreHistoryItem(hi); @@ -454,7 +585,7 @@ public class AlignFrame extends Frame } StringBuffer copiedSequences; - protected void copy_actionPerformed(ActionEvent e) + protected void copy_actionPerformed() { if (viewport.getSelectionGroup() == null) { @@ -524,12 +655,12 @@ public class AlignFrame extends Frame } - protected void pasteNew_actionPerformed(ActionEvent e) + protected void pasteNew_actionPerformed() { paste(true); } - protected void pasteThis_actionPerformed(ActionEvent e) + protected void pasteThis_actionPerformed() { addHistoryItem(new HistoryItem("Paste Sequences", viewport.alignment, HistoryItem.PASTE)); @@ -599,13 +730,13 @@ public class AlignFrame extends Frame } - protected void cut_actionPerformed(ActionEvent e) + protected void cut_actionPerformed() { - copy_actionPerformed(null); - delete_actionPerformed(null); + copy_actionPerformed(); + delete_actionPerformed(); } - protected void delete_actionPerformed(ActionEvent e) + protected void delete_actionPerformed() { addHistoryItem(new HistoryItem("Delete Sequences", viewport.alignment, HistoryItem.HIDE)); @@ -660,7 +791,7 @@ public class AlignFrame extends Frame } - protected void deleteGroups_actionPerformed(ActionEvent e) + protected void deleteGroups_actionPerformed() { viewport.alignment.deleteAllGroups(); viewport.setSelectionGroup(null); @@ -668,7 +799,7 @@ public class AlignFrame extends Frame alignPanel.repaint(); } - public void selectAllSequenceMenuItem_actionPerformed(ActionEvent e) + public void selectAllSequenceMenuItem_actionPerformed() { SequenceGroup sg = new SequenceGroup(); for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++) @@ -681,7 +812,7 @@ public class AlignFrame extends Frame PaintRefresher.Refresh(null, viewport.alignment); } - public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e) + public void deselectAllSequenceMenuItem_actionPerformed() { viewport.setSelectionGroup(null); viewport.getColumnSelection().clear(); @@ -691,7 +822,7 @@ public class AlignFrame extends Frame PaintRefresher.Refresh(null, viewport.alignment); } - public void invertSequenceMenuItem_actionPerformed(ActionEvent e) + public void invertSequenceMenuItem_actionPerformed() { SequenceGroup sg = viewport.getSelectionGroup(); for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++) @@ -702,7 +833,7 @@ public class AlignFrame extends Frame PaintRefresher.Refresh(null, viewport.alignment); } - public void remove2LeftMenuItem_actionPerformed(ActionEvent e) + public void remove2LeftMenuItem_actionPerformed() { ColumnSelection colSel = viewport.getColumnSelection(); if (colSel.size() > 0) @@ -731,7 +862,7 @@ public class AlignFrame extends Frame } } - public void remove2RightMenuItem_actionPerformed(ActionEvent e) + public void remove2RightMenuItem_actionPerformed() { ColumnSelection colSel = viewport.getColumnSelection(); if (colSel.size() > 0) @@ -759,7 +890,7 @@ public class AlignFrame extends Frame } - public void removeGappedColumnMenuItem_actionPerformed(ActionEvent e) + public void removeGappedColumnMenuItem_actionPerformed() { addHistoryItem(new HistoryItem("Remove Gapped Columns", viewport.alignment, @@ -777,7 +908,7 @@ public class AlignFrame extends Frame viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); } - public void removeAllGapsMenuItem_actionPerformed(ActionEvent e) + public void removeAllGapsMenuItem_actionPerformed() { addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment, HistoryItem.HIDE)); @@ -905,18 +1036,18 @@ public class AlignFrame extends Frame - public void findMenuItem_actionPerformed(ActionEvent e) + public void findMenuItem_actionPerformed() { new Finder(alignPanel); } - public void font_actionPerformed(ActionEvent e) + public void font_actionPerformed() { new FontChooser(alignPanel); } - public void seqLimits_itemStateChanged(ItemEvent e) + public void seqLimits_itemStateChanged() { viewport.setShowJVSuffix(seqLimits.getState()); alignPanel.fontChanged(); @@ -924,13 +1055,13 @@ public class AlignFrame extends Frame } - protected void colourTextMenuItem_actionPerformed(ActionEvent e) + protected void colourTextMenuItem_actionPerformed() { viewport.setColourText(colourTextMenuItem.getState()); alignPanel.repaint(); } - protected void wrapMenuItem_actionPerformed(ActionEvent e) + protected void wrapMenuItem_actionPerformed() { viewport.setWrapAlignment(wrapMenuItem.getState()); alignPanel.setWrapAlignment(wrapMenuItem.getState()); @@ -940,49 +1071,49 @@ public class AlignFrame extends Frame alignPanel.repaint(); } - protected void scaleAbove_actionPerformed(ActionEvent e) + protected void scaleAbove_actionPerformed() { viewport.setScaleAboveWrapped(scaleAbove.getState()); alignPanel.repaint(); } - protected void scaleLeft_actionPerformed(ActionEvent e) + protected void scaleLeft_actionPerformed() { viewport.setScaleLeftWrapped(scaleLeft.getState()); alignPanel.repaint(); } - protected void scaleRight_actionPerformed(ActionEvent e) + protected void scaleRight_actionPerformed() { viewport.setScaleRightWrapped(scaleRight.getState()); alignPanel.repaint(); } - public void viewBoxesMenuItem_actionPerformed(ActionEvent e) + public void viewBoxesMenuItem_actionPerformed() { viewport.setShowBoxes(viewBoxesMenuItem.getState()); alignPanel.repaint(); } - public void viewTextMenuItem_actionPerformed(ActionEvent e) + public void viewTextMenuItem_actionPerformed() { viewport.setShowText(viewTextMenuItem.getState()); alignPanel.repaint(); } - protected void renderGapsMenuItem_actionPerformed(ActionEvent e) + protected void renderGapsMenuItem_actionPerformed() { viewport.setRenderGaps(renderGapsMenuItem.getState()); alignPanel.repaint(); } - public void annotationPanelMenuItem_actionPerformed(ActionEvent e) + public void annotationPanelMenuItem_actionPerformed() { viewport.setShowAnnotation(annotationPanelMenuItem.getState()); alignPanel.setAnnotationVisible(annotationPanelMenuItem.getState()); } - public void overviewMenuItem_actionPerformed(ActionEvent e) + public void overviewMenuItem_actionPerformed() { if (alignPanel.overviewPanel != null) { @@ -1010,59 +1141,59 @@ public class AlignFrame extends Frame } - protected void noColourmenuItem_actionPerformed(ActionEvent e) + protected void noColourmenuItem_actionPerformed() { changeColour(null); } - public void clustalColour_actionPerformed(ActionEvent e) + public void clustalColour_actionPerformed() { abovePIDThreshold.setState(false); changeColour(new ClustalxColourScheme(viewport.alignment.getSequences(), viewport.alignment.getWidth())); } - public void zappoColour_actionPerformed(ActionEvent e) + public void zappoColour_actionPerformed() { changeColour(new ZappoColourScheme()); } - public void taylorColour_actionPerformed(ActionEvent e) + public void taylorColour_actionPerformed() { changeColour(new TaylorColourScheme()); } - public void hydrophobicityColour_actionPerformed(ActionEvent e) + public void hydrophobicityColour_actionPerformed() { changeColour(new HydrophobicColourScheme()); } - public void helixColour_actionPerformed(ActionEvent e) + public void helixColour_actionPerformed() { changeColour(new HelixColourScheme()); } - public void strandColour_actionPerformed(ActionEvent e) + public void strandColour_actionPerformed() { changeColour(new StrandColourScheme()); } - public void turnColour_actionPerformed(ActionEvent e) + public void turnColour_actionPerformed() { changeColour(new TurnColourScheme()); } - public void buriedColour_actionPerformed(ActionEvent e) + public void buriedColour_actionPerformed() { changeColour(new BuriedColourScheme()); } - public void nucleotideColour_actionPerformed(ActionEvent e) + public void nucleotideColour_actionPerformed() { changeColour(new NucleotideColourScheme()); } - protected void applyToAllGroups_actionPerformed(ActionEvent e) + protected void applyToAllGroups_actionPerformed() { viewport.setColourAppliesToAllGroups(applyToAllGroups.getState()); } @@ -1183,7 +1314,7 @@ public class AlignFrame extends Frame - protected void modifyPID_actionPerformed(ActionEvent e) + protected void modifyPID_actionPerformed() { if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null) { @@ -1193,7 +1324,7 @@ public class AlignFrame extends Frame } } - protected void modifyConservation_actionPerformed(ActionEvent e) + protected void modifyConservation_actionPerformed() { if (viewport.getConservationSelected() && viewport.globalColourScheme!=null) { @@ -1203,7 +1334,7 @@ public class AlignFrame extends Frame } } - protected void conservationMenuItem_actionPerformed(ActionEvent e) + protected void conservationMenuItem_actionPerformed() { viewport.setConservationSelected(conservationMenuItem.getState()); @@ -1212,10 +1343,10 @@ public class AlignFrame extends Frame changeColour(viewport.getGlobalColourScheme()); - modifyConservation_actionPerformed(null); + modifyConservation_actionPerformed(); } - public void abovePIDThreshold_actionPerformed(ActionEvent e) + public void abovePIDThreshold_actionPerformed() { viewport.setAbovePIDThreshold(abovePIDThreshold.getState()); @@ -1224,25 +1355,25 @@ public class AlignFrame extends Frame changeColour(viewport.getGlobalColourScheme()); - modifyPID_actionPerformed(null); + modifyPID_actionPerformed(); } - public void userDefinedColour_actionPerformed(ActionEvent e) + public void userDefinedColour_actionPerformed() { new UserDefinedColours(alignPanel, null); } - public void PIDColour_actionPerformed(ActionEvent e) + public void PIDColour_actionPerformed() { changeColour(new PIDColourScheme()); } - public void BLOSUM62Colour_actionPerformed(ActionEvent e) + public void BLOSUM62Colour_actionPerformed() { changeColour(new Blosum62ColourScheme()); } - public void sortPairwiseMenuItem_actionPerformed(ActionEvent e) + public void sortPairwiseMenuItem_actionPerformed() { addHistoryItem(new HistoryItem("Pairwise Sort", viewport.alignment, HistoryItem.SORT)); @@ -1251,7 +1382,7 @@ public class AlignFrame extends Frame alignPanel.repaint(); } - public void sortIDMenuItem_actionPerformed(ActionEvent e) + public void sortIDMenuItem_actionPerformed() { addHistoryItem(new HistoryItem("ID Sort", viewport.alignment, HistoryItem.SORT)); @@ -1259,7 +1390,7 @@ public class AlignFrame extends Frame alignPanel.repaint(); } - public void sortGroupMenuItem_actionPerformed(ActionEvent e) + public void sortGroupMenuItem_actionPerformed() { addHistoryItem(new HistoryItem("Group Sort", viewport.alignment, HistoryItem.SORT)); @@ -1268,7 +1399,7 @@ public class AlignFrame extends Frame } - public void removeRedundancyMenuItem_actionPerformed(ActionEvent e) + public void removeRedundancyMenuItem_actionPerformed() { RedundancyPanel sp = new RedundancyPanel(alignPanel); Frame frame = new Frame(); @@ -1278,7 +1409,7 @@ public class AlignFrame extends Frame } - public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e) + public void pairwiseAlignmentMenuItem_actionPerformed() { if (viewport.getSelectionGroup().getSize() > 1) { @@ -1288,7 +1419,7 @@ public class AlignFrame extends Frame } } - public void PCAMenuItem_actionPerformed(ActionEvent e) + public void PCAMenuItem_actionPerformed() { //are the sequences aligned? if (!viewport.alignment.isAligned()) @@ -1327,22 +1458,22 @@ public class AlignFrame extends Frame } - public void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e) + public void averageDistanceTreeMenuItem_actionPerformed() { NewTreePanel("AV", "PID", "Average distance tree using PID"); } - public void neighbourTreeMenuItem_actionPerformed(ActionEvent e) + public void neighbourTreeMenuItem_actionPerformed() { NewTreePanel("NJ", "PID", "Neighbour joining tree using PID"); } - protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e) + protected void njTreeBlosumMenuItem_actionPerformed() { NewTreePanel("NJ", "BL", "Neighbour joining tree using BLOSUM62"); } - protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e) + protected void avTreeBlosumMenuItem_actionPerformed() { NewTreePanel("AV", "BL", "Average distance tree using BLOSUM62PID"); } @@ -1394,7 +1525,7 @@ public class AlignFrame extends Frame sortByTreeMenu.add(item); item.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent evt) { addHistoryItem(new HistoryItem("Sort", viewport.alignment, HistoryItem.SORT)); @@ -1412,12 +1543,12 @@ public class AlignFrame extends Frame }); } - protected void documentation_actionPerformed(ActionEvent e) + protected void documentation_actionPerformed() { - showURL("http://www.jalview.org/help.html"); + showURL("http://www.jalview.org/help.html", "HELP"); } - protected void about_actionPerformed(ActionEvent e) + protected void about_actionPerformed() { class AboutPanel extends Canvas @@ -1482,17 +1613,6 @@ public class AlignFrame extends Frame } - /** - * Displays the given URL in a new browser window - * - * @param url URL to display in browser window. - *
New window will be named "HELP_WINDOW" - */ - public void showURL(String url) - { - showURL(url, "HELP"); - } - public void showURL(String url, String target) { if (applet == null) @@ -1574,7 +1694,7 @@ public class AlignFrame extends Frame MenuItem delete = new MenuItem(); MenuItem copy = new MenuItem(); MenuItem cut = new MenuItem(); - Menu Menu1 = new Menu(); + Menu pasteMenu = new Menu(); MenuItem pasteNew = new MenuItem(); MenuItem pasteThis = new MenuItem(); protected CheckboxMenuItem applyToAllGroups = new CheckboxMenuItem(); @@ -1592,8 +1712,17 @@ public class AlignFrame extends Frame MenuItem documentation = new MenuItem(); MenuItem about = new MenuItem(); protected CheckboxMenuItem seqLimits = new CheckboxMenuItem(); - - private void jbInit() throws Exception { + Panel embeddedMenu; + Label embeddedEdit; + Label embeddedSearch; + Label embeddedView; + Label embeddedColour; + Label embeddedFile; + Label embeddedHelp; + Label embeddedCalculate; + FlowLayout flowLayout1; + + private void jbInit() throws Exception { setMenuBar(alignFrameMenuBar); @@ -1617,123 +1746,50 @@ public class AlignFrame extends Frame outputTextboxMenu.add(item); } - fileMenu.setLabel("File"); closeMenuItem.setLabel("Close"); - closeMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - closeMenuItem_actionPerformed(e); - } - }); + closeMenuItem.addActionListener(this); editMenu.setLabel("Edit"); viewMenu.setLabel("View"); colourMenu.setLabel("Colour"); calculateMenu.setLabel("Calculate"); selectAllSequenceMenuItem.setLabel("Select all"); - selectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - selectAllSequenceMenuItem_actionPerformed(e); - } - }); + selectAllSequenceMenuItem.addActionListener(this); deselectAllSequenceMenuItem.setLabel("Deselect All"); - deselectAllSequenceMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - deselectAllSequenceMenuItem_actionPerformed(e); - } - }); + deselectAllSequenceMenuItem.addActionListener(this); invertSequenceMenuItem.setLabel("Invert Selection"); - invertSequenceMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - invertSequenceMenuItem_actionPerformed(e); - } - }); + invertSequenceMenuItem.addActionListener(this); remove2LeftMenuItem.setLabel("Remove Left"); - remove2LeftMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - remove2LeftMenuItem_actionPerformed(e); - } - }); + remove2LeftMenuItem.addActionListener(this); remove2RightMenuItem.setLabel("Remove Right"); - remove2RightMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - remove2RightMenuItem_actionPerformed(e); - } - }); + remove2RightMenuItem.addActionListener(this); removeGappedColumnMenuItem.setLabel("Remove Empty Columns"); - removeGappedColumnMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - removeGappedColumnMenuItem_actionPerformed(e); - } - }); + removeGappedColumnMenuItem.addActionListener(this); removeAllGapsMenuItem.setLabel("Remove All Gaps"); - removeAllGapsMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - removeAllGapsMenuItem_actionPerformed(e); - } - }); + removeAllGapsMenuItem.addActionListener(this); viewBoxesMenuItem.setLabel("Boxes"); viewBoxesMenuItem.setState(true); - viewBoxesMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - viewBoxesMenuItem_actionPerformed(null); - } - }); + viewBoxesMenuItem.addItemListener(this); viewTextMenuItem.setLabel("Text"); viewTextMenuItem.setState(true); - viewTextMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - viewTextMenuItem_actionPerformed(null); - } - }); + viewTextMenuItem.addItemListener(this); sortPairwiseMenuItem.setLabel("by Pairwise Identity"); - sortPairwiseMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - sortPairwiseMenuItem_actionPerformed(e); - } - }); + sortPairwiseMenuItem.addActionListener(this); sortIDMenuItem.setLabel("by ID"); - sortIDMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - sortIDMenuItem_actionPerformed(e); - } - }); + sortIDMenuItem.addActionListener(this); sortGroupMenuItem.setLabel("by Group"); - sortGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - sortGroupMenuItem_actionPerformed(e); - } - }); + sortGroupMenuItem.addActionListener(this); removeRedundancyMenuItem.setLabel("Remove Redundancy..."); - removeRedundancyMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - removeRedundancyMenuItem_actionPerformed(e); - } - }); + removeRedundancyMenuItem.addActionListener(this); pairwiseAlignmentMenuItem.setLabel("Pairwise Alignments..."); - pairwiseAlignmentMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - pairwiseAlignmentMenuItem_actionPerformed(e); - } - }); + pairwiseAlignmentMenuItem.addActionListener(this); PCAMenuItem.setLabel("Principal Component Analysis"); - PCAMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - PCAMenuItem_actionPerformed(e); - } - }); + PCAMenuItem.addActionListener(this); averageDistanceTreeMenuItem.setLabel( "Average Distance Using % Identity"); - averageDistanceTreeMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - averageDistanceTreeMenuItem_actionPerformed(e); - } - }); + averageDistanceTreeMenuItem.addActionListener(this); neighbourTreeMenuItem.setLabel("Neighbour Joining Using % Identity"); - neighbourTreeMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - neighbourTreeMenuItem_actionPerformed(e); - } - }); + neighbourTreeMenuItem.addActionListener(this); alignFrameMenuBar.setFont(new java.awt.Font("Verdana", 0, 11)); statusBar.setBackground(Color.white); statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); @@ -1741,281 +1797,109 @@ public class AlignFrame extends Frame outputTextboxMenu.setLabel("Output to Textbox"); clustalColour.setLabel("Clustalx"); - clustalColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - clustalColour_actionPerformed(e); - } - }); + clustalColour.addActionListener(this); zappoColour.setLabel("Zappo"); - zappoColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - zappoColour_actionPerformed(e); - } - }); + zappoColour.addActionListener(this); taylorColour.setLabel("Taylor"); - taylorColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - taylorColour_actionPerformed(e); - } - }); + taylorColour.addActionListener(this); hydrophobicityColour.setLabel("Hydrophobicity"); - hydrophobicityColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - hydrophobicityColour_actionPerformed(e); - } - }); + hydrophobicityColour.addActionListener(this); helixColour.setLabel("Helix Propensity"); - helixColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - helixColour_actionPerformed(e); - } - }); + helixColour.addActionListener(this); strandColour.setLabel("Strand Propensity"); - strandColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - strandColour_actionPerformed(e); - } - }); + strandColour.addActionListener(this); turnColour.setLabel("Turn Propensity"); - turnColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - turnColour_actionPerformed(e); - } - }); + turnColour.addActionListener(this); buriedColour.setLabel("Buried Index"); - buriedColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - buriedColour_actionPerformed(e); - } - }); + buriedColour.addActionListener(this); userDefinedColour.setLabel("User Defined..."); - userDefinedColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - userDefinedColour_actionPerformed(e); - } - }); + userDefinedColour.addActionListener(this); PIDColour.setLabel("Percentage Identity"); - PIDColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - PIDColour_actionPerformed(e); - } - }); + PIDColour.addActionListener(this); BLOSUM62Colour.setLabel("BLOSUM62 Score"); - BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - BLOSUM62Colour_actionPerformed(e); - } - }); + BLOSUM62Colour.addActionListener(this); avDistanceTreeBlosumMenuItem.setLabel( "Average Distance Using BLOSUM62"); - avDistanceTreeBlosumMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - avTreeBlosumMenuItem_actionPerformed(e); - } - }); + avDistanceTreeBlosumMenuItem.addActionListener(this); njTreeBlosumMenuItem.setLabel("Neighbour Joining Using BLOSUM62"); - njTreeBlosumMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - njTreeBlosumMenuItem_actionPerformed(e); - } - }); - annotationPanelMenuItem.setActionCommand(""); - annotationPanelMenuItem.setState(true); + njTreeBlosumMenuItem.addActionListener(this); annotationPanelMenuItem.setLabel("Show Annotations"); - annotationPanelMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - annotationPanelMenuItem_actionPerformed(null); - } - }); + annotationPanelMenuItem.addItemListener(this); colourTextMenuItem.setLabel("Colour Text"); - colourTextMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - colourTextMenuItem_actionPerformed(null); - } - }); + colourTextMenuItem.addItemListener(this); overviewMenuItem.setLabel("Overview Window"); - overviewMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - overviewMenuItem_actionPerformed(e); - } - }); + overviewMenuItem.addActionListener(this); undoMenuItem.setEnabled(false); undoMenuItem.setLabel("Undo"); - undoMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - undoMenuItem_actionPerformed(e); - } - }); + undoMenuItem.addActionListener(this); redoMenuItem.setEnabled(false); redoMenuItem.setLabel("Redo"); - redoMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - redoMenuItem_actionPerformed(e); - } - }); + redoMenuItem.addActionListener(this); conservationMenuItem.setLabel("by Conservation"); - conservationMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - conservationMenuItem_actionPerformed(null); - } - }); + conservationMenuItem.addItemListener(this); noColourmenuItem.setLabel("None"); - noColourmenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - noColourmenuItem_actionPerformed(e); - } - }); + noColourmenuItem.addActionListener(this); wrapMenuItem.setLabel("Wrap"); - wrapMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - wrapMenuItem_actionPerformed(null); - } - }); + wrapMenuItem.addItemListener(this); renderGapsMenuItem.setLabel("Show Gaps"); renderGapsMenuItem.setState(true); - renderGapsMenuItem.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - renderGapsMenuItem_actionPerformed(null); - } - }); + renderGapsMenuItem.addItemListener(this); findMenuItem.setLabel("Find..."); - findMenuItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - findMenuItem_actionPerformed(e); - } - }); + findMenuItem.addActionListener(this); searchMenu.setLabel("Search"); abovePIDThreshold.setLabel("Above Identity Threshold"); - abovePIDThreshold.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - abovePIDThreshold_actionPerformed(null); - } - }); + abovePIDThreshold.addItemListener(this); nucleotideColour.setLabel("Nucleotide"); - nucleotideColour.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - nucleotideColour_actionPerformed(e); - } - }); + nucleotideColour.addActionListener(this); deleteGroups.setLabel("Undefine Groups"); - deleteGroups.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - deleteGroups_actionPerformed(e); - } - }); + deleteGroups.addActionListener(this); copy.setLabel("Copy"); - copy.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - copy_actionPerformed(e); - } - }); + copy.addActionListener(this); cut.setLabel("Cut"); - cut.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - cut_actionPerformed(e); - } - }); + cut.addActionListener(this); delete.setLabel("Delete"); - delete.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - delete_actionPerformed(e); - } - }); - Menu1.setLabel("Paste"); + delete.addActionListener(this); + pasteMenu.setLabel("Paste"); pasteNew.setLabel("To New Alignment"); - pasteNew.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - pasteNew_actionPerformed(e); - } - }); + pasteNew.addActionListener(this); pasteThis.setLabel("Add To This Alignment"); - pasteThis.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - pasteThis_actionPerformed(e); - } - }); + pasteThis.addActionListener(this); applyToAllGroups.setLabel("Apply Colour To All Groups"); applyToAllGroups.setState(true); - applyToAllGroups.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - applyToAllGroups_actionPerformed(null); - } - }); + applyToAllGroups.addItemListener(this); font.setLabel("Font..."); - font.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - font_actionPerformed(e); - } - }); + font.addActionListener(this); scaleAbove.setLabel("Scale Above"); scaleAbove.setState(true); - scaleAbove.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - scaleAbove_actionPerformed(null); - } - }); + scaleAbove.addItemListener(this); scaleLeft.setEnabled(false); scaleLeft.setState(true); scaleLeft.setLabel("Scale Left"); - scaleLeft.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - scaleLeft_actionPerformed(null); - } - }); + scaleLeft.addItemListener(this); scaleRight.setEnabled(false); scaleRight.setState(true); scaleRight.setLabel("Scale Right"); - scaleRight.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - scaleRight_actionPerformed(null); - } - }); + scaleRight.addItemListener(this); modifyPID.setLabel("Modify Identity Threshold..."); - modifyPID.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - modifyPID_actionPerformed(e); - } - }); + modifyPID.addActionListener(this); modifyConservation.setLabel("Modify Conservation Threshold..."); - modifyConservation.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - modifyConservation_actionPerformed(e); - } - }); + modifyConservation.addActionListener(this); sortByTreeMenu.setLabel("By Tree Order"); sort.setLabel("Sort"); calculate.setLabel("Calculate Tree"); inputText.setLabel("Input from textbox"); - inputText.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - inputText_actionPerformed(e); - } - }); + inputText.addActionListener(this); helpMenu.setLabel("Help"); documentation.setLabel("Documentation"); - documentation.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - documentation_actionPerformed(e); - } - }); + documentation.addActionListener(this); about.setLabel("About..."); - about.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - about_actionPerformed(e); - } - }); + about.addActionListener(this); seqLimits.setState(true); seqLimits.setLabel("Show Sequence Limits"); - seqLimits.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - seqLimits_itemStateChanged(e); - } - }); + seqLimits.addItemListener(this); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -2032,7 +1916,7 @@ public class AlignFrame extends Frame editMenu.add(redoMenuItem); editMenu.add(cut); editMenu.add(copy); - editMenu.add(Menu1); + editMenu.add(pasteMenu); editMenu.add(delete); editMenu.addSeparator(); editMenu.add(selectAllSequenceMenuItem); @@ -2088,8 +1972,8 @@ public class AlignFrame extends Frame calculateMenu.add(pairwiseAlignmentMenuItem); calculateMenu.add(PCAMenuItem); this.add(statusBar, BorderLayout.SOUTH); - Menu1.add(pasteNew); - Menu1.add(pasteThis); + pasteMenu.add(pasteNew); + pasteMenu.add(pasteThis); sort.add(sortIDMenuItem); sort.add(sortByTreeMenu); sort.add(sortGroupMenuItem); @@ -2100,6 +1984,147 @@ public class AlignFrame extends Frame calculate.add(njTreeBlosumMenuItem); helpMenu.add(documentation); helpMenu.add(about); + } + + public void setEmbedded() + { + + embeddedMenu = new Panel(); + embeddedEdit = new Label(); + embeddedSearch = new Label(); + embeddedView = new Label(); + embeddedColour = new Label(); + embeddedFile = new Label(); + embeddedHelp = new Label(); + embeddedCalculate = new Label(); + flowLayout1 = new FlowLayout(); + embeddedMenu.setBackground(Color.lightGray); + embeddedMenu.setLayout(flowLayout1); + embeddedEdit.setText("Edit"); + embeddedEdit.setAlignment(Label.CENTER); + embeddedEdit.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedSearch.setText("Search"); + embeddedSearch.setAlignment(Label.CENTER); + embeddedSearch.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedView.setText("View"); + embeddedView.setAlignment(Label.CENTER); + embeddedView.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedColour.setText("Colour"); + embeddedColour.setAlignment(Label.CENTER); + embeddedColour.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedFile.setAlignment(Label.CENTER); + embeddedFile.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedFile.setText("File"); + embeddedHelp.setAlignment(Label.CENTER); + embeddedHelp.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedHelp.setText("Help"); + embeddedCalculate.setAlignment(Label.CENTER); + embeddedCalculate.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); + embeddedCalculate.setText("Calculate"); + embeddedMenu.add(embeddedFile); + embeddedMenu.add(embeddedEdit); + embeddedMenu.add(embeddedSearch); + embeddedMenu.add(embeddedView); + embeddedMenu.add(embeddedColour); + embeddedMenu.add(embeddedCalculate); + embeddedMenu.add(embeddedHelp); + flowLayout1.setAlignment(FlowLayout.LEFT); + flowLayout1.setHgap(0); + flowLayout1.setVgap(0); + embeddedFile.addMouseListener(this); + embeddedEdit.addMouseListener(this); + embeddedSearch.addMouseListener(this); + embeddedView.addMouseListener(this); + embeddedColour.addMouseListener(this); + embeddedCalculate.addMouseListener(this); + embeddedHelp.addMouseListener(this); + + setVisible(false); + fileMenu.remove(closeMenuItem); + fileMenu.remove(2); // Seperator + + applet.setLayout(new BorderLayout()); + applet.add(embeddedMenu, BorderLayout.NORTH); + applet.add(statusBar, BorderLayout.SOUTH); + applet.validate(); + + + alignPanel.setSize(applet.size().width, applet.size().height + - embeddedMenu.HEIGHT - statusBar.HEIGHT); + + applet.add(alignPanel, BorderLayout.CENTER); + applet.validate(); + } + + + + PopupMenu filePopup, editPopup, searchPopup, + viewPopup, colourPopup, calculatePopup, helpPopup; + + public void mousePressed(MouseEvent evt) + { + PopupMenu popup = null; + Label source = (Label)evt.getSource(); + if(source==embeddedFile) + { + popup = filePopup = genPopupMenu(filePopup, fileMenu); + } + else if(source==embeddedEdit) + { + popup = editPopup = genPopupMenu(editPopup, editMenu); + } + else if(source==embeddedSearch) + { + popup = searchPopup = genPopupMenu(searchPopup, searchMenu); } + else if(source==embeddedView) + { + popup = viewPopup = genPopupMenu(viewPopup, viewMenu); + } + else if(source==embeddedColour) + { + popup = colourPopup = genPopupMenu(colourPopup, colourMenu); + } + else if(source==embeddedCalculate) + { + popup = calculatePopup = genPopupMenu(calculatePopup, calculateMenu); + } + else if(source==embeddedHelp) + { + popup = helpPopup = genPopupMenu(helpPopup, helpMenu); + } + + embeddedMenu.add(popup); + popup.show(embeddedMenu, + source.getBounds().x, + source.getBounds().y + source.getBounds().getSize().height); + } + + PopupMenu genPopupMenu(PopupMenu popup, Menu original) + { + if(popup!=null) + { + return popup; + } + popup = new PopupMenu(); + int m, mSize = original.getItemCount(); + for(m=0; m start - || av.getEndRes() < end - || (av.getStartSeq() > results[0] - || av.getEndSeq() < results[0])) + + if(!av.wrapAlignment) { - setScrollValues(start, results[0]); + if ( (av.getStartRes() > start) || (av.getEndRes() < end) || + ( (av.getStartSeq() > results[0]) || + (av.getEndSeq() < results[0]))) + { + int newy = results[0]; + if(start > av.alignment.getWidth() - hextent) + { + start = av.alignment.getWidth() - hextent; + if(start<0) + start = 0; + } + if(newy > av.alignment.getHeight() - vextent) + { + newy = av.alignment.getHeight() - vextent; + if(newy<0) + newy = 0; + } + setScrollValues(start, newy); + } + } + else + { + int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width); + if( start(av.getStartRes()+cwidth) ) + { + + vscroll.setValue(start / cwidth); + av.startRes = vscroll.getValue() * cwidth; + } } } + repaint(); } public OverviewPanel getOverviewPanel() @@ -234,6 +257,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { av.startSeq = 0; scalePanelHolder.setVisible(!wrap); + + hscroll.setVisible(!wrap); idwidthAdjuster.setVisible(!wrap); @@ -248,8 +273,11 @@ public class AlignmentPanel extends Panel implements AdjustmentListener annotationSpaceFillerHolder.setVisible(true); } + idSpaceFillerPanel1.setVisible(!wrap); + fontChanged();//This is so that the scalePanel is resized correctly + validate(); repaint(); @@ -365,7 +393,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener int oldX = av.getStartRes(); int oldY = av.getStartSeq(); - if (evt.getSource() == hscroll) + if (evt==null || evt.getSource() == hscroll) { int x = hscroll.getValue(); av.setStartRes(x); @@ -373,7 +401,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener 1); } - if (evt.getSource() == vscroll) + if (evt==null || evt.getSource() == vscroll) { int offy = vscroll.getValue(); if (av.getWrapAlignment()) @@ -409,6 +437,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener scalePanel.repaint(); if (av.getShowAnnotation()) { + annotationPanel.fastPaint(av.getStartRes() - oldX); } } diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index 1df7455..3ef61e6 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -181,14 +181,14 @@ public class AnnotationLabels x = width - fm.stringWidth(aa[i].label) - 3; - if (aa[i].isGraph) + if (aa[i].graph>0) { y += (aa[i].height / 3); } g.drawString(aa[i].label, x, y); - if (aa[i].isGraph) + if (aa[i].graph>0) { y += (2 * aa[i].height / 3); } diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java index a1597f8..a71e439 100755 --- a/src/jalview/appletgui/AnnotationPanel.java +++ b/src/jalview/appletgui/AnnotationPanel.java @@ -108,7 +108,7 @@ public class AnnotationPanel aa[i].height += 16; } - if (aa[i].isGraph) + if (aa[i].graph>0) { aa[i].height += GRAPH_HEIGHT; } @@ -307,7 +307,7 @@ public class AnnotationPanel } - if (row.isGraph) + if (row.graph>0) { // this is so that we draw the characters below the graph y += row.height; @@ -351,7 +351,7 @@ public class AnnotationPanel 0))) / 2; g.setColor(row.annotations[j].colour); - if (j == 0 || row.isGraph) + if (j == 0 || row.graph>0) { g.drawString(row.annotations[j].displayCharacter, x+charOffset, y + iconOffset + 3); @@ -416,31 +416,12 @@ public class AnnotationPanel } } - if (validRes && row.isGraph) + if (validRes && row.graph>0) { g.setColor(new Color(0, 0, 180)); int height = (int) ((row.annotations[j].value / row.graphMax) * GRAPH_HEIGHT); - if (row.windowLength > 1) - { - int total = 0; - - for (int i2 = j - (row.windowLength / 2); - i2 < (j + (row.windowLength / 2)); i2++) - { - if ((i2 < 0) || (i2 >= av.alignment.getWidth())) - { - continue; - } - - total += row.annotations[i2].value; - } - - total /= row.windowLength; - height = (int) ((total / row.graphMax) * GRAPH_HEIGHT); - } - g.setColor(row.annotations[j].colour); g.fillRect(x, y - height, av.charWidth, height); } @@ -483,12 +464,12 @@ public class AnnotationPanel } } - if (row.isGraph && row.hasText) + if (row.graph>0 && row.hasText) { y += av.charHeight; } - if (!row.isGraph) + if (row.graph==0) { y += aa[i].height; } diff --git a/src/jalview/appletgui/CutAndPasteTransfer.java b/src/jalview/appletgui/CutAndPasteTransfer.java index ea9a8aa..4fb8ec1 100755 --- a/src/jalview/appletgui/CutAndPasteTransfer.java +++ b/src/jalview/appletgui/CutAndPasteTransfer.java @@ -25,7 +25,7 @@ import java.awt.event.*; import jalview.datamodel.*; import jalview.io.*; -public class CutAndPasteTransfer extends Panel +public class CutAndPasteTransfer extends Panel implements ActionListener, MouseListener { jalview.bin.JalviewLite applet; @@ -67,7 +67,15 @@ public class CutAndPasteTransfer extends Panel textarea.setText(text); } - protected void ok_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==ok) + ok_actionPerformed(); + else if(evt.getSource()==cancel) + cancel_actionPerformed(); + } + + protected void ok_actionPerformed() { String text = getText(); int length = text.length(); @@ -108,7 +116,7 @@ public class CutAndPasteTransfer extends Panel ((Frame)this.getParent()).setVisible(false); } - protected void cancel_actionPerformed(ActionEvent e) + protected void cancel_actionPerformed() { ((Frame)this.getParent()).setVisible(false); } @@ -123,33 +131,25 @@ public class CutAndPasteTransfer extends Panel private void jbInit() throws Exception { textarea.setFont(new java.awt.Font("Monospaced", Font.PLAIN, 10)); textarea.setText("Paste your alignment file here"); - textarea.addMouseListener(new java.awt.event.MouseAdapter() { - public void mousePressed(MouseEvent e) { - textarea_mousePressed(e); - } - }); + textarea.addMouseListener(this); this.setLayout(borderLayout1); ok.setLabel("OK"); - ok.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - ok_actionPerformed(e); - } - }); + ok.addActionListener(this); cancel.setLabel("Cancel"); - cancel.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - cancel_actionPerformed(e); - } - }); + cancel.addActionListener(this); this.add(buttonPanel, BorderLayout.SOUTH); buttonPanel.add(ok, null); buttonPanel.add(cancel, null); this.add(textarea, java.awt.BorderLayout.CENTER); } - void textarea_mousePressed(MouseEvent e) { + public void mousePressed(MouseEvent evt) { if (textarea.getText().startsWith("Paste your")) { textarea.setText(""); - } + } } + public void mouseReleased(MouseEvent evt){} + public void mouseClicked(MouseEvent evt){} + public void mouseEntered(MouseEvent evt){} + public void mouseExited(MouseEvent evt){} } diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index fcca0c1..f59216f 100755 --- a/src/jalview/appletgui/Finder.java +++ b/src/jalview/appletgui/Finder.java @@ -26,7 +26,7 @@ import java.awt.event.*; import jalview.datamodel.*; -public class Finder extends Panel +public class Finder extends Panel implements ActionListener { AlignViewport av; AlignmentPanel ap; @@ -62,37 +62,26 @@ public class Finder extends Panel }); } - public void textfield_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent evt) { - doSearch(false); - } + if (evt.getSource() == textfield) + doSearch(false); - public void findNext_actionPerformed(ActionEvent e) - { - doSearch(false); - } - - public void findAll_actionPerformed(ActionEvent e) - { - resIndex = 0; - seqIndex = 0; - doSearch(true); - } + else if (evt.getSource() == findNext) + doSearch(false); - public void cancel_actionPerformed(ActionEvent e) - { - try + else if (evt.getSource() == findAll) { - // if allResults is null, this effectively switches displaySearch flag in seqCanvas - ap.highlightSearchResults(null); - ap.idPanel.highlightSearchResults(null); - // frame.setClosed(true); + resIndex = 0; + seqIndex = 0; + doSearch(true); } - catch (Exception ex) - {} + else if(evt.getSource() == createNewGroup) + createNewGroup_actionPerformed(); } - public void createNewGroup_actionPerformed(ActionEvent e) + + public void createNewGroup_actionPerformed() { Color[] newColors = new Color[24]; for (int i = 0; i < 24; i++) @@ -326,26 +315,14 @@ public class Finder extends Panel textfield_keyTyped(e); } }); - textfield.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - textfield_actionPerformed(e); - } - }); + textfield.addActionListener(this); findAll.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); findAll.setLabel("Find all"); - findAll.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - findAll_actionPerformed(e); - } - }); + findAll.addActionListener(this); findNext.setEnabled(false); findNext.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); findNext.setLabel("Find Next"); - findNext.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - findNext_actionPerformed(e); - } - }); + findNext.addActionListener(this); jPanel1.setBounds(new Rectangle(180, 5, 141, 64)); jPanel1.setLayout(gridLayout1); gridLayout1.setHgap(0); @@ -354,11 +331,7 @@ public class Finder extends Panel createNewGroup.setEnabled(false); createNewGroup.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); createNewGroup.setLabel("Create new group"); - createNewGroup.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - createNewGroup_actionPerformed(e); - } - }); + createNewGroup.addActionListener(this); jPanel1.add(findNext, null); jPanel1.add(findAll, null); jPanel1.add(createNewGroup, null); diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java index 5f44b39..843ffe7 100755 --- a/src/jalview/appletgui/FontChooser.java +++ b/src/jalview/appletgui/FontChooser.java @@ -21,11 +21,10 @@ package jalview.appletgui; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; +import java.awt.event.*; public class FontChooser - extends Panel + extends Panel implements ActionListener, ItemListener { AlignmentPanel ap; TreePanel tp; @@ -89,11 +88,30 @@ public class FontChooser Frame frame = new Frame(); this.frame = frame; frame.add(this); - jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 100); + jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 115); init = false; } + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==ok) + ok_actionPerformed(); + else if(evt.getSource()==cancel) + cancel_actionPerformed(); + } + + public void itemStateChanged(ItemEvent evt) + { + if(evt.getSource()==fontName) + fontName_actionPerformed(); + else if(evt.getSource()==fontSize) + fontSize_actionPerformed(); + else if(evt.getSource()==fontStyle) + fontStyle_actionPerformed(); + } + + protected void ok_actionPerformed() { frame.setVisible(false); @@ -196,17 +214,9 @@ public class FontChooser label1.setText("Font: "); this.setLayout(borderLayout4); fontSize.setFont(new java.awt.Font("Verdana", 0, 11)); - fontSize.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - fontSize_actionPerformed(); - } - }); + fontSize.addItemListener(this); fontStyle.setFont(new java.awt.Font("Verdana", 0, 11)); - fontStyle.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - fontStyle_actionPerformed(); - } - }); + fontStyle.addItemListener(this); label2.setAlignment(Label.RIGHT); label2.setFont(new java.awt.Font("Verdana", 0, 11)); label2.setText("Size: "); @@ -214,25 +224,13 @@ public class FontChooser label3.setFont(new java.awt.Font("Verdana", 0, 11)); label3.setText("Style: "); fontName.setFont(new java.awt.Font("Verdana", 0, 11)); - fontName.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - fontName_actionPerformed(); - } - }); + fontName.addItemListener(this); ok.setFont(new java.awt.Font("Verdana", 0, 11)); ok.setLabel("OK"); - ok.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - ok_actionPerformed(); - } - }); + ok.addActionListener(this); cancel.setFont(new java.awt.Font("Verdana", 0, 11)); cancel.setLabel("Cancel"); - cancel.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - cancel_actionPerformed(); - } - }); + cancel.addActionListener(this); this.setBackground(Color.white); panel1.setLayout(borderLayout1); panel2.setLayout(borderLayout3); diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index 23bfd09..c5789fe 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -23,7 +23,7 @@ import java.awt.*; import java.awt.event.*; public class OverviewPanel - extends Panel implements Runnable + extends Panel implements Runnable, MouseMotionListener, MouseListener { Image miniMe; AlignViewport av; @@ -103,32 +103,24 @@ public class OverviewPanel } }); - addMouseMotionListener(new MouseMotionAdapter() - { - public void mouseDragged(MouseEvent evt) - { - doMouseDragged(evt); - } - }); - - addMouseListener(new MouseAdapter() - { - public void mousePressed(MouseEvent evt) - { - doMousePressed(evt); - } + addMouseMotionListener(this); - public void mouseReleased(MouseEvent evt) - { - doMouseReleased(evt); - } - }); + addMouseListener(this); updateOverviewImage(); } - public void doMousePressed(MouseEvent evt) + + public void mouseEntered(MouseEvent evt) + {} + public void mouseExited(MouseEvent evt) + {} + public void mouseClicked(MouseEvent evt) + {} + public void mouseMoved(MouseEvent evt) + {} + public void mousePressed(MouseEvent evt) { boxX = evt.getX(); boxY = evt.getY(); @@ -137,7 +129,7 @@ public class OverviewPanel repaint(); } - public void doMouseReleased(MouseEvent evt) + public void mouseReleased(MouseEvent evt) { boxX = evt.getX(); boxY = evt.getY(); @@ -146,7 +138,7 @@ public class OverviewPanel (int) (boxY / scaleh / av.getCharHeight())); } - public void doMouseDragged(MouseEvent evt) + public void mouseDragged(MouseEvent evt) { boxX = evt.getX(); boxY = evt.getY(); diff --git a/src/jalview/appletgui/PCAPanel.java b/src/jalview/appletgui/PCAPanel.java index 0368d2a..a75de06 100755 --- a/src/jalview/appletgui/PCAPanel.java +++ b/src/jalview/appletgui/PCAPanel.java @@ -29,7 +29,7 @@ import jalview.datamodel.*; public class PCAPanel - extends Frame implements Runnable + extends Frame implements Runnable, ActionListener, ItemListener { PCA pca; int top; @@ -156,22 +156,38 @@ public class PCAPanel rc.paint(rc.getGraphics()); } - protected void xCombobox_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent evt) + { + values_actionPerformed(); + } + + public void itemStateChanged(ItemEvent evt) + { + if(evt.getSource()==xCombobox) + xCombobox_actionPerformed(); + else if(evt.getSource()==yCombobox) + yCombobox_actionPerformed(); + else if(evt.getSource()==zCombobox) + zCombobox_actionPerformed(); + } + + + protected void xCombobox_actionPerformed() { doDimensionChange(); } - protected void yCombobox_actionPerformed(ActionEvent e) + protected void yCombobox_actionPerformed() { doDimensionChange(); } - protected void zCombobox_actionPerformed(ActionEvent e) + protected void zCombobox_actionPerformed() { doDimensionChange(); } - public void values_actionPerformed(ActionEvent actionEvent) + public void values_actionPerformed() { CutAndPasteTransfer cap = new CutAndPasteTransfer(false, null); @@ -214,48 +230,18 @@ public class PCAPanel jLabel3.setText("z="); jPanel2.setBackground(Color.white); zCombobox.setFont(new java.awt.Font("Verdana", 0, 12)); - zCombobox.addItemListener(new java.awt.event.ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - zCombobox_actionPerformed(null); - } - }); + zCombobox.addItemListener(this); yCombobox.setFont(new java.awt.Font("Verdana", 0, 12)); - yCombobox.addItemListener(new java.awt.event.ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - yCombobox_actionPerformed(null); - } - }); + yCombobox.addItemListener(this); xCombobox.setFont(new java.awt.Font("Verdana", 0, 12)); - xCombobox.addItemListener(new java.awt.event.ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - xCombobox_actionPerformed(null); - } - }); + xCombobox.addItemListener(this); this.setMenuBar(menuBar1); menu1.setLabel("File"); menu2.setLabel("View"); labels.setLabel("Labels"); - labels.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - labels_itemStateChanged(itemEvent); - } - }); + labels.addItemListener(this); values.setLabel("Output Values..."); - values.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent actionEvent) - { - values_actionPerformed(actionEvent); - } - }); + values.addActionListener(this); this.add(jPanel2, BorderLayout.SOUTH); jPanel2.add(jLabel1, null); jPanel2.add(xCombobox, null); diff --git a/src/jalview/appletgui/PairwiseAlignPanel.java b/src/jalview/appletgui/PairwiseAlignPanel.java index 910a206..26836cd 100755 --- a/src/jalview/appletgui/PairwiseAlignPanel.java +++ b/src/jalview/appletgui/PairwiseAlignPanel.java @@ -28,7 +28,7 @@ import jalview.datamodel.*; import java.awt.*; public class PairwiseAlignPanel - extends Panel + extends Panel implements ActionListener { Vector sequences = new Vector(); AlignmentPanel ap; @@ -85,7 +85,13 @@ public class PairwiseAlignPanel } } - protected void viewInEditorButton_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==viewInEditorButton) + viewInEditorButton_actionPerformed(); + } + + protected void viewInEditorButton_actionPerformed() { Sequence[] seq = new Sequence[sequences.size()]; @@ -112,11 +118,7 @@ public class PairwiseAlignPanel textarea.setText(""); viewInEditorButton.setFont(new java.awt.Font("Verdana", 0, 12)); viewInEditorButton.setLabel("View in alignment editor"); - viewInEditorButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - viewInEditorButton_actionPerformed(e); - } - }); + viewInEditorButton.addActionListener(this); this.add(scrollPane, BorderLayout.CENTER); scrollPane.add(textarea); this.add(jPanel1, BorderLayout.SOUTH); diff --git a/src/jalview/appletgui/RedundancyPanel.java b/src/jalview/appletgui/RedundancyPanel.java index 3e3691b..504338a 100755 --- a/src/jalview/appletgui/RedundancyPanel.java +++ b/src/jalview/appletgui/RedundancyPanel.java @@ -53,7 +53,7 @@ public class RedundancyPanel extends SliderPanel } - public void applyButton_actionPerformed(ActionEvent e) + public void applyButton_actionPerformed() { float threshold = slider.getValue(); Vector del; @@ -106,7 +106,7 @@ public class RedundancyPanel extends SliderPanel } - public void undoButton_actionPerformed(ActionEvent e) + public void undoButton_actionPerformed() { undoButton.setEnabled(false); ap.av.setAlignment(new Alignment(oldAlignment)); diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index 9030341..2f06d64 100755 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -28,7 +28,7 @@ import jalview.datamodel.*; import jalview.schemes.*; public class SeqPanel - extends Panel + extends Panel implements MouseMotionListener, MouseListener { public SeqCanvas seqCanvas; @@ -60,84 +60,42 @@ public class SeqPanel ap = p; - seqCanvas.addMouseMotionListener(new MouseMotionAdapter() - { - public void mouseMoved(MouseEvent evt) - { - doMouseMoved(evt); - } - - public void mouseDragged(MouseEvent evt) - { - if (editingSeqs) - { - doMouseDragged(evt); - } - else - { - doMouseDraggedDefineMode(evt); - } - } - }); - - seqCanvas.addMouseListener(new MouseAdapter() - { - public void mouseReleased(MouseEvent evt) - { - if (editingSeqs) - { - doMouseReleased(evt); - } - else - { - doMouseReleasedDefineMode(evt); - } + seqCanvas.addMouseMotionListener(this); + seqCanvas.addMouseListener(this); - } - - public void mousePressed(MouseEvent evt) - { - if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown()) - { - if (evt.isAltDown() || evt.isControlDown()) - { - groupEditing = true; - } - - editingSeqs = true; - doMousePressed(evt); - } - else - { - doMousePressedDefineMode(evt); - } - } + seqCanvas.repaint(); + } - public void mouseExited(MouseEvent evt) - { - if (editingSeqs) - { - return; - } - doMouseExitedDefineMode(evt); - } + public void mousePressed(MouseEvent evt) + { + if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown()) + { + if (evt.isAltDown() || evt.isControlDown()) + { + groupEditing = true; + } + + editingSeqs = true; + doMousePressed(evt); + } + else + { + doMousePressedDefineMode(evt); + } + } - public void mouseEntered(MouseEvent evt) - { - if (editingSeqs) - { - return; - } - doMouseEnteredDefineMode(evt); - } + public void mouseClicked(MouseEvent evt){} - }); - seqCanvas.repaint(); - } - public void doMouseReleased(MouseEvent evt) + public void mouseReleased(MouseEvent evt) { + if (!editingSeqs) + { + doMouseReleasedDefineMode(evt); + return; + } + if (seqEditOccurred > -1) { @@ -246,7 +204,7 @@ public class SeqPanel return; } - public void doMouseMoved(MouseEvent evt) + public void mouseMoved(MouseEvent evt) { int res = findRes(evt); int seq = findSeq(evt); @@ -301,14 +259,19 @@ public class SeqPanel { Vector features = sequence.getSequenceFeatures(); Enumeration e = features.elements(); - text.append(" Sequence Feature: "); - + boolean first = true; while (e.hasMoreElements()) { SequenceFeature sf = (SequenceFeature) e.nextElement(); if (sf.getBegin() <= sequence.findPosition(res) && sf.getEnd() >= sequence.findPosition(res)) { + if(first) + { + text.append(" Sequence Feature: "); + first = false; + } + text.append(sf.getDescription()); if (sf.getStatus().length() > 0) { @@ -324,8 +287,13 @@ public class SeqPanel } - public void doMouseDragged(MouseEvent evt) + public void mouseDragged(MouseEvent evt) { + if (!editingSeqs) + { + doMouseDraggedDefineMode(evt); + return; + } // If we're dragging we're editing int res = findRes(evt); @@ -741,15 +709,15 @@ public class SeqPanel seqCanvas.repaint(); } - public void doMouseEnteredDefineMode(MouseEvent e) + public void mouseEntered(MouseEvent e) { - if (scrollThread != null) + if (editingSeqs && scrollThread != null) { scrollThread.running = false; } } - public void doMouseExitedDefineMode(MouseEvent e) + public void mouseExited(MouseEvent e) { if (mouseDragging) { diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java index a53e9dd..c343df9 100755 --- a/src/jalview/appletgui/SliderPanel.java +++ b/src/jalview/appletgui/SliderPanel.java @@ -27,7 +27,7 @@ import java.awt.event.*; import jalview.datamodel.*; import jalview.schemes.*; -public class SliderPanel extends Panel +public class SliderPanel extends Panel implements ActionListener, AdjustmentListener { AlignmentPanel ap; boolean forConservation = true; @@ -176,14 +176,7 @@ public class SliderPanel extends Panel slider.setBlockIncrement(1); } - slider.addAdjustmentListener(new AdjustmentListener() - { - public void adjustmentValueChanged(AdjustmentEvent evt) - { - valueField.setText(slider.getValue() + ""); - valueChanged(slider.getValue()); - } - }); + slider.addAdjustmentListener(this); slider.setValue(value); valueField.setText(value + ""); @@ -238,7 +231,24 @@ public class SliderPanel extends Panel allGroupsCheck.setEnabled(b); } - public void valueField_actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==applyButton) + applyButton_actionPerformed(); + else if(evt.getSource()==undoButton) + undoButton_actionPerformed(); + else if(evt.getSource()==valueField) + valueField_actionPerformed(); + } + + public void adjustmentValueChanged(AdjustmentEvent evt) + { + valueField.setText(slider.getValue() + ""); + valueChanged(slider.getValue()); + } + + + public void valueField_actionPerformed() { try { @@ -286,30 +296,18 @@ public class SliderPanel extends Panel slider.setOrientation(0); valueField.setFont(new java.awt.Font("Verdana", 0, 11)); valueField.setText(" "); - valueField.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - valueField_actionPerformed(e); - } - }); + valueField.addActionListener(this); label.setFont(new java.awt.Font("Verdana", 0, 11)); label.setText("set this label text"); jPanel1.setLayout(borderLayout1); jPanel2.setLayout(flowLayout1); applyButton.setFont(new java.awt.Font("Verdana", 0, 11)); applyButton.setLabel("Apply"); - applyButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - applyButton_actionPerformed(e); - } - }); + applyButton.addActionListener(this); undoButton.setEnabled(false); undoButton.setFont(new java.awt.Font("Verdana", 0, 11)); undoButton.setLabel("Undo"); - undoButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - undoButton_actionPerformed(e); - } - }); + undoButton.addActionListener(this); allGroupsCheck.setEnabled(false); allGroupsCheck.setFont(new java.awt.Font("Verdana", 0, 11)); allGroupsCheck.setLabel("Apply threshold to all groups"); @@ -326,11 +324,11 @@ public class SliderPanel extends Panel this.add(jPanel2, java.awt.BorderLayout.CENTER); } - protected void applyButton_actionPerformed(ActionEvent e) + protected void applyButton_actionPerformed() { } - protected void undoButton_actionPerformed(ActionEvent e) + protected void undoButton_actionPerformed() { } } diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java index 99ad412..61b0546 100755 --- a/src/jalview/appletgui/TreePanel.java +++ b/src/jalview/appletgui/TreePanel.java @@ -28,7 +28,7 @@ import jalview.analysis.*; import jalview.datamodel.*; import jalview.io.*; -public class TreePanel extends Frame +public class TreePanel extends Frame implements ActionListener, ItemListener { SequenceI[] seq; String type; @@ -152,18 +152,33 @@ public class TreePanel extends Frame } } - public String getText(String format) + public void actionPerformed(ActionEvent evt) { - return null; + if(evt.getSource()==newickOutput) + newickOutput_actionPerformed(); + else if(evt.getSource()==fontSize) + fontSize_actionPerformed(); } - protected void fitToWindow_actionPerformed(ActionEvent e) + public void itemStateChanged(ItemEvent evt) { - treeCanvas.fitToWindow = fitToWindow.getState(); + if(evt.getSource()==fitToWindow) + treeCanvas.fitToWindow = fitToWindow.getState(); + + else if(evt.getSource()==distanceMenu) + treeCanvas.setShowDistances(distanceMenu.getState()); + + else if(evt.getSource()==bootstrapMenu) + treeCanvas.setShowBootstrap(bootstrapMenu.getState()); + + else if(evt.getSource()==placeholdersMenu) + treeCanvas.setMarkPlaceholders(placeholdersMenu.getState()); + treeCanvas.repaint(); } - public void newickOutput_actionPerformed(ActionEvent actionEvent) + + public void newickOutput_actionPerformed() { jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode()); String output = fout.print(false, true); @@ -185,7 +200,7 @@ public class TreePanel extends Frame treeCanvas.repaint(); } - protected void fontSize_actionPerformed(ActionEvent e) + protected void fontSize_actionPerformed() { if( treeCanvas==null ) return; @@ -193,20 +208,6 @@ public class TreePanel extends Frame new FontChooser(this); } - protected void distanceMenu_actionPerformed(ActionEvent e) - { - treeCanvas.setShowDistances(distanceMenu.getState()); - } - - protected void bootstrapMenu_actionPerformed(ActionEvent e) - { - treeCanvas.setShowBootstrap(bootstrapMenu.getState()); - } - - protected void placeholdersMenu_actionPerformed(ActionEvent e) - { - treeCanvas.setMarkPlaceholders(placeholdersMenu.getState()); - } BorderLayout borderLayout1 = new BorderLayout(); protected ScrollPane scrollPane = new ScrollPane(); @@ -226,43 +227,19 @@ public class TreePanel extends Frame this.setFont(new java.awt.Font("Verdana", 0, 12)); jMenu2.setLabel("View"); fontSize.setLabel("Font..."); - fontSize.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - fontSize_actionPerformed(e); - } - }); + fontSize.addActionListener(this); bootstrapMenu.setLabel("Show Bootstrap Values"); - bootstrapMenu.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - bootstrapMenu_actionPerformed(null); - } - }); + bootstrapMenu.addItemListener(this); distanceMenu.setLabel("Show Distances"); - distanceMenu.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - distanceMenu_actionPerformed(null); - } - }); + distanceMenu.addItemListener(this); placeholdersMenu.setLabel("Mark Unassociated Leaves"); - placeholdersMenu.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - placeholdersMenu_actionPerformed(null); - } - }); + placeholdersMenu.addItemListener(this); fitToWindow.setState(true); fitToWindow.setLabel("Fit To Window"); - fitToWindow.addItemListener(new java.awt.event.ItemListener() { - public void itemStateChanged(ItemEvent e) { - fitToWindow_actionPerformed(null); - } - }); + fitToWindow.addItemListener(this); fileMenu.setLabel("File"); newickOutput.setLabel("Newick Format"); - newickOutput.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent actionEvent) { - newickOutput_actionPerformed(actionEvent); - } - }); + newickOutput.addActionListener(this); add(scrollPane, BorderLayout.CENTER); jMenuBar1.add(fileMenu); diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index 71bcaca..b092601 100755 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -28,7 +28,7 @@ import jalview.datamodel.*; import jalview.schemes.*; public class UserDefinedColours - extends Panel + extends Panel implements ActionListener, AdjustmentListener { AlignmentPanel ap; @@ -70,6 +70,32 @@ public class UserDefinedColours init(); } + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==okButton) + okButton_actionPerformed(); + else if(evt.getSource()==applyButton) + applyButton_actionPerformed(); + else if(evt.getSource()==cancelButton) + cancelButton_actionPerformed(); + else if(evt.getSource()==rText) + rText_actionPerformed(); + else if (evt.getSource() == gText) + gText_actionPerformed(); + else if (evt.getSource() == bText) + bText_actionPerformed(); +} + + public void adjustmentValueChanged(AdjustmentEvent evt) + { + if(evt.getSource()==rScroller) + rScroller_adjustmentValueChanged(); + else if(evt.getSource()==gScroller) + gScroller_adjustmentValueChanged(); + else if(evt.getSource()==bScroller) + bScroller_adjustmentValueChanged(); +} + void init() { try @@ -102,59 +128,59 @@ public class UserDefinedColours validate(); } - protected void rText_actionPerformed(ActionEvent e) + protected void rText_actionPerformed() { try { int i = Integer.parseInt(rText.getText()); rScroller.setValue(i); - rScroller_adjustmentValueChanged(null); + rScroller_adjustmentValueChanged(); } catch (NumberFormatException ex) {} } - protected void gText_actionPerformed(ActionEvent e) + protected void gText_actionPerformed() { try { int i = Integer.parseInt(gText.getText()); gScroller.setValue(i); - gScroller_adjustmentValueChanged(null); + gScroller_adjustmentValueChanged(); } catch (NumberFormatException ex) {} } - protected void bText_actionPerformed(ActionEvent e) + protected void bText_actionPerformed() { try { int i = Integer.parseInt(bText.getText()); bScroller.setValue(i); - bScroller_adjustmentValueChanged(null); + bScroller_adjustmentValueChanged(); } catch (NumberFormatException ex) {} } - protected void rScroller_adjustmentValueChanged(AdjustmentEvent e) + protected void rScroller_adjustmentValueChanged() { R = rScroller.getValue(); rText.setText(R + ""); colourChanged(); } - protected void gScroller_adjustmentValueChanged(AdjustmentEvent e) + protected void gScroller_adjustmentValueChanged() { G = gScroller.getValue(); gText.setText(G + ""); colourChanged(); } - protected void bScroller_adjustmentValueChanged(AdjustmentEvent e) + protected void bScroller_adjustmentValueChanged() { B = bScroller.getValue(); bText.setText(B + ""); @@ -219,13 +245,13 @@ public class UserDefinedColours buttonPanel.add(button, null); } - protected void okButton_actionPerformed(ActionEvent e) + protected void okButton_actionPerformed() { - applyButton_actionPerformed(null); + applyButton_actionPerformed(); frame.setVisible(false); } - protected void applyButton_actionPerformed(ActionEvent e) + protected void applyButton_actionPerformed() { Color[] newColours = new Color[24]; for (int i = 0; i < 24; i++) @@ -259,7 +285,7 @@ public class UserDefinedColours } - protected void cancelButton_actionPerformed(ActionEvent e) + protected void cancelButton_actionPerformed() { Color[] newColours = new Color[24]; @@ -316,25 +342,13 @@ public class UserDefinedColours gridLayout.setRows(4); okButton.setFont(new java.awt.Font("Verdana", 0, 11)); okButton.setLabel("OK"); - okButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - okButton_actionPerformed(e); - } - }); + okButton.addActionListener(this); applyButton.setFont(new java.awt.Font("Verdana", 0, 11)); applyButton.setLabel("Apply"); - applyButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - applyButton_actionPerformed(e); - } - }); + applyButton.addActionListener(this); cancelButton.setFont(new java.awt.Font("Verdana", 0, 11)); cancelButton.setLabel("Cancel"); - cancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - cancelButton_actionPerformed(e); - } - }); + cancelButton.addActionListener(this); this.setBackground(new Color(212, 208, 223)); jPanel2.setBounds(new Rectangle(0, 265, 400, 35)); buttonPanel.setBounds(new Rectangle(0, 123, 400, 142)); @@ -344,22 +358,14 @@ public class UserDefinedColours rScroller.setUnitIncrement(1); rScroller.setVisibleAmount(1); rScroller.setBounds(new Rectangle(36, 27, 119, 19)); - rScroller.addAdjustmentListener(new java.awt.event.AdjustmentListener() { - public void adjustmentValueChanged(AdjustmentEvent e) { - rScroller_adjustmentValueChanged(e); - } - }); + rScroller.addAdjustmentListener(this); label1.setAlignment(Label.RIGHT); label1.setText("R"); label1.setBounds(new Rectangle(19, 30, 16, 15)); rText.setFont(new java.awt.Font("Dialog", Font.PLAIN, 10)); rText.setText("0 "); rText.setBounds(new Rectangle(156, 27, 53, 19)); - rText.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - rText_actionPerformed(e); - } - }); + rText.addActionListener(this); label4.setAlignment(Label.RIGHT); label4.setText("G"); label4.setBounds(new Rectangle(15, 56, 20, 15)); @@ -369,19 +375,11 @@ public class UserDefinedColours gScroller.setUnitIncrement(1); gScroller.setVisibleAmount(1); gScroller.setBounds(new Rectangle(35, 52, 120, 20)); - gScroller.addAdjustmentListener(new java.awt.event.AdjustmentListener() { - public void adjustmentValueChanged(AdjustmentEvent e) { - gScroller_adjustmentValueChanged(e); - } - }); + gScroller.addAdjustmentListener(this); gText.setFont(new java.awt.Font("Dialog", Font.PLAIN, 10)); gText.setText("0 "); gText.setBounds(new Rectangle(156, 52, 53, 20)); - gText.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - gText_actionPerformed(e); - } - }); + gText.addActionListener(this); label5.setAlignment(Label.RIGHT); label5.setText("B"); label5.setBounds(new Rectangle(14, 82, 20, 15)); @@ -391,19 +389,11 @@ public class UserDefinedColours bScroller.setUnitIncrement(1); bScroller.setVisibleAmount(1); bScroller.setBounds(new Rectangle(35, 78, 120, 20)); - bScroller.addAdjustmentListener(new java.awt.event.AdjustmentListener() { - public void adjustmentValueChanged(AdjustmentEvent e) { - bScroller_adjustmentValueChanged(e); - } - }); + bScroller.addAdjustmentListener(this); bText.setFont(new java.awt.Font("Dialog", Font.PLAIN, 10)); bText.setText("0 "); bText.setBounds(new Rectangle(157, 78, 52, 20)); - bText.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(ActionEvent e) { - bText_actionPerformed(e); - } - }); + bText.addActionListener(this); target.setBackground(Color.black); target.setBounds(new Rectangle(229, 26, 134, 79)); this.add(jPanel2, null); -- 1.7.10.2