Author: kono
Date: 2010-08-09 17:20:10 -0700 (Mon, 09 Aug 2010)
New Revision: 21274
Modified:
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/ContinuousMapping.java
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/DiscreteMapping.java
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/PassthroughMapping.java
Log:
Method name changed from getSource() to getModel() for consistency.
Modified:
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/ContinuousMapping.java
===================================================================
---
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/ContinuousMapping.java
2010-08-10 00:19:18 UTC (rev 21273)
+++
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/ContinuousMapping.java
2010-08-10 00:20:10 UTC (rev 21274)
@@ -194,7 +194,7 @@
CyRow row;
for (View<G> v : views) {
- row = v.getSource().attrs();
+ row = v.getModel().attrs();
if (row.contains(attrName, attrType)) {
// skip Views where source attribute is not
defined;
@@ -202,7 +202,7 @@
// default, as appropriate
// In all cases, attribute value should be a
number for continuous mapping.
- final Number attrValue =
v.getSource().attrs().get(attrName,attrType);
+ final Number attrValue =
v.getModel().attrs().get(attrName,attrType);
final V value = getRangeValue(attrValue); //
FIXME: make
// getRangeValue
// type-parametric,
Modified:
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/DiscreteMapping.java
===================================================================
---
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/DiscreteMapping.java
2010-08-10 00:19:18 UTC (rev 21273)
+++
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/DiscreteMapping.java
2010-08-10 00:20:10 UTC (rev 21274)
@@ -136,13 +136,13 @@
CyRow row;
for (View<G> v : views) {
- row = v.getSource().attrs();
+ row = v.getModel().attrs();
if (row.contains(attrName, attrType)) {
// skip Views where source attribute is not
defined;
// ViewColumn will automatically substitute the
per-VS or global
// default, as appropriate
- final K key =
v.getSource().attrs().get(attrName, attrType);
+ final K key =
v.getModel().attrs().get(attrName, attrType);
if (treeMap.containsKey(key)) {
final V value = treeMap.get(key);
valuesToSet.put(v, value);
Modified:
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/PassthroughMapping.java
===================================================================
---
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/PassthroughMapping.java
2010-08-10 00:19:18 UTC (rev 21273)
+++
core3/default-mappingcalculators/trunk/src/main/java/org/cytoscape/view/vizmap/mappings/PassthroughMapping.java
2010-08-10 00:20:10 UTC (rev 21274)
@@ -88,7 +88,7 @@
for (View<G> v : views) {
- row = v.getSource().attrs();
+ row = v.getModel().attrs();
if (row.contains(attrName, attrType)) {
// skip Views where source attribute is
not defined;
// ViewColumn will automatically
substitute the per-VS or
--
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.
