Author: mes
Date: 2010-09-09 09:48:47 -0700 (Thu, 09 Sep 2010)
New Revision: 21770
Modified:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
core3/vizmap-api/trunk/src/test/java/org/cytoscape/vizmap/AbstractVisualMappingFunctionTest.java
Log:
Changed CyDataTable name to CyTable
Modified:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
===================================================================
---
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
2010-09-09 16:48:43 UTC (rev 21769)
+++
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
2010-09-09 16:48:47 UTC (rev 21770)
@@ -36,7 +36,7 @@
import java.util.Collection;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
@@ -92,12 +92,12 @@
* Since current MappingCalculators map from Attributes to
* VisualProperties, have to restrict View<?> to those
* generic types that have CyAttributes; currently this is
- * GraphObject.
+ * CyTableEntry.
*
* @param <G> Graph object type.
*
* @param column DOCUMENT ME!
* @param views DOCUMENT ME!
*/
- <G extends GraphObject> void apply(final Collection<? extends View<G>>
views);
+ <G extends CyTableEntry> void apply(final Collection<? extends View<G>>
views);
}
Modified:
core3/vizmap-api/trunk/src/test/java/org/cytoscape/vizmap/AbstractVisualMappingFunctionTest.java
===================================================================
---
core3/vizmap-api/trunk/src/test/java/org/cytoscape/vizmap/AbstractVisualMappingFunctionTest.java
2010-09-09 16:48:43 UTC (rev 21769)
+++
core3/vizmap-api/trunk/src/test/java/org/cytoscape/vizmap/AbstractVisualMappingFunctionTest.java
2010-09-09 16:48:47 UTC (rev 21770)
@@ -5,7 +5,7 @@
import java.util.Collection;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -24,7 +24,7 @@
- protected Collection<View<GraphObject>> views;
+ protected Collection<View<CyTableEntry>> views;
@Before
public void setUp() throws Exception {
--
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.
