unnecessary code

[jalview.git] / src / jalview / ws / EnfinEnvision2OneWay.java

diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java
index 8905515..b1a0bdb 100644 (file)
--- a/src/jalview/ws/EnfinEnvision2OneWay.java
+++ b/src/jalview/ws/EnfinEnvision2OneWay.java
@@ -11,6 +11,7 @@ import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
 import jalview.util.GroupUrlLink;
 
+import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -208,6 +209,15 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements Runnable,WSM
    */
   private void addshowLink(JMenu linkMenu, String label, String descr, final GroupUrlLink urlgenerator, final Object[] urlstub)
   {
+    Component[] jmi=linkMenu.getMenuComponents();
+    for (int i=0; i<jmi.length; i++)
+    {
+      if (jmi[i] instanceof JMenuItem && ((JMenuItem)jmi[i]).getText().equalsIgnoreCase(label))
+      {
+        // don't add this - its a repeat of an existing URL.
+        return;
+      }
+    }
     JMenuItem item = new JMenuItem(label);
     item.setToolTipText("Submit ("+urlgenerator.getNumberInvolved(urlstub)+" seqs) to workflow: "+descr);
     item.addActionListener(new java.awt.event.ActionListener()
@@ -420,7 +430,7 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements Runnable,WSM
       //System.out.println(urlLink.getGroupURLType() +" "+((String[])urlset[3])[0]);
       // first two bits ofurlLink type bitfield are sequenceids and sequences
       // TODO: FUTURE: ensure the groupURL menu structure can be generalised
-      addshowLink(linkMenus[type], label + (((type & 1)==1) ? ("("+(usingNames ? "Names" : ltarget)+")") : ""), descr, urlLink, urlset);
+      addshowLink(linkMenus[type], label + " "+(usingNames ? (((type & 1)==1) ? "(Names)" : "") : ("("+ltarget+")")), descr, urlLink, urlset);
       return true;
     }
     return false;