From 86838d2566aadd780bd460bdc1276eec77875e26 Mon Sep 17 00:00:00 2001 From: jprocter Date: Wed, 5 Sep 2012 21:53:10 +0100 Subject: [PATCH] formatting --- src/jalview/ws/jws2/Jws2Discoverer.java | 227 ++++++++++++++++++------------- 1 file changed, 131 insertions(+), 96 deletions(-) diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java index c4ef059..119d37b 100644 --- a/src/jalview/ws/jws2/Jws2Discoverer.java +++ b/src/jalview/ws/jws2/Jws2Discoverer.java @@ -156,16 +156,17 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI { validServiceUrls.removeAllElements(); } - ArrayList svctypes=new ArrayList(); + ArrayList svctypes = new ArrayList(); List qrys = new ArrayList(); for (final String jwsservers : getServiceUrls()) { JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsservers); - if (svctypes.size()==0) + if (svctypes.size() == 0) { - // TODO: remove this ugly hack to get Canonical JABA service ordering for all possible services - for (Services sv:squery.JABAWS2SERVERS) + // TODO: remove this ugly hack to get Canonical JABA service ordering + // for all possible services + for (Services sv : squery.JABAWS2SERVERS) { svctypes.add(sv.toString()); } @@ -177,7 +178,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI boolean finished = true; do { - finished=true; + finished = true; try { Thread.sleep(100); @@ -203,21 +204,23 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI { // 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) + + if (services != null && services.size() > 0) { - Jws2Instance[] svcs=new Jws2Instance[services.size()]; - int[] spos=new int[services.size()]; - int ipos=0; + Jws2Instance[] svcs = new Jws2Instance[services.size()]; + int[] spos = new int[services.size()]; + int ipos = 0; Vector svcUrls = getServiceUrls(); - for (Jws2Instance svc:services) + for (Jws2Instance svc : services) { - svcs[ipos]=svc; - spos[ipos++]=1000*svcUrls.indexOf(svc.getHost()) + 1+svctypes.indexOf(svc.serviceType); + 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 = new Vector(); + for (Jws2Instance svc : svcs) + { services.add(svc); } } @@ -242,16 +245,16 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } System.out.println("Discovered service: " + jwsservers + " " + service.toString()); -// Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(), -// service2); + // Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(), + // service2); services.add(service); // retrieve the presets and parameter set and cache now service.getParamStore().getPresets(); service.hasParameters(); - if (validServiceUrls==null) + if (validServiceUrls == null) { - validServiceUrls=new Vector(); + validServiceUrls = new Vector(); } validServiceUrls.add(jwsservers); } @@ -260,18 +263,24 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI * holds list of services. */ protected Vector services; + /** - * attach all available web services to the appropriate submenu in the given JMenu + * attach all available web services to the appropriate submenu in the given + * JMenu */ public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame) { // dynamically regenerate service list. populateWSMenuEntry(wsmenu, alignFrame, null); } - private boolean isRecalculable(String action) { - return (action!=null && action.equalsIgnoreCase("conservation")); + + private boolean isRecalculable(String action) + { + return (action != null && action.equalsIgnoreCase("conservation")); } - private void populateWSMenuEntry(JMenu jws2al, final AlignFrame alignFrame, String typeFilter) + + private void populateWSMenuEntry(JMenu jws2al, + final AlignFrame alignFrame, String typeFilter) { if (running || services == null || services.size() == 0) { @@ -284,20 +293,24 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI * for moment we keep them separate. */ JMenu atpoint; - List enumerableServices=new ArrayList(); - //jws2al.removeAll(); - Map preferredHosts=new HashMap(); + List enumerableServices = new ArrayList(); + // jws2al.removeAll(); + Map preferredHosts = new HashMap(); Map> alternates = new HashMap>(); for (Jws2Instance service : services.toArray(new Jws2Instance[0])) { - if (!isRecalculable(service.action)) { - // add 'one shot' services to be displayed using the classic menu structure + if (!isRecalculable(service.action)) + { + // add 'one shot' services to be displayed using the classic menu + // structure enumerableServices.add(service); - } else { + } + else + { if (!preferredHosts.containsKey(service.serviceType)) { - Jws2Instance preferredInstance = getPreferredServiceFor(alignFrame, - service.serviceType); + Jws2Instance preferredInstance = getPreferredServiceFor( + alignFrame, service.serviceType); if (preferredInstance != null) { preferredHosts.put(service.serviceType, preferredInstance); @@ -307,12 +320,12 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI preferredHosts.put(service.serviceType, service); } } - List ph=alternates.get(service.serviceType); - if (preferredHosts.get(service.serviceType)!=service) + List ph = alternates.get(service.serviceType); + if (preferredHosts.get(service.serviceType) != service) { - if (ph==null) + if (ph == null) { - ph=new ArrayList(); + ph = new ArrayList(); } ph.add(service); alternates.put(service.serviceType, ph); @@ -326,9 +339,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI // and the instantaneous services for (final Jws2Instance service : preferredHosts.values()) { - atpoint = JvSwingUtils.findOrCreateMenu(jws2al,service.action); + atpoint = JvSwingUtils.findOrCreateMenu(jws2al, service.action); JMenuItem hitm; - if (atpoint.getItemCount()>1) { + if (atpoint.getItemCount() > 1) + { // previous service of this type already present atpoint.addSeparator(); } @@ -349,12 +363,13 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI service.attachWSMenuEntry(atpoint, alignFrame); if (alternates.containsKey(service.serviceType)) { - atpoint.add(hitm=new JMenu("Switch server")); - hitm.setToolTipText(JvSwingUtils.wrapTooltip("Choose a server for running this service")); - for (final Jws2Instance sv:alternates.get(service.serviceType)) + atpoint.add(hitm = new JMenu("Switch server")); + hitm.setToolTipText(JvSwingUtils + .wrapTooltip("Choose a server for running this service")); + for (final Jws2Instance sv : alternates.get(service.serviceType)) { JMenuItem itm; - hitm.add(itm=new JMenuItem(sv.getHost())); + hitm.add(itm = new JMenuItem(sv.getHost())); itm.setForeground(Color.blue); itm.addActionListener(new ActionListener() { @@ -362,38 +377,39 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI @Override public void actionPerformed(ActionEvent arg0) { - new Thread(new Runnable() { - public void run() { - setPreferredServiceFor(alignFrame, sv.serviceType, sv.action, sv); - changeSupport.firePropertyChange("services", new Vector(), services); + new Thread(new Runnable() + { + public void run() + { + setPreferredServiceFor(alignFrame, sv.serviceType, + sv.action, sv); + changeSupport.firePropertyChange("services", + new Vector(), services); }; }).start(); } }); } - /*hitm.addActionListener(new ActionListener() - { - - @Override - public void actionPerformed(ActionEvent arg0) - { - new Thread(new Runnable() { - @Override - public void run() - { - new SetPreferredServer(alignFrame, service.serviceType, service.action); - } - }).start(); - } - });*/ + /* + * hitm.addActionListener(new ActionListener() { + * + * @Override public void actionPerformed(ActionEvent arg0) { new + * Thread(new Runnable() { + * + * @Override public void run() { new SetPreferredServer(alignFrame, + * service.serviceType, service.action); } }).start(); } }); + */ } } } + /** - * add services using the Java 2.5/2.6/2.7 system which optionally creates submenus to index by host and service program type + * add services using the Java 2.5/2.6/2.7 system which optionally creates + * submenus to index by host and service program type */ - private void addEnumeratedServices(final JMenu jws2al, final AlignFrame alignFrame, List enumerableServices) + private void addEnumeratedServices(final JMenu jws2al, + final AlignFrame alignFrame, List enumerableServices) { boolean byhost = Cache.getDefault("WSMENU_BYHOST", false), bytype = Cache .getDefault("WSMENU_BYTYPE", false); @@ -406,7 +422,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI List hostLabels = new ArrayList(); Hashtable lasthostFor = new Hashtable(); Hashtable> hosts = new Hashtable>(); - ArrayList hostlist=new ArrayList(); + ArrayList hostlist = new ArrayList(); for (Jws2Instance service : enumerableServices) { ArrayList hostservices = hosts.get(service.getHost()); @@ -431,7 +447,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI jalview.util.QuickSort.sort(sortbytype, orderedsvcs); for (final Jws2Instance service : orderedsvcs) { - atpoint = JvSwingUtils.findOrCreateMenu(jws2al,service.action); + atpoint = JvSwingUtils.findOrCreateMenu(jws2al, service.action); String type = service.serviceType; if (byhost) { @@ -460,12 +476,16 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI // contiguous // group JMenuItem hitm; - if (hostLabels.contains(host)) { + if (hostLabels.contains(host)) + { atpoint.addSeparator(); - } else { + } + else + { hostLabels.add(host); } - if (lasthostFor.get(service.action) == null || !lasthostFor.get(service.action).equals(host)) + if (lasthostFor.get(service.action) == null + || !lasthostFor.get(service.action).equals(host)) { atpoint.add(hitm = new JMenuItem(host)); hitm.setForeground(Color.blue); @@ -480,25 +500,27 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI }); hitm.setToolTipText(JvSwingUtils .wrapTooltip("Opens the JABAWS server's homepage in web browser")); - lasthostFor.put(service.action,host); + 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) + if (args.length > 0) { testUrls = new Vector(); - for (String url:args) + for (String url : args) { testUrls.add(url); - }; + } + ; } Thread runner = getDiscoverer().startDiscoverer( new PropertyChangeListener() @@ -510,10 +532,13 @@ 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) + int i = 1; + for (Jws2Instance instance : getDiscoverer().services) { - System.out.println("Service "+i+++" "+instance.getClass()+"@"+instance.getHost()+": "+instance.getActionText()); + System.out.println("Service " + i++ + " " + + instance.getClass() + "@" + + instance.getHost() + ": " + + instance.getActionText()); } } @@ -529,9 +554,12 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } ; } - try { + try + { Thread.sleep(50); - } catch (InterruptedException x) {} + } catch (InterruptedException x) + { + } } private static Jws2Discoverer discoverer; @@ -581,10 +609,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } } - private static Vector testUrls=null; + private static Vector testUrls = null; + public static Vector getServiceUrls() { - if (testUrls!=null) + if (testUrls != null) { // return test urls, if there are any, instead of touching cache return testUrls; @@ -691,7 +720,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI return thr; } - Vector invalidServiceUrls = null, urlsWithoutServices = null, validServiceUrls=null; + Vector invalidServiceUrls = null, urlsWithoutServices = null, + validServiceUrls = null; /** * @return the invalidServiceUrls @@ -800,13 +830,13 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI public int getServerStatusFor(String url) { - if (validServiceUrls!=null && validServiceUrls.contains(url)) + if (validServiceUrls != null && validServiceUrls.contains(url)) { return 1; } - if (urlsWithoutServices!=null && urlsWithoutServices.contains(url)) - return 0; - if (invalidServiceUrls!=null && invalidServiceUrls.contains(url)) + if (urlsWithoutServices != null && urlsWithoutServices.contains(url)) + return 0; + if (invalidServiceUrls != null && invalidServiceUrls.contains(url)) { return -1; } @@ -814,7 +844,9 @@ 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) + * 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. @@ -847,15 +879,18 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } return match; } - - Map> preferredServiceMap = new HashMap>(); -; + + Map> preferredServiceMap = new HashMap>();; /** * 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. + * + * @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) @@ -870,11 +905,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI // recover global setting, if any prefmap = preferredServiceMap.get(""); } - if (prefmap != null) - { - serviceurl = prefmap.get(serviceType); - } - + if (prefmap != null) + { + serviceurl = prefmap.get(serviceType); + } + } Jws2Instance response = null; for (Jws2Instance svc : services) -- 1.7.10.2