Author: rodche
Date: 2012-06-11 14:01:24 -0700 (Mon, 11 Jun 2012)
New Revision: 29528
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
Log:
It is fixed bug #1099. My prev. commit was also about #1099 (NOT 1100! Sorry.)!
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
2012-06-11 20:40:49 UTC (rev 29527)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
2012-06-11 21:01:24 UTC (rev 29528)
@@ -172,6 +172,8 @@
cPathFactory.getCyNetworkViewManager().addNetworkView(view);
// Add Links Back to cPath Instance
+ // addLinksToCPathInstance call must be before any
postProcessing* call,
+ // which may (when merging) delete 'cyNetwork'!
addLinksToCPathInstance(cyNetwork);
// Branch, based on download mode.
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
2012-06-11 20:40:49 UTC (rev 29527)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
2012-06-11 21:01:24 UTC (rev 29528)
@@ -21,7 +21,7 @@
String key = entry.getKey();
Object value = entry.getValue();
CyColumn column = sourceRow.getTable().getColumn(key);
- if (!column.getVirtualColumnInfo().isVirtual()) {
//skip virtual cols
+ if (!column.getVirtualColumnInfo().isVirtual()) {
//skip virtual cols! (bug fixed)
Class<?> type;
if (value instanceof List) {
type = column.getListElementType();
@@ -40,9 +40,6 @@
CyTable table = row.getTable();
CyColumn column = table.getColumn(name);
- if(column != null && column.getVirtualColumnInfo().isVirtual())
- return; //skip TODO ?
-
if (value != null) {
if (column == null) {
if (value instanceof List) {
--
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.
