Author: ruschein
Date: 2011-01-25 13:41:08 -0800 (Tue, 25 Jan 2011)
New Revision: 23613

Modified:
   
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
Log:
Hopefully fixed the implementation of CyRow.getAllValues() when there are 
virtual columns.

Modified: 
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
===================================================================
--- 
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
     2011-01-25 21:31:50 UTC (rev 23612)
+++ 
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
     2011-01-25 21:41:08 UTC (rev 23613)
@@ -947,13 +947,12 @@
                }
 
                public Map<String, Object> getAllValues() {
-                       Map<String, Object> m = new HashMap<String, 
Object>(attributes
-                                       .size());
+                       final Map<String, Object> nameToValueMap =
+                               new HashMap<String, Object>(types.size());
+                       for (final String columnName : types.keySet())
+                               nameToValueMap.put(columnName, getX(key, 
columnName, types.get(columnName)));
 
-                       for (String attr : attributes.keySet())
-                               m.put(attr, attributes.get(attr).get(key));
-
-                       return m;
+                       return nameToValueMap;
                }
 
                public CyTable getDataTable() {

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