Author: kono
Date: 2011-09-28 11:00:13 -0700 (Wed, 28 Sep 2011)
New Revision: 27011
Modified:
core3/impl/trunk/io-impl/performance/pom.xml
core3/impl/trunk/io-impl/performance/src/main/java/org/cytoscape/io/read/sif/PerfTest.java
Log:
Imports are organized to use Ding test support.
Modified: core3/impl/trunk/io-impl/performance/pom.xml
===================================================================
--- core3/impl/trunk/io-impl/performance/pom.xml 2011-09-28 17:49:46 UTC
(rev 27010)
+++ core3/impl/trunk/io-impl/performance/pom.xml 2011-09-28 18:00:13 UTC
(rev 27011)
@@ -13,7 +13,6 @@
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>io-impl-performance</artifactId>
<name>${bundle.symbolicName}</name>
@@ -94,6 +93,19 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>ding-presentation-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>ding-presentation-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
Modified:
core3/impl/trunk/io-impl/performance/src/main/java/org/cytoscape/io/read/sif/PerfTest.java
===================================================================
---
core3/impl/trunk/io-impl/performance/src/main/java/org/cytoscape/io/read/sif/PerfTest.java
2011-09-28 17:49:46 UTC (rev 27010)
+++
core3/impl/trunk/io-impl/performance/src/main/java/org/cytoscape/io/read/sif/PerfTest.java
2011-09-28 18:00:13 UTC (rev 27011)
@@ -6,23 +6,17 @@
import static org.mockito.Mockito.when;
import java.io.InputStream;
-
-import java.util.List;
import java.util.Properties;
-import org.cytoscape.io.internal.util.ReadUtils;
+import org.cytoscape.ding.NetworkViewTestSupport;
+
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.io.internal.util.StreamUtilImpl;
import org.cytoscape.io.internal.read.sif.SIFNetworkReader;
-import org.cytoscape.model.CyEdge;
+import org.cytoscape.io.internal.util.ReadUtils;
+import org.cytoscape.io.internal.util.StreamUtilImpl;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.property.BasicCyProperty;
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.property.CyProperty.SavePolicy;
import org.cytoscape.model.NetworkTestSupport;
-import org.cytoscape.view.model.NetworkViewTestSupport;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkView;
@@ -61,8 +55,8 @@
netFactory = nts.getNetworkFactory();
properties = new Properties();
- CyProperty<Properties> cyProperties = new
BasicCyProperty(properties, SavePolicy.DO_NOT_SAVE);
- NetworkViewTestSupport nvts = new
NetworkViewTestSupport(cyProperties);
+ //CyProperty<Properties> cyProperties = new
BasicCyProperty(properties, SavePolicy.DO_NOT_SAVE);
+ NetworkViewTestSupport nvts = new NetworkViewTestSupport();
setViewThreshold(DEF_THRESHOLD);
viewFactory = nvts.getNetworkViewFactory();
--
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.
