Author: jm
Date: 2011-07-13 08:48:58 -0700 (Wed, 13 Jul 2011)
New Revision: 26165
Modified:
core3/equations-functions-impl/trunk/pom.xml
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/DegreeTest.java
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/InDegreeTest.java
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/OutDegreeTest.java
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/SourceIDTest.java
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/TargetIDTest.java
Log:
Updated equations-functions-impl to use payload events API
Modified: core3/equations-functions-impl/trunk/pom.xml
===================================================================
--- core3/equations-functions-impl/trunk/pom.xml 2011-07-13 14:31:09 UTC
(rev 26164)
+++ core3/equations-functions-impl/trunk/pom.xml 2011-07-13 15:48:58 UTC
(rev 26165)
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>3.0.0-alpha3-SNAPSHOT</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
===================================================================
---
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToEdgeMapper.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -5,23 +5,25 @@
import java.util.Map;
import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.events.AddedEdgeEvent;
-import org.cytoscape.model.events.AddedEdgeListener;
-import org.cytoscape.model.events.AboutToRemoveEdgeEvent;
-import org.cytoscape.model.events.AboutToRemoveEdgeListener;
+import org.cytoscape.model.events.AboutToRemoveEdgesEvent;
+import org.cytoscape.model.events.AboutToRemoveEdgesListener;
+import org.cytoscape.model.events.AddedEdgesEvent;
+import org.cytoscape.model.events.AddedEdgesListener;
-public class SUIDToEdgeMapper implements AddedEdgeListener,
AboutToRemoveEdgeListener {
+public class SUIDToEdgeMapper implements AddedEdgesListener,
AboutToRemoveEdgesListener {
private final Map<Long, CyEdge> suidToEdgeMap = new HashMap<Long,
CyEdge>();
- public void handleEvent(final AddedEdgeEvent event) {
- final CyEdge edge = event.getEdge();
- suidToEdgeMap.put(edge.getSUID(), edge);
+ public void handleEvent(final AddedEdgesEvent event) {
+ for (CyEdge edge : event.getPayloadCollection()) {
+ suidToEdgeMap.put(edge.getSUID(), edge);
+ }
}
- public void handleEvent(final AboutToRemoveEdgeEvent event) {
- final CyEdge edge = event.getEdge();
- suidToEdgeMap.remove(edge.getSUID());
+ public void handleEvent(final AboutToRemoveEdgesEvent event) {
+ for (CyEdge edge : event.getEdges()) {
+ suidToEdgeMap.remove(edge.getSUID());
+ }
}
public CyEdge getEdge(final Long id) {
Modified:
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
===================================================================
---
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/main/java/org/cytoscape/equations/internal/SUIDToNodeMapper.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -5,23 +5,25 @@
import java.util.Map;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedNodeEvent;
-import org.cytoscape.model.events.AddedNodeListener;
-import org.cytoscape.model.events.AboutToRemoveNodeEvent;
-import org.cytoscape.model.events.AboutToRemoveNodeListener;
+import org.cytoscape.model.events.AboutToRemoveNodesEvent;
+import org.cytoscape.model.events.AboutToRemoveNodesListener;
+import org.cytoscape.model.events.AddedNodesEvent;
+import org.cytoscape.model.events.AddedNodesListener;
-public class SUIDToNodeMapper implements AddedNodeListener,
AboutToRemoveNodeListener {
+public class SUIDToNodeMapper implements AddedNodesListener,
AboutToRemoveNodesListener {
private final Map<Long, CyNode> suidToNodeMap = new HashMap<Long,
CyNode>();
- public void handleEvent(final AddedNodeEvent event) {
- final CyNode node = event.getNode();
- suidToNodeMap.put(node.getSUID(), node);
+ public void handleEvent(final AddedNodesEvent event) {
+ for (CyNode node : event.getPayloadCollection()) {
+ suidToNodeMap.put(node.getSUID(), node);
+ }
}
- public void handleEvent(final AboutToRemoveNodeEvent event) {
- final CyNode node = event.getNode();
- suidToNodeMap.remove(node.getSUID());
+ public void handleEvent(final AboutToRemoveNodesEvent event) {
+ for (CyNode node : event.getNodes()) {
+ suidToNodeMap.remove(node.getSUID());
+ }
}
public CyNode getNode(final Long id) {
Modified:
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/DegreeTest.java
===================================================================
---
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/DegreeTest.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/DegreeTest.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -30,12 +30,17 @@
package org.cytoscape.equations.internal.functions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.mockito.Mockito.*;
-
import org.cytoscape.equations.EqnCompiler;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.IdentDescriptor;
@@ -47,12 +52,10 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedNodeEvent;
+import org.cytoscape.model.events.AddedNodesEvent;
import org.cytoscape.session.CyApplicationManager;
-
-import static org.junit.Assert.*;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.Before;
public class DegreeTest {
@@ -70,8 +73,11 @@
final CyNetwork network = mock(CyNetwork.class);
when(network.getAdjacentEdgeList(node,
CyEdge.Type.ANY)).thenReturn(edgeList);
+ Collection<CyNode> nodes = new ArrayList<CyNode>(1);
+ nodes.add(node);
+
suidToNodeMapper = new SUIDToNodeMapper();
- suidToNodeMapper.handleEvent(new AddedNodeEvent(network, node));
+ suidToNodeMapper.handleEvent(new AddedNodesEvent(network,
nodes));
applicationManager = mock(CyApplicationManager.class);
when(applicationManager.getCurrentNetwork()).thenReturn(network);
Modified:
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/InDegreeTest.java
===================================================================
---
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/InDegreeTest.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/InDegreeTest.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -30,12 +30,17 @@
package org.cytoscape.equations.internal.functions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.mockito.Mockito.*;
-
import org.cytoscape.equations.EqnCompiler;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.IdentDescriptor;
@@ -47,12 +52,10 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedNodeEvent;
+import org.cytoscape.model.events.AddedNodesEvent;
import org.cytoscape.session.CyApplicationManager;
-
-import static org.junit.Assert.*;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.Before;
public class InDegreeTest {
@@ -70,8 +73,11 @@
final CyNetwork network = mock(CyNetwork.class);
when(network.getAdjacentEdgeList(node,
CyEdge.Type.INCOMING)).thenReturn(edgeList);
+ Collection<CyNode> nodes = new ArrayList<CyNode>(1);
+ nodes.add(node);
+
suidToNodeMapper = new SUIDToNodeMapper();
- suidToNodeMapper.handleEvent(new AddedNodeEvent(network, node));
+ suidToNodeMapper.handleEvent(new AddedNodesEvent(network,
nodes));
applicationManager = mock(CyApplicationManager.class);
when(applicationManager.getCurrentNetwork()).thenReturn(network);
Modified:
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/OutDegreeTest.java
===================================================================
---
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/OutDegreeTest.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/OutDegreeTest.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -30,12 +30,17 @@
package org.cytoscape.equations.internal.functions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.mockito.Mockito.*;
-
import org.cytoscape.equations.EqnCompiler;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.IdentDescriptor;
@@ -47,12 +52,10 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedNodeEvent;
+import org.cytoscape.model.events.AddedNodesEvent;
import org.cytoscape.session.CyApplicationManager;
-
-import static org.junit.Assert.*;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.Before;
public class OutDegreeTest {
@@ -70,8 +73,11 @@
final CyNetwork network = mock(CyNetwork.class);
when(network.getAdjacentEdgeList(node,
CyEdge.Type.OUTGOING)).thenReturn(edgeList);
+ Collection<CyNode> nodes = new ArrayList<CyNode>(1);
+ nodes.add(node);
+
suidToNodeMapper = new SUIDToNodeMapper();
- suidToNodeMapper.handleEvent(new AddedNodeEvent(network, node));
+ suidToNodeMapper.handleEvent(new AddedNodesEvent(network,
nodes));
applicationManager = mock(CyApplicationManager.class);
when(applicationManager.getCurrentNetwork()).thenReturn(network);
Modified:
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/SourceIDTest.java
===================================================================
---
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/SourceIDTest.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/SourceIDTest.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -30,12 +30,17 @@
package org.cytoscape.equations.internal.functions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.mockito.Mockito.*;
-
import org.cytoscape.equations.EqnCompiler;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.IdentDescriptor;
@@ -47,11 +52,9 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedEdgeEvent;
-
-import static org.junit.Assert.*;
+import org.cytoscape.model.events.AddedEdgesEvent;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.Before;
public class SourceIDTest {
@@ -71,8 +74,11 @@
when(edge.getSUID()).thenReturn(11L);
when(edge.getSource()).thenReturn(node);
+ Collection<CyEdge> edges = new ArrayList<CyEdge>(1);
+ edges.add(edge);
+
suidToEdgeMapper = new SUIDToEdgeMapper();
- suidToEdgeMapper.handleEvent(new AddedEdgeEvent(network, edge));
+ suidToEdgeMapper.handleEvent(new AddedEdgesEvent(network,
edges));
}
@Test
Modified:
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/TargetIDTest.java
===================================================================
---
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/TargetIDTest.java
2011-07-13 14:31:09 UTC (rev 26164)
+++
core3/equations-functions-impl/trunk/src/test/java/org/cytoscape/equations/internal/functions/TargetIDTest.java
2011-07-13 15:48:58 UTC (rev 26165)
@@ -30,12 +30,17 @@
package org.cytoscape.equations.internal.functions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.mockito.Mockito.*;
-
import org.cytoscape.equations.EqnCompiler;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.IdentDescriptor;
@@ -47,11 +52,9 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.events.AddedEdgeEvent;
-
-import static org.junit.Assert.*;
+import org.cytoscape.model.events.AddedEdgesEvent;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.Before;
public class TargetIDTest {
@@ -71,8 +74,11 @@
when(edge.getSUID()).thenReturn(11L);
when(edge.getTarget()).thenReturn(node);
+ Collection<CyEdge> edges = new ArrayList<CyEdge>(1);
+ edges.add(edge);
+
suidToEdgeMapper = new SUIDToEdgeMapper();
- suidToEdgeMapper.handleEvent(new AddedEdgeEvent(network, edge));
+ suidToEdgeMapper.handleEvent(new AddedEdgesEvent(network,
edges));
}
@Test
--
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.
