introduced and commented out code for generating URLs from description text pending...

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index f7ecfda..1fa9f7c 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -187,6 +187,11 @@ public class APopupMenu extends java.awt.PopupMenu implements
           { target });
           // collect id string too
           String id = seq.getName();
+          String descr = seq.getDescription();
+          if (descr!=null && descr.length()<1)
+          {
+            descr = null;
+          }
           if (dbr != null)
           {
             for (int r = 0; r < dbr.length; r++)
@@ -222,6 +227,21 @@ public class APopupMenu extends java.awt.PopupMenu implements
             }
             // addshowLink(linkMenu, target, url_pref + id + url_suff);
           }
+          // TODO: introduce applet parameter option to dis/en/able URl generation from description
+          // hard-disable the construction of URLs from regexes that match the description
+//          if (descr != null)
+//          {
+//            // create link for this URL from description where regex matches
+//            String[] urls = urlLink.makeUrls(descr, false);
+//            if (urls != null)
+//            {
+//              for (int u = 0; u < urls.length; u += 2)
+//              {
+//                addshowLink(linkMenu, label, urls[u + 1]);
+//              }
+//            }
+//            // addshowLink(linkMenu, target, url_pref + id + url_suff);
+//          }
         }
         else
         {

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index a7e853a..d89c776 100755 (executable)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -433,6 +433,12 @@ public class PopupMenu extends JPopupMenu
           { urlLink.getTarget() });
           // collect id string too
           String id = seq.getName();
+          String descr = seq.getDescription();
+          if (descr!=null && descr.length()<1)
+          {
+            descr = null;
+          }
+
           if (dbr != null)
           {
             for (int r = 0; r < dbr.length; r++)
@@ -467,6 +473,20 @@ public class PopupMenu extends JPopupMenu
               }
             }
           }
+          // hard-disable construction of URLs from regexes that match the description
+          // TODO: introduce a Cache preferences option to dis/en/able URl generation from description
+//          if (descr != null)
+//          {
+//            // create link for this URL from description where regex matches
+//            String[] urls = urlLink.makeUrls(descr, false);
+//            if (urls != null)
+//            {
+//              for (int u = 0; u < urls.length; u += 2)
+//              {
+//                addshowLink(linkMenu, label, urls[u + 1]);
+//              }
+//            }
+//          }
         }
         else
         {