Author: pwang
Date: 2012-07-05 15:51:34 -0700 (Thu, 05 Jul 2012)
New Revision: 29776
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/DefaultAttributeMerger.java
Log:
Do not set value for virtual column
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/DefaultAttributeMerger.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/DefaultAttributeMerger.java
2012-07-05 22:18:01 UTC (rev 29775)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/DefaultAttributeMerger.java
2012-07-05 22:51:34 UTC (rev 29776)
@@ -91,7 +91,9 @@
Object o1 = fromCyRow.getRaw(fromAttr.getName());
//Correct??
String o2 = cyRow.get(toAttr.getName(),
String.class);
if (o2==null||o2.length()==0) { //null or empty
attribute
- cyRow.set(toAttr.getName(), o1.toString());
+ if (!toAttr.getVirtualColumnInfo().isVirtual()){
+ cyRow.set(toAttr.getName(),
o1.toString());
+ }
} else if (o1.equals(o2)) { //TODO: neccessary?
// the same, do nothing
} else { // attribute conflict
--
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.
