remove duplicate host URLs in service list when not indexing services by host

[jalview.git] / src / jalview / ws / jws2 / Jws2Discoverer.java

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 2230d11..ceff8e4 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -15,13 +15,17 @@ import java.util.Vector;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
 
 import org.apache.log4j.Level;
 
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentView;
 import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
 import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.params.ParamDatastoreI;
 import compbio.data.msa.MsaWS;
 import compbio.metadata.Option;
 import compbio.metadata.Preset;
@@ -70,7 +74,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
   Thread oldthread = null;
 
-  @Override
   public void run()
   {
     if (running && oldthread != null && oldthread.isAlive())
@@ -159,7 +162,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     }
     System.out.println("Discovered service: " + jwsservers + " "
             + srv.toString());
-    services.add(new Jws2Instance(jwsservers, srv.toString(), service2));
+    Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(), service2);
+
+    services.add(service);
+    service.getParamStore();
   }
 
   public class Jws2Instance
@@ -180,6 +186,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
     PresetManager presets = null;
 
+    public JabaParamStore paramStore = null;
+
     /**
      * non thread safe - gets the presets for this service (blocks whilst it
      * calls the service to get the preset set)
@@ -251,6 +259,29 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       }
       super.finalize();
     }
+
+    public ParamDatastoreI getParamStore()
+    {
+      if (paramStore == null)
+      {
+        try
+        {
+          paramStore = new JabaParamStore(this,
+                  (Desktop.instance != null ? Desktop
+                          .getUserParameterStore() : null));
+        } catch (Exception ex)
+        {
+        }
+
+      }
+      return paramStore;
+    }
+
+    public String getUri()
+    {
+      // this is only valid for Jaba 1.0 - this formula might have to change!
+      return hosturl+"/"+serviceType;
+    }
   };
 
   /**
@@ -286,9 +317,41 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
   }
 
-  @Override
   public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
   {
+    // dynamically regenerate service list.
+    final JMenu jws2al = new JMenu("JABA Alignment");
+    jws2al.addMenuListener(new MenuListener()
+    {
+      // TODO: future: add menu listener to parent menu - so submenus are
+      // populated *before* they are selected.
+      @Override
+      public void menuSelected(MenuEvent e)
+      {
+        populateWSMenuEntry(jws2al, alignFrame);
+      }
+
+      @Override
+      public void menuDeselected(MenuEvent e)
+      {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void menuCanceled(MenuEvent e)
+      {
+        // TODO Auto-generated method stub
+
+      }
+
+    });
+    wsmenu.add(jws2al);
+    
+  }
+
+  private void populateWSMenuEntry(JMenu jws2al, final AlignFrame alignFrame)
+  {
     if (running || services == null || services.size() == 0)
     {
       return;
@@ -299,9 +362,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
      * eventually, JWS2 services will appear under the same align/etc submenus.
      * for moment we keep them separate.
      */
-    JMenu atpoint, jws2al = new JMenu("JABA Alignment");
+    JMenu atpoint;
     MsaWSClient msacl = new MsaWSClient();
     Vector hostLabels = new Vector();
+    jws2al.removeAll();
+    String lasthost=null;
     for (final Jws2Instance service : services)
     {
       atpoint = jws2al;
@@ -330,9 +395,12 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
         // group
         JMenuItem hitm;
         atpoint.addSeparator();
-        atpoint.add(hitm = new JMenuItem(host));
-        hitm.setForeground(Color.blue);
-        hostLabels.addElement(host);
+        if (lasthost==null || !lasthost.equals(host))
+        {
+          atpoint.add(hitm = new JMenuItem(host));
+          hitm.setForeground(Color.blue);
+        }
+        hostLabels.addElement(lasthost=host);
       }
       msacl.attachWSMenuEntry(atpoint, service, alignFrame);
       /*
@@ -347,11 +415,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
        * alignFrame); } });
        */
     }
-    if (services.size() > 0)
-    {
-      wsmenu.add(jws2al);
-    }
-
   }
 
   public static void main(String[] args)
@@ -360,7 +423,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     getDiscoverer().addPropertyChangeListener(new PropertyChangeListener()
     {
 
-      @Override
       public void propertyChange(PropertyChangeEvent evt)
       {
         System.out.println("Changesupport: There are now "
@@ -430,7 +492,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   public static Vector<String> getServiceUrls()
   {
     String surls = Cache.getDefault(JWS2HOSTURLS,
-            "http://www.compbio.dundee.ac.uk/jaba");
+            "http://www.compbio.dundee.ac.uk/jabaws");
     Vector<String> urls = new Vector<String>();
     try
     {
@@ -482,4 +544,29 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
             : new Vector<Jws2Instance>(services);
   }
 
+  /**
+   * test the given URL with the JabaWS test code
+   * 
+   * @param foo
+   * @return
+   */
+  public static boolean testServiceUrl(URL foo)
+  {
+    try
+    {
+      compbio.ws.client.WSTester.main(new String[]
+      { "-h=" + foo.toString() });
+    } catch (Exception e)
+    {
+      return false;
+    } catch (OutOfMemoryError e)
+    {
+      return false;
+    } catch (Error e)
+    {
+      return false;
+    }
+    return true;
+  }
+
 }