Author: kono
Date: 2009-04-29 11:30:33 -0700 (Wed, 29 Apr 2009)
New Revision: 16706
Modified:
core3/layout/trunk/src/main/java/org/cytoscape/layout/internal/algorithms/GridNodeLayout.java
Log:
TwoDVisualProperties is replaced by TwoDVisualLexicon.
Modified:
core3/layout/trunk/src/main/java/org/cytoscape/layout/internal/algorithms/GridNodeLayout.java
===================================================================
---
core3/layout/trunk/src/main/java/org/cytoscape/layout/internal/algorithms/GridNodeLayout.java
2009-04-29 18:28:56 UTC (rev 16705)
+++
core3/layout/trunk/src/main/java/org/cytoscape/layout/internal/algorithms/GridNodeLayout.java
2009-04-29 18:30:33 UTC (rev 16706)
@@ -36,26 +36,19 @@
*/
package org.cytoscape.layout.internal.algorithms;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNode;
+import java.util.List;
+
import org.cytoscape.layout.AbstractLayout;
import org.cytoscape.layout.CyLayouts;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.ViewColumn;
-import org.cytoscape.view.presentation.twod.TwoDVisualProperties;
-
-import org.cytoscape.work.UndoSupport;
+import org.cytoscape.view.presentation.twod.TwoDVisualLexicon;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.UndoSupport;
-//import javax.swing.*;
-//import java.awt.GridLayout;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
/**
* The GridNodeLayout provides a very simple layout, suitable as
* the default layout for Cytoscape data readers.
@@ -156,8 +149,8 @@
int columns;
// TODO figure out where these come from!
- VisualProperty<Double> xLoc =
TwoDVisualProperties.NODE_X_LOCATION;
- VisualProperty<Double> yLoc =
TwoDVisualProperties.NODE_Y_LOCATION;
+ VisualProperty<Double> xLoc = TwoDVisualLexicon.NODE_X_LOCATION;
+ VisualProperty<Double> yLoc = TwoDVisualLexicon.NODE_Y_LOCATION;
// needed for approach 2 and 3
//ViewColumn<Double> xColumn = networkView.getColumn(xLoc);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
