X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;h=b440de8f8909011b2fef16d31960c23bb68621d0;hb=2a5cbe264ec842c1a0f93e6bd78294607a94e686;hp=1c912d89f3f1be41ec5376ff33be88fd75aa8756;hpb=52a6409c5880b3e108e7c77e756222ed22f6b87f;p=jalview.git diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java index 1c912d8..b440de8 100644 --- a/src/jalview/ws/jws2/Jws2Discoverer.java +++ b/src/jalview/ws/jws2/Jws2Discoverer.java @@ -17,15 +17,20 @@ */ package jalview.ws.jws2; +import jalview.bin.Cache; +import jalview.gui.AlignFrame; +import jalview.gui.Desktop; +import jalview.gui.JvSwingUtils; +import jalview.ws.WSMenuEntryProviderI; +import jalview.ws.jws2.jabaws2.Jws2Instance; + import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.net.ConnectException; import java.net.URL; import java.util.ArrayList; -import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.StringTokenizer; @@ -33,23 +38,7 @@ 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.gui.JalviewChangeSupport; -import jalview.gui.JvSwingUtils; -import jalview.ws.WSMenuEntryProviderI; -import jalview.ws.jws2.jabaws2.Jws2Instance; -import compbio.data.msa.JABAService; -import compbio.metadata.Option; -import compbio.metadata.Preset; -import compbio.ws.client.Jws2Client; import compbio.ws.client.Services; /** @@ -132,6 +121,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI Cache.log.debug("Old discovery thread has finished."); } running = true; + changeSupport.firePropertyChange("services", services, new Vector()); oldthread = Thread.currentThread(); try { @@ -158,17 +148,32 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI { invalidServiceUrls.removeAllElements(); } + if (validServiceUrls != null) + { + validServiceUrls.removeAllElements(); + } + ArrayList svctypes=new ArrayList(); List qrys = new ArrayList(); for (final String jwsservers : getServiceUrls()) { JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsservers); + if (svctypes.size()==0) + { + // TODO: remove this ugly hack to get Canonical JABA service ordering for all possible services + for (Services sv:squery.JABAWS2SERVERS) + { + svctypes.add(sv.toString()); + } + + } qrys.add(squery); new Thread(squery).start(); } - boolean finished = false; + boolean finished = true; do { + finished=true; try { Thread.sleep(100); @@ -178,7 +183,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI ; for (JabaWsServerQuery squery : qrys) { - finished |= !squery.isRunning(); + finished = finished && !squery.isRunning(); } if (aborted) { @@ -190,12 +195,32 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } } } while (!aborted && !finished); - oldthread = null; - running = false; if (!aborted) { - changeSupport.firePropertyChange("services", new Vector(), services); + // resort services according to order found in jabaws service list + // also ensure servics for each host are ordered in same way. + + if (services!=null && services.size()>0) + { + Jws2Instance[] svcs=new Jws2Instance[services.size()]; + int[] spos=new int[services.size()]; + int ipos=0; + Vector svcUrls = getServiceUrls(); + for (Jws2Instance svc:services) + { + svcs[ipos]=svc; + spos[ipos++]=1000*svcUrls.indexOf(svc.getHost()) + 1+svctypes.indexOf(svc.serviceType); + } + jalview.util.QuickSort.sort(spos, svcs); + services=new Vector(); + for (Jws2Instance svc:svcs) { + services.add(svc); + } + } } + oldthread = null; + running = false; + changeSupport.firePropertyChange("services", new Vector(), services); } /** @@ -220,6 +245,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI // retrieve the presets and parameter set and cache now service.getParamStore().getPresets(); service.hasParameters(); + if (validServiceUrls==null) + { + validServiceUrls=new Vector(); + } + validServiceUrls.add(jwsservers); } /** @@ -251,9 +281,9 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI MsaWSClient msacl = new MsaWSClient(); Vector hostLabels = new Vector(); jws2al.removeAll(); - String lasthost = null; + Hashtable lasthostFor = new Hashtable(); Hashtable> hosts = new Hashtable>(); - String[] sorton; + ArrayList hostlist=new ArrayList(); for (Jws2Instance service : services) { ArrayList hostservices = hosts.get(service.getHost()); @@ -261,12 +291,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI { hosts.put(service.getHost(), hostservices = new ArrayList()); + hostlist.add(service.getHost()); } hostservices.add(service); } - sorton = hosts.keySet().toArray(new String[1]); - String hostlist[] = sorton.clone(); - jalview.util.QuickSort.sort(sorton, hostlist); + // now add hosts in order of the given array for (String host : hostlist) { Jws2Instance orderedsvcs[] = hosts.get(host).toArray( @@ -309,7 +338,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI // group JMenuItem hitm; atpoint.addSeparator(); - if (lasthost == null || !lasthost.equals(host)) + if (lasthostFor.get(service.action) == null || !lasthostFor.get(service.action).equals(host)) { atpoint.add(hitm = new JMenuItem(host)); hitm.setForeground(Color.blue); @@ -324,7 +353,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI }); hitm.setToolTipText(JvSwingUtils .wrapTooltip("Opens the JABAWS server's homepage in web browser")); - lasthost = host; + lasthostFor.put(service.action,host); } hostLabels.addElement(host + service.serviceType + service.getActionText()); @@ -370,6 +399,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) + { + System.out.println("Service "+i+++" "+instance.getClass()+"@"+instance.getHost()+": "+instance.getActionText()); + } } } @@ -384,6 +418,9 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } ; } + try { + Thread.sleep(50); + } catch (InterruptedException x) {} } private static Jws2Discoverer discoverer; @@ -543,7 +580,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI return thr; } - Vector invalidServiceUrls = null, urlsWithoutServices = null; + Vector invalidServiceUrls = null, urlsWithoutServices = null, validServiceUrls=null; /** * @return the invalidServiceUrls @@ -649,4 +686,19 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } return null; } + + public int getServerStatusFor(String url) + { + if (validServiceUrls!=null && validServiceUrls.contains(url)) + { + return 1; + } + if (urlsWithoutServices!=null && urlsWithoutServices.contains(url)) + return 0; + if (invalidServiceUrls!=null && invalidServiceUrls.contains(url)) + { + return -1; + } + return -2; + } }