First patch for * JAL-493

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 2e6ea52..a6caa51 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -36,6 +36,7 @@ import jalview.io.*;
 import jalview.jbgui.*;
 import jalview.schemes.*;
 import jalview.ws.*;
+import jalview.ws.jws2.Jws2Discoverer;
 
 /**
  * DOCUMENT ME!
@@ -3816,7 +3817,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         {
           final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) msaws
                   .get(i);
-          jalview.ws.WSClient impl = jalview.ws.Discoverer
+          jalview.ws.WSMenuEntryProviderI impl = jalview.ws.Discoverer
                   .getServiceClient(sh);
           impl.attachWSMenuEntry(msawsmenu, this);
 
@@ -3831,7 +3832,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         {
           final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) secstrpr
                   .get(i);
-          jalview.ws.WSClient impl = jalview.ws.Discoverer
+          jalview.ws.WSMenuEntryProviderI impl = jalview.ws.Discoverer
                   .getServiceClient(sh);
           impl.attachWSMenuEntry(secstrmenu, this);
         }
@@ -3845,12 +3846,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         {
           final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) seqsrch
                   .elementAt(i);
-          jalview.ws.WSClient impl = jalview.ws.Discoverer
+          jalview.ws.WSMenuEntryProviderI impl = jalview.ws.Discoverer
                   .getServiceClient(sh);
           impl.attachWSMenuEntry(seqsrchmenu, this);
         }
         wsmenu.add(seqsrchmenu);
       }
+      // TODO: move into separate menu builder class.
+      {
+        Jws2Discoverer jws2servs = Jws2Discoverer.getDiscoverer();
+        if (jws2servs!=null && jws2servs.hasServices())
+        {
+          JMenu jws2men = new JMenu("Jalview 2 Services");
+          jws2servs.attachWSMenuEntry(jws2men, this);
+          wsmenu.add(jws2men);
+        }
+      }
       // finally, add the whole shebang onto the webservices menu
       resetWebServiceMenu();
       for (int i = 0, j = wsmenu.size(); i < j; i++)