ensure host is shown for all non-host indexed submenus
authorjprocter <Jim Procter>
Mon, 20 Sep 2010 06:43:12 +0000 (06:43 +0000)
committerjprocter <Jim Procter>
Mon, 20 Sep 2010 06:43:12 +0000 (06:43 +0000)
src/jalview/ws/jws2/Jws2Discoverer.java

index d6e4d78..1f3eee9 100644 (file)
@@ -404,7 +404,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
           atpoint.setToolTipText(service.getActionText());
         }
       }
-      if (!byhost && !hostLabels.contains(host + service.getActionText()))
+      if (!byhost && !hostLabels.contains(host + 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
@@ -416,7 +416,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
           atpoint.add(hitm = new JMenuItem(host));
           hitm.setForeground(Color.blue);
         }
-        hostLabels.addElement(lasthost=host);
+        hostLabels.addElement(host + service.serviceType+service.getActionText());
       }
       msacl.attachWSMenuEntry(atpoint, service, alignFrame);
       /*