Author: paperwing
Date: 2012-03-12 12:02:25 -0700 (Mon, 12 Mar 2012)
New Revision: 28493

Modified:
   
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/PopupMenuCreator.java
   
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/TaskFactoryListener.java
Log:
Added methods to TaskFactoryListener to obtain current task factories

Modified: 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/PopupMenuCreator.java
===================================================================
--- 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/PopupMenuCreator.java
    2012-03-12 18:53:13 UTC (rev 28492)
+++ 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/PopupMenuCreator.java
    2012-03-12 19:02:25 UTC (rev 28493)
@@ -1,6 +1,8 @@
 package org.cytoscape.paperwing.internal.task;
 
 import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.swing.JPopupMenu;
 
@@ -18,21 +20,24 @@
 
        public void createNodeMenu(View<CyNode> nodeView, 
                        CyNetworkView networkView, 
-                       Collection<NodeViewTaskFactory> taskFactories,
+                       Map<NodeViewTaskFactory, Map<String, String>> 
taskFactories,
                        DialogTaskManager taskManager) {
        
                JPopupMenu menu = new JPopupMenu();
                JMenuTracker tracker = new JMenuTracker(menu);
                
                if (taskFactories.size() == 1) {
-                       NodeViewTaskFactory nodeViewTaskFactory = 
taskFactories.iterator().next();
+                       NodeViewTaskFactory nodeViewTaskFactory = 
taskFactories.keySet().iterator().next();
                        
                        nodeViewTaskFactory.setNodeView(nodeView, networkView);
                        taskManager.execute(nodeViewTaskFactory);
                        
                } else if (taskFactories.size() > 1) {
-                       for (NodeViewTaskFactory taskFactory : taskFactories) {
+                       for (Entry<NodeViewTaskFactory, Map<String, String>> 
entry : taskFactories.entrySet()) {
+
+                               entry.getKey().setNodeView(nodeView, 
networkView);
                                
+               
                        }
                }
                

Modified: 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/TaskFactoryListener.java
===================================================================
--- 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/TaskFactoryListener.java
 2012-03-12 18:53:13 UTC (rev 28492)
+++ 
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/task/TaskFactoryListener.java
 2012-03-12 19:02:25 UTC (rev 28493)
@@ -43,6 +43,18 @@
                // printTaskFactoryDetails(taskFactory, properties);
        }
        
+       public Map<NodeViewTaskFactory, Map<String, String>> 
getNodeViewTaskFactories() {
+               return nodeViewTaskFactories;
+       }
+       
+       public Map<EdgeViewTaskFactory, Map<String, String>> 
getEdgeViewTaskFactories() {
+               return edgeViewTaskFactories;
+       }
+       
+       public Map<NetworkViewTaskFactory, Map<String, String>> 
getNetworkViewTaskFactories() {
+               return networkViewTaskFactories;
+       }
+       
        public void removeNodeViewTaskFactory(NodeViewTaskFactory taskFactory, 
Map<String, String> properties) {
                nodeViewTaskFactories.put(taskFactory, properties);
        }

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

Reply via email to