r29133 - core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal

[cytoscape-noreply48]

Author: mes
Date: 2012-05-07 13:00:35 -0700 (Mon, 07 May 2012)
New Revision: 29133

Modified:
   
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
   
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
   
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
Log:
now listening for NetworkViewCollectionTaskFactories as well

Modified: 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
===================================================================
--- 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
        2012-05-07 18:12:50 UTC (rev 29132)
+++ 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
        2012-05-07 20:00:35 UTC (rev 29133)
@@ -15,6 +15,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NetworkViewCollectionTaskFactory;
 import org.cytoscape.task.TableTaskFactory;
 import org.cytoscape.work.TaskMonitor;
 
@@ -62,6 +63,14 @@
                removeTF(props);
        }
 
+       public void 
addNetworkViewCollectionTaskFactory(NetworkViewCollectionTaskFactory tf, Map 
props) {
+               addTF(new 
TFExecutor(factoryProvisioner.createFor(tf),interceptor), props);
+       }
+
+       public void 
removeNetworkViewCollectionTaskFactory(NetworkViewCollectionTaskFactory tf, Map 
props) {
+               removeTF(props);
+       }
+
        public void addTableTaskFactory(TableTaskFactory tf, Map props) {
                addTF(new 
TFExecutor(factoryProvisioner.createFor(tf),interceptor), props);
        }

Modified: 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
===================================================================
--- 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
        2012-05-07 18:12:50 UTC (rev 29132)
+++ 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
        2012-05-07 20:00:35 UTC (rev 29133)
@@ -12,6 +12,7 @@
 
 import org.cytoscape.task.NetworkTaskFactory;
 import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NetworkViewCollectionTaskFactory;
 import org.cytoscape.task.TableTaskFactory;
 import org.cytoscape.work.util.*;
 
@@ -44,6 +45,7 @@
                
registerServiceListener(bc,commandExecutorImpl,"addTaskFactory","removeTaskFactory",TaskFactory.class);
                
registerServiceListener(bc,commandExecutorImpl,"addNetworkTaskFactory","removeNetworkTaskFactory",NetworkTaskFactory.class);
                
registerServiceListener(bc,commandExecutorImpl,"addNetworkViewTaskFactory","removeNetworkViewTaskFactory",NetworkViewTaskFactory.class);
+               
registerServiceListener(bc,commandExecutorImpl,"addNetworkViewCollectionTaskFactory","removeNetworkViewCollectionTaskFactory",NetworkViewCollectionTaskFactory.class);
                
registerServiceListener(bc,commandExecutorImpl,"addTableTaskFactory","removeTableTaskFactory",TableTaskFactory.class);
 
                
registerServiceListener(bc,interceptor,"addTunableHandlerFactory","removeTunableHandlerFactory",StringTunableHandlerFactory.class);

Modified: 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
===================================================================
--- 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
      2012-05-07 18:12:50 UTC (rev 29132)
+++ 
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
      2012-05-07 20:00:35 UTC (rev 29133)
@@ -3,6 +3,7 @@
 import org.cytoscape.application.CyApplicationManager;
 import org.cytoscape.task.NetworkTaskFactory;
 import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NetworkViewCollectionTaskFactory;
 import org.cytoscape.task.TableTaskFactory;
 import org.cytoscape.work.TaskFactory;
 import org.cytoscape.work.TaskIterator;
@@ -43,6 +44,20 @@
                };
        }
 
+       public  TaskFactory createFor(final NetworkViewCollectionTaskFactory 
factory) {
+               return new TaskFactory() {
+                       @Override
+                       public TaskIterator createTaskIterator() {
+                               return 
factory.createTaskIterator(applicationManager.getSelectedNetworkViews());
+                       }
+                       
+                       @Override
+                       public boolean isReady() {
+                               return 
factory.isReady(applicationManager.getSelectedNetworkViews());
+                       }
+               };
+       }
+
        public  TaskFactory createFor(final TableTaskFactory factory) {
                return new TaskFactory() {
                        public TaskIterator createTaskIterator() {

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to cytoscape-cvs@googlegroups.com.
To unsubscribe from this group, send email to 
cytoscape-cvs+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.