Author: mes
Date: 2012-01-11 15:39:36 -0800 (Wed, 11 Jan 2012)
New Revision: 27986
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
Log:
fixes #452 added a minor redirection to avoid getting virtual column twice
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
2012-01-11 23:21:36 UTC (rev 27985)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
2012-01-11 23:39:36 UTC (rev 27986)
@@ -695,10 +695,13 @@
}
synchronized Object getValueOrEquation(final Object key, final String
columnName) {
+ return
getValueOrEquation(key,columnName,virtualColumnMap.get(columnName));
+ }
+
+ private synchronized Object getValueOrEquation(final Object key, final
String columnName, final VirtualColumn virtColumn) {
if (columnName.equals(primaryKey))
return key;
- final VirtualColumn virtColumn =
virtualColumnMap.get(columnName);
if (virtColumn != null)
return virtColumn.getRawValue(key);
@@ -731,7 +734,7 @@
if (virtColumn != null)
return virtColumn.getValue(key);
- final Object vl = getValueOrEquation(key, columnName);
+ final Object vl = getValueOrEquation(key, columnName,
virtColumn);
if (vl == null)
return null;
@@ -783,7 +786,7 @@
if (virtColumn != null)
return (List<T>)virtColumn.getListValue(key);
- final Object vl = getValueOrEquation(key, columnName);
+ final Object vl = getValueOrEquation(key, columnName,
virtColumn);
if (vl == null)
return getDefaultValue(columnName,defaultValue);
--
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.
