Author: mes
Date: 2010-09-09 09:47:50 -0700 (Thu, 09 Sep 2010)
New Revision: 21761

Modified:
   
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
   
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
Log:
Changed CyDataTable name to CyTable

Modified: 
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
===================================================================
--- 
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
    2010-09-09 16:47:46 UTC (rev 21760)
+++ 
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/graphPartition/DegreeSortedCircleLayout.java
    2010-09-09 16:47:50 UTC (rev 21761)
@@ -1,7 +1,7 @@
 /* vim: set ts=2: */
 package csplugins.layout.algorithms.graphPartition;
 
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.NODE;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: 
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
===================================================================
--- 
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
     2010-09-09 16:47:46 UTC (rev 21760)
+++ 
core3/layout-cytoscape-impl/trunk/src/main/java/csplugins/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithm.java
     2010-09-09 16:47:50 UTC (rev 21761)
@@ -46,7 +46,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.cytoscape.model.CyDataTableUtil;
+import org.cytoscape.model.CyTableUtil;
 import org.cytoscape.model.CyEdge;
 import org.cytoscape.model.CyNode;
 import org.cytoscape.view.layout.AbstractLayout;
@@ -299,7 +299,7 @@
                        return;
 
                /* construct node list with selected nodes first */
-               List selectedNodes = 
CyDataTableUtil.getNodesInState(network,"selected",true);
+               List selectedNodes = 
CyTableUtil.getNodesInState(network,"selected",true);
                int numSelectedNodes = selectedNodes.size();
 
                if (!selectedOnly)
@@ -317,7 +317,7 @@
                HashMap<Integer, View<CyNode>> index2NodeView = new 
HashMap<Integer, View<CyNode>>(numNodes);
                
                if (numSelectedNodes > 1) {
-                       for (CyNode n: 
CyDataTableUtil.getNodesInState(network,"selected",true)){
+                       for (CyNode n: 
CyTableUtil.getNodesInState(network,"selected",true)){
                            index2NodeView.put(n.getIndex(), 
networkView.getNodeView(n));
                        }
                } else {

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