X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=68960f4393c73374684e671a65791ba2827dd332;hb=064f2fdaa463367f8bf7e6aea5e7fc6a32170138;hp=cf854b0d797ea6e4004be4902b02a2fb9fb2acc1;hpb=5fbe7c141f482121b3f7f04570ab84bf6203ebf6;p=jalview.git

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index cf854b0..68960f4 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; i<links.size(); i++)
+      {
+        link = links.elementAt(i).toString();
+        final String target = link.substring(0, link.indexOf("|"));
+        item = new MenuItem(target);
+        final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))
+               + seq.getName() +
+               link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
+
+           item.addActionListener(new java.awt.event.ActionListener()
+           {
+               public void actionPerformed(ActionEvent e)
+               {
+                  jalview.bin.JalviewLite.showURL(url, target);
+               }
+           });
+          linkMenu.add(item);
+      }
+      add(linkMenu);
     }
-
   }
 
   private void jbInit()
@@ -103,8 +120,6 @@ public class APopupMenu
     groupMenu.setLabel("Group");
     groupMenu.setLabel("Define");
 
-    sequenceMenu.setLabel("Sequence");
-    sequenceName.setLabel("Edit name");
     unGroupMenuItem.setLabel("Remove Group");
     unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
@@ -165,14 +180,12 @@ public class APopupMenu
     });
 
     add(groupMenu);
-    this.add(sequenceMenu);
     groupMenu.add(unGroupMenuItem);
     groupMenu.add(colourMenu);
     groupMenu.addSeparator();
     groupMenu.add(showBoxes);
     groupMenu.add(showText);
     groupMenu.add(showColourText);
-    sequenceMenu.add(sequenceName);
     colourMenu.add(noColourmenuItem);
     colourMenu.add(clustalColour);
     colourMenu.add(BLOSUM62Colour);
@@ -366,29 +379,24 @@ public class APopupMenu
   protected void abovePIDColour_itemStateChanged(ItemEvent ie)
   {
     SequenceGroup sg = getGroup();
+    if(sg.cs==null)
+          return;
+
     if (abovePIDColour.getState())
     {
       sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
                                                ap.av.alignment.getWidth()));
       int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,
           getGroup().getName());
-      if (sg.cs instanceof ResidueColourScheme)
-      {
-        ( (ResidueColourScheme) sg.cs).setThreshold(threshold);
-      }
-      else if (sg.cs instanceof ScoreColourScheme)
-      {
-        ( (ScoreColourScheme) sg.cs).setThreshold(threshold);
-      }
+
+      sg.cs.setThreshold(threshold, ap.av.getIgnoreGapsConsensus());
 
       SliderPanel.showPIDSlider();
 
     }
     else // remove PIDColouring
     {
-      ResidueColourScheme rcs = (ResidueColourScheme) sg.cs;
-      rcs.setThreshold(0);
-      sg.cs = rcs;
+      sg.cs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
     }
 
     refresh();
@@ -430,6 +438,8 @@ public class APopupMenu
   protected void conservationMenuItem_itemStateChanged(ItemEvent ie)
   {
     SequenceGroup sg = getGroup();
+    if(sg.cs==null)
+          return;
 
     if (conservationMenuItem.getState())
     {
@@ -441,17 +451,15 @@ public class APopupMenu
 
       c.calculate();
       c.verdict(false, ap.av.ConsPercGaps);
-      ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);
 
-      sg.cs = ccs;
+      sg.cs.setConservation(c);
 
-      SliderPanel.setConservationSlider(ap, ccs, sg.getName());
+      SliderPanel.setConservationSlider(ap, sg.cs, sg.getName());
       SliderPanel.showConservationSlider();
     }
     else // remove ConservationColouring
     {
-      ConservationColourScheme ccs = (ConservationColourScheme) sg.cs;
-      sg.cs = ccs.cs;
+      sg.cs.setConservation(null);
     }
 
     refresh();
@@ -459,7 +467,7 @@ public class APopupMenu
 
   protected void analyze_actionPerformed(ActionEvent e)
   {
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(false);
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame.applet);
     Frame frame = new Frame();
     frame.add(cap);
     jalview.bin.JalviewLite.addFrame(frame, "Analyze this - ", 400, 300);