organisation by host and service type

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 784ff49..d982981 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -5,7 +5,9 @@ import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.net.ConnectException;
+import java.net.URL;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -61,11 +63,13 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   }
 
   boolean running = false;
-  Thread oldthread=null;
+
+  Thread oldthread = null;
+
   @Override
   public void run()
   {
-    if (running && oldthread!=null && oldthread.isAlive())
+    if (running && oldthread != null && oldthread.isAlive())
     {
       return;
     }
@@ -151,8 +155,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     }
     System.out.println("Discovered service: " + jwsservers + " "
             + srv.toString());
-    services.add(new Jws2Instance(jwsservers, "Align with "
-            + srv.toString(), service2));
+    services.add(new Jws2Instance(jwsservers, srv.toString(), service2));
   }
 
   public class Jws2Instance
@@ -195,6 +198,32 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       }
       return presets;
     }
+
+    public String getHost()
+    {
+      return hosturl;
+/*      try
+      {
+        URL serviceurl = new URL(hosturl);
+        if (serviceurl.getPort()!=80)
+        {
+          return serviceurl.getHost()+":"+serviceurl.getPort();
+        }
+        return serviceurl.getHost();
+      } catch (Exception e)
+      {
+        System.err.println("Failed to parse service URL '" + hosturl
+                + "' as a valid URL!");
+      }
+      return null; */
+    }
+    /**
+     * @return short description of what the service will do
+     */
+    public String getActionText() {
+      return "Align with "
+      + serviceType;
+    }
   };
 
   /**
@@ -202,6 +231,31 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
    */
   Vector<Jws2Instance> services;
 
+  /**
+   * find or add a submenu with the given title in the given menu
+   * @param menu
+   * @param submenu
+   * @return the new or existing submenu
+   */
+  private JMenu findOrCreateMenu(JMenu menu, String submenu)
+  {
+    JMenu submenuinstance = null;
+    for (int i=0,iSize=menu.getMenuComponentCount(); i<iSize; i++)
+    {
+      if (menu.getMenuComponent(i) instanceof JMenu && 
+               ((JMenu)menu.getMenuComponent(i)).getText().equals(submenu))
+      {
+        submenuinstance = (JMenu) menu.getMenuComponent(i);
+      }
+    }
+    if (submenuinstance==null)
+    {
+      submenuinstance = new JMenu(submenu);
+      menu.add(submenuinstance);
+    }
+    return submenuinstance;
+  
+  }
   @Override
   public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
   {
@@ -209,15 +263,34 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     {
       return;
     }
+    boolean byhost = Cache.getDefault("WSMENU_BYHOST", true), bytype = Cache
+            .getDefault("WSMENU_BYTYPE", true);
     /**
      * eventually, JWS2 services will appear under the same align/etc submenus.
      * for moment we keep them separate.
      */
-    JMenu jws2 = new JMenu("JWS2 Alignment");
+    JMenu atpoint, jws2al = new JMenu("JWS2 Alignment");
     MsaWSClient msacl = new MsaWSClient();
     for (final Jws2Instance service : services)
     {
-      msacl.attachWSMenuEntry(jws2, service, alignFrame);
+      atpoint = jws2al;
+      String host = service.getHost();
+      String type = service.serviceType;
+      if (byhost)
+      {
+        atpoint = findOrCreateMenu(atpoint, host);
+        if (atpoint.getToolTipText()==null) {
+          atpoint.setToolTipText("Services at "+host);
+        }
+      }
+      if (bytype)
+      {
+        atpoint = findOrCreateMenu(atpoint,type);
+        if (atpoint.getToolTipText()==null) {
+          atpoint.setToolTipText(service.getActionText());
+        }
+      }
+      msacl.attachWSMenuEntry(atpoint, service, alignFrame);
       /*
        * JMenuItem sitem = new JMenuItem(service.serviceType);
        * sitem.setToolTipText("Hosted at " + service.hosturl);
@@ -232,7 +305,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     }
     if (services.size() > 0)
     {
-      wsmenu.add(jws2);
+      wsmenu.add(jws2al);
     }
 
   }