abstracted GUI to use jalview.ws.params objects (JAL-591, JAL-633). User defined...

[jalview.git] / src / jalview / ws / jws2 / Jws2Discoverer.java

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 2528308..eccbdaf 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -15,6 +15,8 @@ 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;
 
@@ -22,6 +24,7 @@ import jalview.bin.Cache;
 import jalview.datamodel.AlignmentView;
 import jalview.gui.AlignFrame;
 import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.params.ParamDatastoreI;
 import compbio.data.msa.MsaWS;
 import compbio.metadata.Option;
 import compbio.metadata.Preset;
@@ -179,6 +182,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
     PresetManager presets = null;
 
+    public JabaParamStore paramStore=null;
+
     /**
      * non thread safe - gets the presets for this service (blocks whilst it
      * calls the service to get the preset set)
@@ -250,6 +255,19 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       }
       super.finalize();
     }
+
+    public ParamDatastoreI getParamStore()
+    {
+      if (paramStore == null)
+      {
+        try {
+        paramStore = new JabaParamStore(this);
+        } catch (Exception ex)
+        {}
+        
+      }
+      return paramStore;
+    }
   };
 
   /**
@@ -287,6 +305,35 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
   public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
   {
+    // dynamically regenerate service list.
+    final JMenu jws2al = new JMenu("JABA Alignment");
+    jws2al.addMenuListener(new MenuListener() {
+      // TODO: future: add menu listener to parent menu - so submenus are populated *before* they are selected.
+      @Override
+      public void menuSelected(MenuEvent e)
+      {
+        populateWSMenuEntry(jws2al, alignFrame);
+      }
+
+      @Override
+      public void menuDeselected(MenuEvent e)
+      {
+        // TODO Auto-generated method stub
+        
+      }
+
+      @Override
+      public void menuCanceled(MenuEvent e)
+      {
+        // TODO Auto-generated method stub
+        
+      }
+      
+    });
+    wsmenu.add(jws2al);
+  }
+  private void populateWSMenuEntry(JMenu jws2al, final AlignFrame alignFrame)
+  {
     if (running || services == null || services.size() == 0)
     {
       return;
@@ -297,9 +344,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
      * eventually, JWS2 services will appear under the same align/etc submenus.
      * for moment we keep them separate.
      */
-    JMenu atpoint, jws2al = new JMenu("JABA Alignment");
+    JMenu atpoint;
     MsaWSClient msacl = new MsaWSClient();
     Vector hostLabels = new Vector();
+    jws2al.removeAll();
     for (final Jws2Instance service : services)
     {
       atpoint = jws2al;
@@ -345,11 +393,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
        * alignFrame); } });
        */
     }
-    if (services.size() > 0)
-    {
-      wsmenu.add(jws2al);
-    }
-
   }
 
   public static void main(String[] args)