Author: scooter
Date: 2012-09-12 09:49:42 -0700 (Wed, 12 Sep 2012)
New Revision: 30354
Modified:
core3/impl/trunk/ding-impl/performance-debug/src/main/java/org/cytoscape/ding/internal/PerfTest.java
Log:
One more fix for commit 30349 breakage
Modified:
core3/impl/trunk/ding-impl/performance-debug/src/main/java/org/cytoscape/ding/internal/PerfTest.java
===================================================================
---
core3/impl/trunk/ding-impl/performance-debug/src/main/java/org/cytoscape/ding/internal/PerfTest.java
2012-09-12 16:06:13 UTC (rev 30353)
+++
core3/impl/trunk/ding-impl/performance-debug/src/main/java/org/cytoscape/ding/internal/PerfTest.java
2012-09-12 16:49:42 UTC (rev 30354)
@@ -21,7 +21,9 @@
import org.cytoscape.io.internal.util.StreamUtilImpl;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.NetworkTestSupport;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.SimpleCyProperty;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
@@ -46,6 +48,8 @@
protected CyNetworkFactory netFactory;
protected CyNetworkViewFactory viewFactory;
protected ReadUtils readUtil;
+ protected CyNetworkManager netMgr;
+ protected CyRootNetworkManager rootMgr;
protected CyLayoutAlgorithmManager layouts;
public PerfTest() {
@@ -55,11 +59,14 @@
NetworkTestSupport nts = new NetworkTestSupport();
netFactory = nts.getNetworkFactory();
+ netMgr = nts.getNetworkManager();
+ rootMgr = nts.getRootNetworkFactory();
NetworkViewTestSupport nvts = new NetworkViewTestSupport();
viewFactory = nvts.getNetworkViewFactory();
+
Properties properties = new Properties();
CyProperty<Properties> cyProperties = new
SimpleCyProperty<Properties>("Test",properties,Properties.class,DO_NOT_SAVE);
readUtil = new ReadUtils(new StreamUtilImpl(cyProperties));
@@ -68,7 +75,8 @@
private SIFNetworkReader readFile(String file) throws Exception {
InputStream is = getClass().getResource("/testData/sif/" +
file).openStream();
final CyEventHelper eventHelper = mock(CyEventHelper.class);
- SIFNetworkReader snvp = new SIFNetworkReader(is, layouts,
viewFactory, netFactory, eventHelper);
+ SIFNetworkReader snvp = new SIFNetworkReader(is, layouts,
viewFactory, netFactory,
+ eventHelper,
netMgr, rootMgr);
new TaskIterator(snvp);
snvp.run(taskMonitor);
--
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.
