X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;h=f1f8690c5d4fe704a3bc08bbe56f512c582ceaab;hb=c794c5033adeee182b03a5ea92c0a7495a29661f;hp=5319eab2979525105e2281d0772b40466db34363;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 5319eab..f1f8690 100644
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -22,34 +22,25 @@ package jalview.ws.jws2;
 
 import jalview.bin.Cache;
 import jalview.gui.AlignFrame;
-import jalview.gui.Desktop;
-import jalview.gui.JvSwingUtils;
 import jalview.util.MessageManager;
 import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ParamDatastoreI;
 
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
 import javax.swing.JMenu;
-import javax.swing.JMenuItem;
 
 import compbio.ws.client.Services;
 
@@ -178,7 +169,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     running = true;
 
     // first set up exclusion list if needed
-    final Set<String> ignoredServices = new HashSet<String>();
+    final Set<String> ignoredServices = new HashSet<>();
     for (String ignored : Cache
             .getDefault("IGNORED_JABAWS_SERVICETYPES", "").split("\\|"))
     {
@@ -217,9 +208,9 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     {
       validServiceUrls.removeAllElements();
     }
-    ArrayList<String> svctypes = new ArrayList<String>();
+    ArrayList<String> svctypes = new ArrayList<>();
 
-    List<JabaWsServerQuery> qrys = new ArrayList<JabaWsServerQuery>();
+    List<JabaWsServerQuery> qrys = new ArrayList<>();
     for (final String jwsserver : getServiceUrls())
     {
       JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsserver);
@@ -249,7 +240,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       } catch (Exception e)
       {
       }
-      ;
       for (JabaWsServerQuery squery : qrys)
       {
         if (squery.isRunning())
@@ -281,14 +271,14 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
         for (Jws2Instance svc : services)
         {
           svcs[ipos] = svc;
-          spos[ipos++] = 1000 * svcUrls.indexOf(svc.getHost()) + 1
-                  + svctypes.indexOf(svc.serviceType);
+          spos[ipos++] = 1000 * svcUrls.indexOf(svc.getHostURL()) + 1
+                  + svctypes.indexOf(svc.getName());
         }
         jalview.util.QuickSort.sort(spos, svcs);
-        services = new Vector<Jws2Instance>();
+        services = new Vector<>();
         for (Jws2Instance svc : svcs)
         {
-          if (!ignoredServices.contains(svc.serviceType))
+          if (!ignoredServices.contains(svc.getName()))
           {
             services.add(svc);
           }
@@ -312,7 +302,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   {
     if (services == null)
     {
-      services = new Vector<Jws2Instance>();
+      services = new Vector<>();
     }
     System.out.println(
             "Discovered service: " + jwsservers + " " + service.toString());
@@ -329,7 +319,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     service.hasParameters();
     if (validServiceUrls == null)
     {
-      validServiceUrls = new Vector<String>();
+      validServiceUrls = new Vector<>();
     }
     validServiceUrls.add(jwsservers);
   }
@@ -341,252 +331,37 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   @Override
   public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
   {
+    if (running || services == null || services.size() == 0)
+    {
+      return;
+    }
     // dynamically regenerate service list.
     populateWSMenuEntry(wsmenu, alignFrame, null);
   }
 
-  private boolean isRecalculable(String action)
-  {
-    return (action != null && action.equalsIgnoreCase("conservation"));
-  }
-
   private void populateWSMenuEntry(JMenu jws2al,
           final AlignFrame alignFrame, String typeFilter)
   {
-    if (running || services == null || services.size() == 0)
-    {
-      return;
-    }
-
-    /**
-     * eventually, JWS2 services will appear under the same align/etc submenus.
-     * for moment we keep them separate.
-     */
-    JMenu atpoint;
-    List<Jws2Instance> enumerableServices = new ArrayList<Jws2Instance>();
-    // jws2al.removeAll();
-    Map<String, Jws2Instance> preferredHosts = new HashMap<String, Jws2Instance>();
-    Map<String, List<Jws2Instance>> alternates = new HashMap<String, List<Jws2Instance>>();
-    for (Jws2Instance service : services.toArray(new Jws2Instance[0]))
-    {
-      if (!isRecalculable(service.action))
-      {
-        // add 'one shot' services to be displayed using the classic menu
-        // structure
-        enumerableServices.add(service);
-      }
-      else
-      {
-        if (!preferredHosts.containsKey(service.serviceType))
-        {
-          Jws2Instance preferredInstance = getPreferredServiceFor(
-                  alignFrame, service.serviceType);
-          if (preferredInstance != null)
-          {
-            preferredHosts.put(service.serviceType, preferredInstance);
-          }
-          else
-          {
-            preferredHosts.put(service.serviceType, service);
-          }
-        }
-        List<Jws2Instance> ph = alternates.get(service.serviceType);
-        if (preferredHosts.get(service.serviceType) != service)
-        {
-          if (ph == null)
-          {
-            ph = new ArrayList<Jws2Instance>();
-          }
-          ph.add(service);
-          alternates.put(service.serviceType, ph);
-        }
-      }
-
-    }
-
-    // create GUI element for classic services
-    addEnumeratedServices(jws2al, alignFrame, enumerableServices);
-    // and the instantaneous services
-    for (final Jws2Instance service : preferredHosts.values())
-    {
-      atpoint = JvSwingUtils.findOrCreateMenu(jws2al, service.action);
-      JMenuItem hitm;
-      if (atpoint.getItemCount() > 1)
-      {
-        // previous service of this type already present
-        atpoint.addSeparator();
-      }
-      atpoint.add(hitm = new JMenuItem(service.getHost()));
-      hitm.setForeground(Color.blue);
-      hitm.addActionListener(new ActionListener()
-      {
-
-        @Override
-        public void actionPerformed(ActionEvent e)
-        {
-          Desktop.showUrl(service.getHost());
-        }
-      });
-      hitm.setToolTipText(JvSwingUtils.wrapTooltip(false,
-              MessageManager.getString("label.open_jabaws_web_page")));
-
-      service.attachWSMenuEntry(atpoint, alignFrame);
-      if (alternates.containsKey(service.serviceType))
-      {
-        atpoint.add(hitm = new JMenu(
-                MessageManager.getString("label.switch_server")));
-        hitm.setToolTipText(JvSwingUtils.wrapTooltip(false,
-                MessageManager.getString("label.choose_jabaws_server")));
-        for (final Jws2Instance sv : alternates.get(service.serviceType))
-        {
-          JMenuItem itm;
-          hitm.add(itm = new JMenuItem(sv.getHost()));
-          itm.setForeground(Color.blue);
-          itm.addActionListener(new ActionListener()
-          {
-
-            @Override
-            public void actionPerformed(ActionEvent arg0)
-            {
-              new Thread(new Runnable()
-              {
-                @Override
-                public void run()
-                {
-                  setPreferredServiceFor(alignFrame, sv.serviceType,
-                          sv.action, sv);
-                  changeSupport.firePropertyChange("services",
-                          new Vector<Jws2Instance>(), services);
-                };
-              }).start();
-
-            }
-          });
-        }
-      }
-    }
+    PreferredServiceRegistry.getRegistry().populateWSMenuEntry(
+            getServices(),
+            changeSupport, jws2al,
+            alignFrame, typeFilter);
   }
 
   /**
-   * add services using the Java 2.5/2.6/2.7 system which optionally creates
-   * submenus to index by host and service program type
+   * 
+   * @param args
+   * @j2sIgnore
    */
-  private void addEnumeratedServices(final JMenu jws2al,
-          final AlignFrame alignFrame,
-          List<Jws2Instance> enumerableServices)
-  {
-    boolean byhost = Cache.getDefault("WSMENU_BYHOST", false),
-            bytype = Cache.getDefault("WSMENU_BYTYPE", false);
-    /**
-     * eventually, JWS2 services will appear under the same align/etc submenus.
-     * for moment we keep them separate.
-     */
-    JMenu atpoint;
-
-    List<String> hostLabels = new ArrayList<String>();
-    Hashtable<String, String> lasthostFor = new Hashtable<String, String>();
-    Hashtable<String, ArrayList<Jws2Instance>> hosts = new Hashtable<String, ArrayList<Jws2Instance>>();
-    ArrayList<String> hostlist = new ArrayList<String>();
-    for (Jws2Instance service : enumerableServices)
-    {
-      ArrayList<Jws2Instance> hostservices = hosts.get(service.getHost());
-      if (hostservices == null)
-      {
-        hosts.put(service.getHost(),
-                hostservices = new ArrayList<Jws2Instance>());
-        hostlist.add(service.getHost());
-      }
-      hostservices.add(service);
-    }
-    // now add hosts in order of the given array
-    for (String host : hostlist)
-    {
-      Jws2Instance orderedsvcs[] = hosts.get(host)
-              .toArray(new Jws2Instance[1]);
-      String sortbytype[] = new String[orderedsvcs.length];
-      for (int i = 0; i < sortbytype.length; i++)
-      {
-        sortbytype[i] = orderedsvcs[i].serviceType;
-      }
-      jalview.util.QuickSort.sort(sortbytype, orderedsvcs);
-      for (final Jws2Instance service : orderedsvcs)
-      {
-        atpoint = JvSwingUtils.findOrCreateMenu(jws2al, service.action);
-        String type = service.serviceType;
-        if (byhost)
-        {
-          atpoint = JvSwingUtils.findOrCreateMenu(atpoint, host);
-          if (atpoint.getToolTipText() == null)
-          {
-            atpoint.setToolTipText(MessageManager
-                    .formatMessage("label.services_at", new String[]
-                    { host }));
-          }
-        }
-        if (bytype)
-        {
-          atpoint = JvSwingUtils.findOrCreateMenu(atpoint, type);
-          if (atpoint.getToolTipText() == null)
-          {
-            atpoint.setToolTipText(service.getActionText());
-          }
-        }
-        if (!byhost && !hostLabels.contains(
-                host + service.serviceType + service.getActionText()))
-        // !hostLabels.contains(host + (bytype ?
-        // service.serviceType+service.getActionText() : "")))
-        {
-          // add a marker indicating where this service is hosted
-          // relies on services from the same host being listed in a
-          // contiguous
-          // group
-          JMenuItem hitm;
-          if (hostLabels.contains(host))
-          {
-            atpoint.addSeparator();
-          }
-          else
-          {
-            hostLabels.add(host);
-          }
-          if (lasthostFor.get(service.action) == null
-                  || !lasthostFor.get(service.action).equals(host))
-          {
-            atpoint.add(hitm = new JMenuItem(host));
-            hitm.setForeground(Color.blue);
-            hitm.addActionListener(new ActionListener()
-            {
-
-              @Override
-              public void actionPerformed(ActionEvent e)
-              {
-                Desktop.showUrl(service.getHost());
-              }
-            });
-            hitm.setToolTipText(
-                    JvSwingUtils.wrapTooltip(true, MessageManager
-                            .getString("label.open_jabaws_web_page")));
-            lasthostFor.put(service.action, host);
-          }
-          hostLabels.add(
-                  host + service.serviceType + service.getActionText());
-        }
-
-        service.attachWSMenuEntry(atpoint, alignFrame);
-      }
-    }
-  }
-
   public static void main(String[] args)
   {
     if (args.length > 0)
     {
-      testUrls = new ArrayList<String>();
+      testUrls = new ArrayList<>();
       for (String url : args)
       {
         testUrls.add(url);
       }
-      ;
     }
     Thread runner = getDiscoverer()
             .startDiscoverer(new PropertyChangeListener()
@@ -600,10 +375,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
                   System.out.println("Changesupport: There are now "
                           + getDiscoverer().services.size() + " services");
                   int i = 1;
-                  for (Jws2Instance instance : getDiscoverer().services)
+                  for (ServiceWithParameters instance : getDiscoverer().services)
                   {
                     System.out.println("Service " + i++ + " "
-                            + instance.getClass() + "@" + instance.getHost()
+                            + instance.getClass() + "@"
+                            + instance.getHostURL()
                             + ": " + instance.getActionText());
                   }
 
@@ -618,7 +394,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       } catch (InterruptedException e)
       {
       }
-      ;
     }
     try
     {
@@ -685,7 +460,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       // return test urls, if there are any, instead of touching cache
       return testUrls;
     }
-    List<String> urls = new ArrayList<String>();
+    List<String> urls = new ArrayList<>();
 
     if (this.preferredUrl != null)
     {
@@ -731,10 +506,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     return urls;
   }
 
-  public Vector<Jws2Instance> getServices()
+  public Vector<ServiceWithParameters> getServices()
   {
-    return (services == null) ? new Vector<Jws2Instance>()
-            : new Vector<Jws2Instance>(services);
+    return (services == null) ? new Vector<>()
+            : new Vector<>(services);
   }
 
   /**
@@ -839,7 +614,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   {
     if (urlsWithoutServices == null)
     {
-      urlsWithoutServices = new Vector<String>();
+      urlsWithoutServices = new Vector<>();
     }
 
     if ((invalidServiceUrls == null
@@ -859,7 +634,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   {
     if (invalidServiceUrls == null)
     {
-      invalidServiceUrls = new Vector<String>();
+      invalidServiceUrls = new Vector<>();
     }
     if (!invalidServiceUrls.contains(jwsservers))
     {
@@ -938,114 +713,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   }
 
   /**
-   * pick the user's preferred service based on a set of URLs (jaba server
-   * locations) and service URIs (specifying version and service interface
-   * class)
-   * 
-   * @param serviceURL
-   * @return null or best match for given uri/ls.
-   */
-  public Jws2Instance getPreferredServiceFor(String[] serviceURLs)
-  {
-    HashSet<String> urls = new HashSet<String>();
-    urls.addAll(Arrays.asList(serviceURLs));
-    Jws2Instance match = null;
-    if (services != null)
-    {
-      for (Jws2Instance svc : services)
-      {
-        if (urls.contains(svc.getServiceTypeURI()))
-        {
-          if (match == null)
-          {
-            // for moment we always pick service from server ordered first in
-            // user's preferences
-            match = svc;
-          }
-          if (urls.contains(svc.getUri()))
-          {
-            // stop and return - we've matched type URI and URI for service
-            // endpoint
-            return svc;
-          }
-        }
-      }
-    }
-    return match;
-  }
-
-  Map<String, Map<String, String>> preferredServiceMap = new HashMap<String, Map<String, String>>();;
-
-  /**
-   * get current preferred service of the given type, or global default
-   * 
-   * @param af
-   *          null or a specific alignFrame
-   * @param serviceType
-   *          Jws2Instance.serviceType for service
-   * @return null if no service of this type is available, the preferred service
-   *         for the serviceType and af if specified and if defined.
-   */
-  public Jws2Instance getPreferredServiceFor(AlignFrame af,
-          String serviceType)
-  {
-    String serviceurl = null;
-    synchronized (preferredServiceMap)
-    {
-      String afid = (af == null) ? "" : af.getViewport().getSequenceSetId();
-      Map<String, String> prefmap = preferredServiceMap.get(afid);
-      if (afid.length() > 0 && prefmap == null)
-      {
-        // recover global setting, if any
-        prefmap = preferredServiceMap.get("");
-      }
-      if (prefmap != null)
-      {
-        serviceurl = prefmap.get(serviceType);
-      }
-
-    }
-    Jws2Instance response = null;
-    for (Jws2Instance svc : services)
-    {
-      if (svc.serviceType.equals(serviceType))
-      {
-        if (serviceurl == null || serviceurl.equals(svc.getHost()))
-        {
-          response = svc;
-          break;
-        }
-      }
-    }
-    return response;
-  }
-
-  public void setPreferredServiceFor(AlignFrame af, String serviceType,
-          String serviceAction, Jws2Instance selectedServer)
-  {
-    String afid = (af == null) ? "" : af.getViewport().getSequenceSetId();
-    if (preferredServiceMap == null)
-    {
-      preferredServiceMap = new HashMap<String, Map<String, String>>();
-    }
-    Map<String, String> prefmap = preferredServiceMap.get(afid);
-    if (prefmap == null)
-    {
-      prefmap = new HashMap<String, String>();
-      preferredServiceMap.put(afid, prefmap);
-    }
-    prefmap.put(serviceType, selectedServer.getHost());
-    prefmap.put(serviceAction, selectedServer.getHost());
-  }
-
-  public void setPreferredServiceFor(String serviceType,
-          String serviceAction, Jws2Instance selectedServer)
-  {
-    setPreferredServiceFor(null, serviceType, serviceAction,
-            selectedServer);
-  }
-
-  /**
    * Set a URL to try before any others. For use with command-line parameter to
    * configure a local Jabaws installation without the need to add to property
    * files.