From 29f89f52f3fc99e904a55e426c53a830290408cc Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Tue, 9 Aug 2005 16:45:05 +0000 Subject: [PATCH] Applet handles multiple sequence links --- src/jalview/appletgui/APopupMenu.java | 37 ++++++++++++------ src/jalview/appletgui/IdPanel.java | 66 ++++++++++++++++++++++----------- src/jalview/appletgui/SeqPanel.java | 2 +- 3 files changed, 71 insertions(+), 34 deletions(-) diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index cf854b0..858770a 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -21,6 +21,7 @@ package jalview.appletgui; import java.awt.*; import java.awt.event.*; +import java.util.Vector; import jalview.analysis.*; import jalview.datamodel.*; @@ -46,9 +47,6 @@ public class APopupMenu protected CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem(); AlignmentPanel ap; - Menu sequenceMenu = new Menu(); - MenuItem sequenceName = new MenuItem(); - Sequence sequence; MenuItem unGroupMenuItem = new MenuItem(); MenuItem nucleotideMenuItem = new MenuItem(); Menu colourMenu = new Menu(); @@ -56,7 +54,7 @@ public class APopupMenu CheckboxMenuItem showText = new CheckboxMenuItem(); CheckboxMenuItem showColourText = new CheckboxMenuItem(); - public APopupMenu(AlignmentPanel ap, Sequence seq) + public APopupMenu(AlignmentPanel ap, Sequence seq, Vector links) { /////////////////////////////////////////////////////////// // If this is activated from the sequence panel, the user may want to @@ -66,7 +64,6 @@ public class APopupMenu ////////////////////////////////////////////////////////// this.ap = ap; - sequence = seq; try { @@ -90,11 +87,31 @@ public class APopupMenu groupMenu.remove(unGroupMenuItem); } - if (seq == null) + if (seq != null && links!=null) { - remove(sequenceMenu); + Menu linkMenu = new Menu("Link"); + MenuItem item; + String link; + for(int i=0; i1 ) { return; } @@ -157,7 +181,7 @@ public class IdPanel if ( (e.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK) { - APopupMenu popup = new APopupMenu(alignPanel, null); + APopupMenu popup = new APopupMenu(alignPanel, (Sequence) av.getAlignment().getSequenceAt(seq), links); this.add(popup); popup.show(this, e.getX(), e.getY()); return; diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index 665a444..080dc22 100755 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -566,7 +566,7 @@ public class SeqPanel else if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK) { - APopupMenu popup = new APopupMenu(ap, null); + APopupMenu popup = new APopupMenu(ap, null, null); this.add(popup); popup.show(this, evt.getX(), evt.getY()); } -- 1.7.10.2