Author: mes
Date: 2011-06-21 15:41:27 -0700 (Tue, 21 Jun 2011)
New Revision: 25863
Modified:
core3/io-impl/trunk/pom.xml
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
Log:
updated for event-api changes that rely on payload events instead of
microlisteners
Modified: core3/io-impl/trunk/pom.xml
===================================================================
--- core3/io-impl/trunk/pom.xml 2011-06-21 22:41:11 UTC (rev 25862)
+++ core3/io-impl/trunk/pom.xml 2011-06-21 22:41:27 UTC (rev 25863)
@@ -131,6 +131,11 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>presentation-api</artifactId>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
<version>3.0.0-alpha3</version>
</dependency>
@@ -175,7 +180,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>test-support</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
2011-06-21 22:41:11 UTC (rev 25862)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
2011-06-21 22:41:27 UTC (rev 25863)
@@ -42,8 +42,6 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.events.RowsAboutToChangeEvent;
-import org.cytoscape.model.events.RowsFinishedChangingEvent;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkView;
@@ -102,10 +100,8 @@
CyNetwork network = cyNetworkFactory.getInstance();
final CyTable nodeTable = network.getDefaultNodeTable();
final CyTable edgeTable = network.getDefaultEdgeTable();
- try {
+
// Generate bundled event to avoid too many events
problem.
- eventHelper.fireSynchronousEvent(new
RowsAboutToChangeEvent(this, nodeTable));
- eventHelper.fireSynchronousEvent(new
RowsAboutToChangeEvent(this, edgeTable));
final String firstLine = br.readLine();
if (firstLine.contains(TAB))
@@ -133,10 +129,6 @@
continue;
}
}
- } finally {
- eventHelper.fireSynchronousEvent(new
RowsFinishedChangingEvent(this, nodeTable));
- eventHelper.fireSynchronousEvent(new
RowsFinishedChangingEvent(this, edgeTable));
- }
br.close();
tm.setStatusMessage("Network data loaded from data
source.\nCreting Cytoscape network...");
--
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.