Author: scooter
Date: 2012-01-26 10:28:01 -0800 (Thu, 26 Jan 2012)
New Revision: 28117
Added:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseEvent.java
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseListener.java
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroup.java
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupCollapsedEvent.java
core3/api/trunk/group-api/src/test/java/org/cytoscape/group/AbstractCyGroupTest.java
Log:
Next rount of group changes.
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroup.java
===================================================================
--- core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroup.java
2012-01-26 18:27:56 UTC (rev 28116)
+++ core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroup.java
2012-01-26 18:28:01 UTC (rev 28117)
@@ -68,7 +68,7 @@
*
* @return A list of CyEdges
*/
- List<CyEdge> getInteriorEdgeList();
+ List<CyEdge> getInternalEdgeList();
/**
* Returns the list of exterior edges connected to the
@@ -76,7 +76,7 @@
*
* @return A list of CyEdges
*/
- Set<CyEdge> getExteriorEdgeList();
+ Set<CyEdge> getExternalEdgeList();
/**
* Returns the network referenced by this group. All
Added:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseEvent.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseEvent.java
(rev 0)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseEvent.java
2012-01-26 18:28:01 UTC (rev 28117)
@@ -0,0 +1,38 @@
+package org.cytoscape.group.events;
+
+
+import org.cytoscape.group.CyGroupManager;
+import org.cytoscape.group.CyGroup;
+
+import org.cytoscape.model.CyNetwork;
+
+
+/**
+ * This event signals that a group is either about to be expanded or collapsed
in
+ * a particular network.
+ *
+ * @CyAPI.Final.Class
+ */
+public final class GroupAboutToCollapseEvent extends AbstractGroupEvent {
+ private boolean collapsing;
+
+ /**
+ * Constructs event.
+ * @param source the {@link CyGroup} that has been changed.
+ * @param network the {@link CyNetwork} the group has been changed in.
+ * @param collapsing true if the group is about to be collapsed
+ */
+ public GroupAboutToCollapseEvent(final CyGroup source, final CyNetwork
network, boolean collapsing) {
+ super(source, GroupAboutToCollapseListener.class, network);
+ this.collapsing = collapsing;
+ }
+
+ /**
+ * Is the group collapsed or expanded?
+ *
+ * @return true if the group is about to be collapsed
+ */
+ public boolean collapsing() {
+ return collapsing;
+ }
+}
Added:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseListener.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseListener.java
(rev 0)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseListener.java
2012-01-26 18:28:01 UTC (rev 28117)
@@ -0,0 +1,16 @@
+package org.cytoscape.group.events;
+
+import org.cytoscape.event.CyListener;
+
+
+/**
+ * Listener for {@link GroupAboutToCollapseEvent}
+ * @CyAPI.Spi.Interface
+ */
+public interface GroupAboutToCollapseListener extends CyListener {
+ /**
+ * The method that should handle the specified event.
+ * @param e The event to be handled.
+ */
+ public void handleEvent(GroupAboutToCollapseEvent e);
+}
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupCollapsedEvent.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupCollapsedEvent.java
2012-01-26 18:27:56 UTC (rev 28116)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupCollapsedEvent.java
2012-01-26 18:28:01 UTC (rev 28117)
@@ -20,6 +20,7 @@
* Constructs event.
* @param source the {@link CyGroup} that has been changed.
* @param network the {@link CyNetwork} the group has been changed in.
+ * @param collapsed true if the group has collapsed
*/
public GroupCollapsedEvent(final CyGroup source, final CyNetwork
network, boolean collapsed) {
super(source, GroupCollapsedListener.class, network);
Modified:
core3/api/trunk/group-api/src/test/java/org/cytoscape/group/AbstractCyGroupTest.java
===================================================================
---
core3/api/trunk/group-api/src/test/java/org/cytoscape/group/AbstractCyGroupTest.java
2012-01-26 18:27:56 UTC (rev 28116)
+++
core3/api/trunk/group-api/src/test/java/org/cytoscape/group/AbstractCyGroupTest.java
2012-01-26 18:28:01 UTC (rev 28117)
@@ -89,14 +89,14 @@
@Test
public void testGroupCreated() {
assertTrue("group node count = 3", group.getNodeList().size() == 3);
- assertTrue("group internal edge count = 2",
group.getInteriorEdgeList().size() == 2);
- assertTrue("group external edge count = 2",
group.getExteriorEdgeList().size() == 2);
+ assertTrue("group internal edge count = 2",
group.getInternalEdgeList().size() == 2);
+ assertTrue("group external edge count = 2",
group.getExternalEdgeList().size() == 2);
}
@Test
public void testAddExternalEdge() {
group.addExternalEdge(edge5);
- assertTrue("group external edge count = 3",
group.getExteriorEdgeList().size() == 3);
+ assertTrue("group external edge count = 3",
group.getExternalEdgeList().size() == 3);
}
@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.
