Author: scooter
Date: 2012-03-11 11:36:44 -0700 (Sun, 11 Mar 2012)
New Revision: 28485
Added:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/package-info.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/CyGroupFactory.java
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupManager.java
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/AbstractGroupEvent.java
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToBeRemovedEvent.java
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/GroupAddedToNetworkEvent.java
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupChangedEvent.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:
Clean up and change createGroup signature to support separating out creation
from registration
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-03-10 15:48:13 UTC (rev 28484)
+++ core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroup.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -32,7 +32,6 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.subnetwork.CyRootNetwork;
-import java.util.Collection;
import java.util.List;
import java.util.Set;
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupFactory.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupFactory.java
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupFactory.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -46,9 +46,10 @@
* Creates a CyGroup object in the referenced network.
*
* @param network the {@link CyNetwork} this group is part of
+ * @param register if true, register the {@link CyGroup}
* @return A new {@link CyGroup} as part of the designated network.
*/
- public CyGroup createGroup(CyNetwork network);
+ public CyGroup createGroup(CyNetwork network, boolean register);
/**
* Creates a CyGroup object in the referenced network initially
populated with
@@ -57,10 +58,11 @@
* @param network the {@link CyNetwork} this group is part of
* @param nodes the {@link CyNode}s that are part of this group.
* @param edges the {@link CyEdge}s that are part of this group. If
this is null, the edges
+ * @param register if true, register the {@link CyGroup}
* are determined based on the node connectivity.
* @return A new {@link CyGroup} as part of the designated network.
*/
- public CyGroup createGroup(CyNetwork network, List<CyNode> nodes,
List<CyEdge> edges);
+ public CyGroup createGroup(CyNetwork network, List<CyNode> nodes,
List<CyEdge> edges, boolean register);
/**
* Creates a CyGroup object in the referenced network from an existing
{@link CyNode}.
@@ -69,8 +71,9 @@
* @param node the {@link CyNode} to convert into a group
* @param nodes the {@link CyNode}s that are part of this group.
* @param edges the {@link CyEdge}s that are part of this group. If
this is null, the edges
+ * @param register if true, register the {@link CyGroup}
* are determined based on the node connectivity.
* @return A new {@link CyGroup} as part of the designated network.
*/
- public CyGroup createGroup(CyNetwork network, CyNode node,
List<CyNode>nodes, List<CyEdge> edges);
+ public CyGroup createGroup(CyNetwork network, CyNode node,
List<CyNode>nodes, List<CyEdge> edges, boolean register);
}
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupManager.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupManager.java
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/CyGroupManager.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -96,9 +96,18 @@
* known to the group manager.
*
* @param group a non-null {@link CyGroup}
+ * @fires GroupAddedEvent
*/
public void addGroup(final CyGroup group);
+ /**
+ * Registers a list of groups with the group manager. Does nothing if
the group is already
+ * known to the group manager.
+ *
+ * @param groups a list of {@link CyGroup}
+ */
+ public void addGroups(final List<CyGroup> groups);
+
/** Releases all currently held references and resources. */
public void reset();
}
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/AbstractGroupEvent.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/AbstractGroupEvent.java
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/AbstractGroupEvent.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -3,7 +3,6 @@
import org.cytoscape.event.AbstractCyEvent;
import org.cytoscape.group.CyGroup;
-import org.cytoscape.group.CyGroupManager;
import org.cytoscape.model.CyNetwork;
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToBeRemovedEvent.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToBeRemovedEvent.java
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToBeRemovedEvent.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -1,7 +1,6 @@
package org.cytoscape.group.events;
-import org.cytoscape.group.CyGroupManager;
import org.cytoscape.group.CyGroup;
import org.cytoscape.model.CyNetwork;
Modified:
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
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAboutToCollapseEvent.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -1,7 +1,6 @@
package org.cytoscape.group.events;
-import org.cytoscape.group.CyGroupManager;
import org.cytoscape.group.CyGroup;
import org.cytoscape.model.CyNetwork;
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAddedToNetworkEvent.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAddedToNetworkEvent.java
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupAddedToNetworkEvent.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -1,7 +1,6 @@
package org.cytoscape.group.events;
-import org.cytoscape.group.CyGroupManager;
import org.cytoscape.group.CyGroup;
import org.cytoscape.model.CyNetwork;
Modified:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupChangedEvent.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupChangedEvent.java
2012-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupChangedEvent.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -28,6 +28,7 @@
* @param source the {@link CyGroup} that has been changed.
* @param whatChanged the {@link CyNode} or {@link CyEdge} or list of
{@link CyNodes} that were added or removed.
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public GroupChangedEvent(final CyGroup source, final Object
whatChanged, ChangeType change) {
super(source, GroupChangedListener.class);
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-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/events/GroupCollapsedEvent.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -1,7 +1,6 @@
package org.cytoscape.group.events;
-import org.cytoscape.group.CyGroupManager;
import org.cytoscape.group.CyGroup;
import org.cytoscape.model.CyNetwork;
Added:
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/package-info.java
===================================================================
---
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/package-info.java
(rev 0)
+++
core3/api/trunk/group-api/src/main/java/org/cytoscape/group/package-info.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -0,0 +1,4 @@
+/**
+ * This package provides an API for createing and managing groups in Cytoscape
+ */
+package org.cytoscape.group;
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-03-10 15:48:13 UTC (rev 28484)
+++
core3/api/trunk/group-api/src/test/java/org/cytoscape/group/AbstractCyGroupTest.java
2012-03-11 18:36:44 UTC (rev 28485)
@@ -77,7 +77,7 @@
groupEdges.add(edge4);
// Create a group
- group = groupFactory.createGroup(net, groupNodes, groupEdges);
+ group = groupFactory.createGroup(net, groupNodes, groupEdges,
true);
}
@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.
