Author: scooter
Date: 2012-03-11 11:39:26 -0700 (Sun, 11 Mar 2012)
New Revision: 28486
Modified:
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupFactoryImpl.java
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupImpl.java
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupManagerImpl.java
core3/impl/trunk/group-impl/src/test/java/org/cytoscape/group/TestCyGroupFactory.java
Log:
Changed signature of createGroup
Modified:
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupFactoryImpl.java
===================================================================
---
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupFactoryImpl.java
2012-03-11 18:36:44 UTC (rev 28485)
+++
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupFactoryImpl.java
2012-03-11 18:39:26 UTC (rev 28486)
@@ -27,14 +27,10 @@
*/
package org.cytoscape.group.internal;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.group.CyGroup;
import org.cytoscape.group.CyGroupFactory;
-import org.cytoscape.group.CyGroupManager;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
@@ -45,8 +41,6 @@
public class CyGroupFactoryImpl implements CyGroupFactory {
- private static final Logger logger =
LoggerFactory.getLogger(CyGroupFactoryImpl.class);
-
private final CyEventHelper help;
private final CyGroupManagerImpl mgr;
private final CyServiceRegistrar serviceRegistrar;
@@ -77,25 +71,26 @@
* {@inheritDoc}
*/
@Override
- public CyGroup createGroup(CyNetwork network) {
- return createGroup(network, null, null, null);
+ public CyGroup createGroup(CyNetwork network, boolean register) {
+ return createGroup(network, null, null, null, register);
}
/**
* {@inheritDoc}
*/
@Override
- public CyGroup createGroup(CyNetwork network, List<CyNode> nodes,
List<CyEdge> edges) {
- return createGroup(network, null, nodes, edges);
+ public CyGroup createGroup(CyNetwork network, List<CyNode> nodes,
List<CyEdge> edges, boolean register) {
+ return createGroup(network, null, nodes, edges, register);
}
/**
* {@inheritDoc}
*/
@Override
- 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) {
CyGroup group = new CyGroupImpl(help, mgr, network, node,
nodes, edges);
- mgr.addGroup(group);
+ if (register)
+ mgr.addGroup(group);
return group;
}
}
Modified:
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupImpl.java
===================================================================
---
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupImpl.java
2012-03-11 18:36:44 UTC (rev 28485)
+++
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupImpl.java
2012-03-11 18:39:26 UTC (rev 28486)
@@ -29,12 +29,10 @@
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.ListIterator;
-import java.util.Map;
import java.util.Set;
import org.cytoscape.event.CyEventHelper;
Modified:
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupManagerImpl.java
===================================================================
---
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupManagerImpl.java
2012-03-11 18:36:44 UTC (rev 28485)
+++
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupManagerImpl.java
2012-03-11 18:39:26 UTC (rev 28486)
@@ -30,25 +30,18 @@
package org.cytoscape.group.internal;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.group.CyGroup;
-import org.cytoscape.group.CyGroupFactory;
import org.cytoscape.group.CyGroupManager;
import org.cytoscape.group.events.GroupAboutToBeDestroyedEvent;
import org.cytoscape.group.events.GroupAddedEvent;
-import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.subnetwork.CyRootNetwork;
-import org.cytoscape.model.subnetwork.CySubNetwork;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,9 +49,7 @@
* An implementation of CyNetworkManager.
*/
public class CyGroupManagerImpl implements CyGroupManager {
-
private final CyEventHelper cyEventHelper;
- private static final Logger logger =
LoggerFactory.getLogger(CyGroupManagerImpl.class);
private Set<CyGroup> groupSet;
/**
@@ -89,6 +80,17 @@
}
@Override
+ public synchronized void addGroups(final List<CyGroup> groups) {
+ for (CyGroup group: groups) {
+ if (!groupSet.contains(group)) {
+ groupSet.add(group);
+ }
+ }
+ // Fire GroupsAddedEvent...
+ // cyEventHelper.fireEvent(new
GroupAddedEvent(CyGroupManagerImpl.this, group));
+ }
+
+ @Override
public synchronized List<CyGroup> getGroupsForNode(CyNode node) {
List<CyGroup> returnList = new ArrayList<CyGroup>();
Modified:
core3/impl/trunk/group-impl/src/test/java/org/cytoscape/group/TestCyGroupFactory.java
===================================================================
---
core3/impl/trunk/group-impl/src/test/java/org/cytoscape/group/TestCyGroupFactory.java
2012-03-11 18:36:44 UTC (rev 28485)
+++
core3/impl/trunk/group-impl/src/test/java/org/cytoscape/group/TestCyGroupFactory.java
2012-03-11 18:39:26 UTC (rev 28486)
@@ -90,17 +90,17 @@
groupEdges.add(edge3);
groupEdges.add(edge4);
- CyGroup group1 = factory.createGroup(network, groupNodes, null);
+ CyGroup group1 = factory.createGroup(network, groupNodes, null,
true);
assertNotNull(group1);
assertTrue("group1 node count = 3", group1.getNodeList().size()
== 3);
assertTrue("group1 internal edge count = 2",
group1.getInternalEdgeList().size() == 2);
assertTrue("group1 external edge count = 3",
group1.getExternalEdgeList().size() == 3);
- CyGroup group2 = factory.createGroup(network, groupNodes, new
ArrayList<CyEdge>());
+ CyGroup group2 = factory.createGroup(network, groupNodes, new
ArrayList<CyEdge>(), true);
assertNotNull(group2);
assertTrue("group2 node count = 3", group2.getNodeList().size()
== 3);
assertTrue("group2 internal edge count = 0",
group2.getInternalEdgeList().size() == 0);
assertTrue("group2 external edge count = 0",
group2.getExternalEdgeList().size() == 0);
- CyGroup group3 = factory.createGroup(network, groupNodes,
groupEdges);
+ CyGroup group3 = factory.createGroup(network, groupNodes,
groupEdges, true);
assertNotNull(group3);
assertTrue("group3 node count = 3", group3.getNodeList().size()
== 3);
assertTrue("group3 internal edge count = 2",
group3.getInternalEdgeList().size() == 2);
--
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.
