Author: ruschein
Date: 2010-11-19 14:29:08 -0800 (Fri, 19 Nov 2010)
New Revision: 22947
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactory.java
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Removed dependeny on a CyRootNetworkFactory.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
2010-11-19 22:19:24 UTC (rev 22946)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTask.java
2010-11-19 22:29:08 UTC (rev 22947)
@@ -44,7 +44,6 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.view.model.CyNetworkView;
@@ -56,17 +55,14 @@
public class DeleteSelectedNodesAndEdgesTask extends AbstractTask {
private final UndoSupport undoSupport;
- private final CyRootNetworkFactory rootNetworkFactory;
private final CyApplicationManager applicationManager;
private final CyNetworkViewManager networkViewManager;
public DeleteSelectedNodesAndEdgesTask(final UndoSupport undoSupport,
- final CyRootNetworkFactory
rootNetworkFactory,
final CyApplicationManager
applicationManager,
final CyNetworkViewManager
networkViewManager)
{
this.undoSupport = undoSupport;
- this.rootNetworkFactory = rootNetworkFactory;
this.applicationManager = applicationManager;
this.networkViewManager = networkViewManager;
}
@@ -76,7 +72,7 @@
CyNetworkView myView =
applicationManager.getCurrentNetworkView();
// Delete from the base network so that our changes can be
undone:
- CySubNetwork network =
rootNetworkFactory.convert(myView.getModel()).getBaseNetwork();
+ final CySubNetwork network = (CySubNetwork)myView.getModel();
final List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(network, "selected", true);
final List<CyEdge> selectedEdges =
CyTableUtil.getEdgesInState(network, "selected", true);
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactory.java
2010-11-19 22:19:24 UTC (rev 22946)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteSelectedNodesAndEdgesTaskFactory.java
2010-11-19 22:29:08 UTC (rev 22947)
@@ -30,7 +30,6 @@
package org.cytoscape.task.internal.networkobjects;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.undo.UndoSupport;
@@ -40,24 +39,20 @@
public class DeleteSelectedNodesAndEdgesTaskFactory implements TaskFactory {
private final UndoSupport undoSupport;
- private final CyRootNetworkFactory rootNetworkFactory;
private final CyApplicationManager applicationManager;
private final CyNetworkViewManager networkViewManager;
public DeleteSelectedNodesAndEdgesTaskFactory(final UndoSupport
undoSupport,
- final
CyRootNetworkFactory rootNetworkFactory,
final
CyApplicationManager applicationManager,
final
CyNetworkViewManager networkViewManager)
{
this.undoSupport = undoSupport;
- this.rootNetworkFactory = rootNetworkFactory;
this.applicationManager = applicationManager;
this.networkViewManager = networkViewManager;
}
public TaskIterator getTaskIterator() {
return new TaskIterator(
- new DeleteSelectedNodesAndEdgesTask(undoSupport,
rootNetworkFactory,
- applicationManager,
networkViewManager));
+ new DeleteSelectedNodesAndEdgesTask(undoSupport,
applicationManager, networkViewManager));
}
}
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-11-19 22:19:24 UTC (rev 22946)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-11-19 22:29:08 UTC (rev 22947)
@@ -61,7 +61,6 @@
<bean id="deleteSelectedNodesAndEdgesTaskFactory"
class="org.cytoscape.task.internal.networkobjects.DeleteSelectedNodesAndEdgesTaskFactory">
<constructor-arg ref="undoSupportServiceRef" />
- <constructor-arg ref="cyRootNetworkFactoryServiceRef" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="cyNetworkViewManagerServiceRef" />
</bean>
--
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.
