Author: scooter
Date: 2012-01-24 17:47:00 -0800 (Tue, 24 Jan 2012)
New Revision: 28099

Modified:
   core3/impl/trunk/group-impl/pom.xml
   
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
Log:
Added getGroup method support.


Modified: core3/impl/trunk/group-impl/pom.xml
===================================================================
--- core3/impl/trunk/group-impl/pom.xml 2012-01-25 01:27:58 UTC (rev 28098)
+++ core3/impl/trunk/group-impl/pom.xml 2012-01-25 01:47:00 UTC (rev 28099)
@@ -14,7 +14,7 @@
   <groupId>org.cytoscape</groupId>
   <artifactId>group-impl</artifactId>
 
-  <name>${bundle.symbolicName}</name>
+       <name>${bundle.symbolicName} [${bundle.namespace}]</name>
 
   <packaging>bundle</packaging>
 

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-01-25 01:27:58 UTC (rev 28098)
+++ 
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupImpl.java
     2012-01-25 01:47:00 UTC (rev 28099)
@@ -429,8 +429,6 @@
         */
        @Override
        public boolean isCollapsed(CyNetwork net) {
-               System.out.println("collapseSet = "+collapseSet);
-               System.out.println("collapseSet has "+collapseSet.size()+" 
elements");
                return collapseSet.contains(net);
        }
 

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-01-25 01:27:58 UTC (rev 28098)
+++ 
core3/impl/trunk/group-impl/src/main/java/org/cytoscape/group/internal/CyGroupManagerImpl.java
      2012-01-25 01:47:00 UTC (rev 28099)
@@ -102,6 +102,15 @@
        }
 
        @Override
+       public synchronized CyGroup getGroup(CyNode node, CyNetwork network) {
+               for (CyGroup group: groupSet) {
+                       if (group.isInNetwork(network) && 
group.getGroupNode().equals(node))
+                               return group;
+               }
+               return null;
+       }
+
+       @Override
        public synchronized boolean isGroup(CyNode node, CyNetwork network) {
                for (CyGroup group: groupSet) {
                        if (group.isInNetwork(network) && 
group.getGroupNode().equals(node))

-- 
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.

Reply via email to