X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=153e9fb3b9efda25f23c0b727a81f308d8123568;hb=6f4eaccaaabb743c27589d4107439caeb490ac3e;hp=5ff9ad9099bd3384ae2c697a41e2e3f958695473;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 5ff9ad9..153e9fb 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -172,7 +172,7 @@ public class PopupMenu extends JPopupMenu
                 noColourmenuItem.setSelected(true);
             }
 
-            if (sg.cs instanceof ConservationColourScheme)
+            if (sg.cs!=null && sg.cs.conservationApplied())
             {
                 conservationMenuItem.setSelected(true);
             }
@@ -195,6 +195,35 @@ public class PopupMenu extends JPopupMenu
         {
             sequenceMenu.setVisible(false);
         }
+        else
+        {
+          java.util.Vector links = Preferences.sequenceURLLinks;
+
+          JMenu linkMenu = new JMenu("Link");
+          JMenuItem item;
+          for(int i=0; i<links.size(); i++)
+          {
+            String link = links.elementAt(i).toString();
+
+            item = new JMenuItem(link.substring(0, link.indexOf("|")));
+
+            final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))
+                + sequence.getName() +
+                link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
+
+
+            item.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    showLink(url);
+                }
+            });
+
+            linkMenu.add(item);
+          }
+          add(linkMenu);
+        }
     }
 
     /**
@@ -310,6 +339,28 @@ public class PopupMenu extends JPopupMenu
         colourMenu.add(buriedColour);
         colourMenu.add(nucleotideMenuItem);
         colourMenu.add(userDefinedColour);
+
+        if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null)
+        {
+          java.util.Enumeration userColours = jalview.gui.UserDefinedColours.
+              getUserColourSchemes().keys();
+
+          while (userColours.hasMoreElements())
+          {
+            JMenuItem item = new JMenuItem(userColours.
+                nextElement().toString());
+            item.addActionListener(new ActionListener()
+            {
+              public void actionPerformed(ActionEvent evt)
+              {
+                userDefinedColour_actionPerformed(evt);
+              }
+            });
+            colourMenu.add(item);
+          }
+        }
+
+
         colourMenu.addSeparator();
         colourMenu.add(abovePIDColour);
         colourMenu.add(conservationMenuItem);
@@ -394,7 +445,7 @@ public class PopupMenu extends JPopupMenu
                     abovePIDColour_actionPerformed(e);
                 }
             });
-        userDefinedColour.setText("User Defined");
+        userDefinedColour.setText("User Defined...");
         userDefinedColour.addActionListener(new java.awt.event.ActionListener()
             {
                 public void actionPerformed(ActionEvent e)
@@ -434,13 +485,15 @@ public class PopupMenu extends JPopupMenu
     void refresh()
     {
         SequenceGroup sg = getGroup();
-        SuperGroup superG = ap.av.alignment.getSuperGroup(sg);
-
-        if (superG != null)
+        if(sg!=null)
         {
+          SuperGroup superG = ap.av.alignment.getSuperGroup(sg);
+
+          if (superG != null)
+          {
             superG.setSuperGroupProperties(sg);
+          }
         }
-
         ap.seqPanel.repaint();
     }
 
@@ -553,6 +606,8 @@ public class PopupMenu extends JPopupMenu
     protected void abovePIDColour_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
+        if(sg.cs==null)
+          return;
 
         if (abovePIDColour.isSelected())
         {
@@ -562,22 +617,13 @@ public class PopupMenu extends JPopupMenu
             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();
@@ -590,9 +636,18 @@ public class PopupMenu extends JPopupMenu
      */
     protected void userDefinedColour_actionPerformed(ActionEvent e)
     {
-        new UserDefinedColours(ap, getGroup());
-    }
-
+       SequenceGroup sg = getGroup();
+
+       if (e.getActionCommand().equals("User Defined..."))
+         new UserDefinedColours(ap, sg);
+       else
+       {
+         UserColourScheme udc = (UserColourScheme) UserDefinedColours.
+             getUserColourSchemes().get(e.getActionCommand());
+
+         sg.cs = udc;
+       }
+     }
     /**
      * DOCUMENT ME!
      *
@@ -643,6 +698,8 @@ public class PopupMenu extends JPopupMenu
     protected void conservationMenuItem_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
+        if(sg.cs==null)
+          return;
 
         if (conservationMenuItem.isSelected())
         {
@@ -653,17 +710,14 @@ public class PopupMenu extends JPopupMenu
             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();
@@ -724,9 +778,9 @@ public class PopupMenu extends JPopupMenu
     SequenceGroup getGroup()
     {
         SequenceGroup sg = ap.av.getSelectionGroup();
-
-        // this method won't add a new group if it already exists
-        ap.av.alignment.addGroup(sg);
+      // this method won't add a new group if it already exists
+        if(sg!=null)
+          ap.av.alignment.addGroup(sg);
 
         return sg;
     }
@@ -856,4 +910,22 @@ public class PopupMenu extends JPopupMenu
         getGroup().setColourText(showColourText.isSelected());
         refresh();
     }
+
+    public void showLink(String url)
+    {
+      try
+      {
+        jalview.util.BrowserLauncher.openURL(url);
+      }
+      catch (Exception ex)
+      {
+        JOptionPane.showInternalMessageDialog(Desktop.desktop,
+            "Unixers: Couldn't find default web browser."
+           +"\nAdd the full path to your browser in Preferences.",
+           "Web browser not found", JOptionPane.WARNING_MESSAGE );
+
+
+        ex.printStackTrace();
+      }
+    }
 }