only make a link menu when there are links

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 2bacd70..eab52f2 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -179,7 +179,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
           continue;
         }
         final String target = urlLink.getTarget(); // link.substring(0,
-                                                    // link.indexOf("|"));
+        // link.indexOf("|"));
         final String label = urlLink.getLabel();
         if (urlLink.isDynamic())
         {
@@ -191,7 +191,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
           // collect id string too
           String id = seq.getName();
           String descr = seq.getDescription();
-          if (descr!=null && descr.length()<1)
+          if (descr != null && descr.length() < 1)
           {
             descr = null;
           }
@@ -230,8 +230,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
             }
             // addshowLink(linkMenu, target, url_pref + id + url_suff);
           }
-          // Now construct URLs from description but only try to do it for regex URL links
-          if (descr != null && urlLink.getRegexReplace()!=null)
+          // Now construct URLs from description but only try to do it for regex
+          // URL links
+          if (descr != null && urlLink.getRegexReplace() != null)
           {
             // create link for this URL from description only if regex matches
             String[] urls = urlLink.makeUrls(descr, true);
@@ -252,11 +253,12 @@ public class APopupMenu extends java.awt.PopupMenu implements
          * final String url;
          * 
          * if (link.indexOf("$SEQUENCE_ID$") > -1) { // Substitute SEQUENCE_ID
-         * string and any matching database reference accessions String url_pref =
-         * link.substring(link.indexOf("|") + 1, link.indexOf("$SEQUENCE_ID$"));
+         * string and any matching database reference accessions String url_pref
+         * = link.substring(link.indexOf("|") + 1,
+         * link.indexOf("$SEQUENCE_ID$"));
          * 
          * String url_suff = link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
-         *  // collect matching db-refs DBRefEntry[] dbr =
+         * // collect matching db-refs DBRefEntry[] dbr =
          * jalview.util.DBRefUtils.selectRefs(seq.getDBRef(), new
          * String[]{target}); // collect id string too String id =
          * seq.getName(); if (id.indexOf("|") > -1) { id =
@@ -271,14 +273,16 @@ public class APopupMenu extends java.awt.PopupMenu implements
          * link.substring(link.lastIndexOf("|")+1)); }
          */
       }
-
-      if (seq != null)
+      if (linkMenu.getItemCount() > 0)
       {
-        seqMenu.add(linkMenu);
-      }
-      else
-      {
-        add(linkMenu);
+        if (seq != null)
+        {
+          seqMenu.add(linkMenu);
+        }
+        else
+        {
+          add(linkMenu);
+        }
       }
     }
     if (seq != null)
@@ -301,10 +305,10 @@ public class APopupMenu extends java.awt.PopupMenu implements
    * add a show URL menu item to the given linkMenu
    * 
    * @param linkMenu
-   * @param target -
-   *                menu label string
-   * @param url -
-   *                url to open
+   * @param target
+   *          - menu label string
+   * @param url
+   *          - url to open
    */
   private void addshowLink(Menu linkMenu, final String target,
           final String url)
@@ -316,12 +320,12 @@ public class APopupMenu extends java.awt.PopupMenu implements
    * add a show URL menu item to the given linkMenu
    * 
    * @param linkMenu
-   * @param target -
-   *                URL target window
-   * @param label -
-   *                menu label string
-   * @param url -
-   *                url to open
+   * @param target
+   *          - URL target window
+   * @param label
+   *          - menu label string
+   * @param url
+   *          - url to open
    */
   private void addshowLink(Menu linkMenu, final String target,
           final String label, final String url)