Author: rozagh
Date: 2012-04-10 15:12:04 -0700 (Tue, 10 Apr 2012)
New Revision: 28785
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTask.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTaskFactory.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
Log:
removed rootnetworkmanager form addEdge task and task factory.
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTask.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTask.java
2012-04-10 21:05:39 UTC (rev 28784)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTask.java
2012-04-10 22:12:04 UTC (rev 28785)
@@ -6,8 +6,6 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyRow;
-import org.cytoscape.model.subnetwork.CyRootNetwork;
-import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.task.AbstractNetworkViewTask;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -15,27 +13,17 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.TaskMonitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class AddNodeTask extends AbstractNetworkViewTask{
private final VisualMappingManager vmm;
- private final CyRootNetworkManager rnm;
- //private final Transferable t;
private final Point2D xformPt;
private final CyEventHelper eh;
private static int new_node_index =1;
-
- private static final Logger logger =
LoggerFactory.getLogger(AddNodeTask.class);
- public AddNodeTask(final VisualMappingManager vmm, final
CyRootNetworkManager rnm, final CyNetworkView view,
- //final Transferable t,
- final Point2D xformPt, final CyEventHelper eh) {
+ public AddNodeTask(final VisualMappingManager vmm, final CyNetworkView
view,final Point2D xformPt, final CyEventHelper eh) {
super(view);
this.vmm = vmm;
- this.rnm = rnm;
- //this.t = t;
this.xformPt = xformPt;
this.eh = eh;
}
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTaskFactory.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTaskFactory.java
2012-04-10 21:05:39 UTC (rev 28784)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNodeTaskFactory.java
2012-04-10 22:12:04 UTC (rev 28785)
@@ -14,19 +14,17 @@
private final CyEventHelper eh;
private final VisualMappingManager vmm;
- final CyRootNetworkManager rnm;
- public AddNodeTaskFactory(CyEventHelper eh, VisualMappingManager vmm,
CyRootNetworkManager rnm) {
+ public AddNodeTaskFactory(CyEventHelper eh, VisualMappingManager vmm) {
this.eh = eh;
this.vmm = vmm;
- this.rnm = rnm;
}
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
// TODO Auto-generated method stub
- return new TaskIterator(new AddNodeTask(vmm, rnm, networkView,
xformPt, eh));
+ return new TaskIterator(new AddNodeTask(vmm, networkView,
xformPt, eh));
}
}
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2012-04-10 21:05:39 UTC (rev 28784)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/CyActivator.java
2012-04-10 22:12:04 UTC (rev 28785)
@@ -38,16 +38,13 @@
public void start(BundleContext bc) {
- CySwingApplication cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
- CyRootNetworkManager cyRootNetworkManagerServiceRef =
getService(bc,CyRootNetworkManager.class);
- NewEmptyNetworkViewFactory newEmptyNetworkViewFactoryServiceRef
= getService(bc,NewEmptyNetworkViewFactory.class);
CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
VisualMappingManager vmm =
getService(bc,VisualMappingManager.class);
SIFInterpreterTaskFactory sifInterpreterTaskFactory = new
SIFInterpreterTaskFactory();
- NetworkViewLocationTaskFactory networkViewLocationTaskFactory =
new AddNodeTaskFactory(cyEventHelperServiceRef, vmm,
cyRootNetworkManagerServiceRef);
+ NetworkViewLocationTaskFactory networkViewLocationTaskFactory =
new AddNodeTaskFactory(cyEventHelperServiceRef, vmm);
NodeViewTaskFactory addNestedNetworkTaskFactory = new
AddNestedNetworkTaskFactory(cyNetworkManagerServiceRef);
Properties sifInterpreterTaskFactoryProps = new 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.
