JAL-2282 Link menu disabled if there are no valid links

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index d625f78..1ff0ac1 100644 (file)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -335,17 +335,25 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     addshowLinks(linkMenu, linkset.values());
 
+    // disable link menu if there are no valid entries
     if (linkMenu.getItemCount() > 0)
     {
-      if (seq != null)
-      {
-        seqMenu.add(linkMenu);
-      }
-      else
-      {
-        add(linkMenu);
-      }
+      linkMenu.setEnabled(true);
+    }
+    else
+    {
+      linkMenu.setEnabled(false);
     }
+
+    if (seq != null)
+    {
+      seqMenu.add(linkMenu);
+    }
+    else
+    {
+      add(linkMenu);
+    }
+
   }
 
   private void addshowLinks(Menu linkMenu, Collection<List<String>> linkset)

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index b342f86..bb816cd 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -641,6 +641,16 @@ public class PopupMenu extends JPopupMenu
 
     addshowLinks(linkMenu, linkset.values());
 
+    // disable link menu if there are no valid entries
+    if (linkMenu.getItemCount() > 0)
+    {
+      linkMenu.setEnabled(true);
+    }
+    else
+    {
+      linkMenu.setEnabled(false);
+    }
+
     if (sequence != null)
     {
       sequenceMenu.add(linkMenu);
@@ -649,6 +659,7 @@ public class PopupMenu extends JPopupMenu
     {
       add(linkMenu);
     }
+
   }
 
 

diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index 7b1eac1..14354ff 100644 (file)
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -534,6 +534,16 @@ public class PopupMenuTest
               ((JMenuItem) linkItems[i]).getText().split("\\|")[1]);
     }
 
+    // if there are no valid links the Links submenu is disabled
+    List<String> nomatchlinks = new ArrayList<String>();
+    nomatchlinks.add("NOMATCH | http://www.uniprot.org/uniprot/$"
+            + DB_ACCESSION + "$");
+
+    testee = new PopupMenu(parentPanel, (Sequence) seqs.get(0),
+            nomatchlinks);
+    seqItems = testee.sequenceMenu.getMenuComponents();
+    linkMenu = (JMenu) seqItems[6];
+    assertFalse(linkMenu.isEnabled());
 
   }
 }