Author: clopes
Date: 2011-12-06 14:12:29 -0800 (Tue, 06 Dec 2011)
New Revision: 27716
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy3SessionReaderImpl.java
Log:
Fixed bug that was duplicating the "shared name" columns when restoring virtual
columns from 3.0 cys files.
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy3SessionReaderImpl.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy3SessionReaderImpl.java
2011-12-06 21:55:48 UTC (rev 27715)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy3SessionReaderImpl.java
2011-12-06 22:12:29 UTC (rev 27716)
@@ -394,12 +394,15 @@
for (VirtualColumnSerializer columnData : virtualColumns) {
CyTable targetTable =
filenameTableMap.get(columnData.getTargetTable());
- CyTable sourceTable =
filenameTableMap.get(columnData.getSourceTable());
- targetTable.addVirtualColumn(columnData.getName(),
-
columnData.getSourceColumn(),
-
sourceTable,
-
columnData.getTargetJoinKey(),
-
columnData.isImmutable());
+
+ if (targetTable.getColumn(columnData.getName()) ==
null) {
+ CyTable sourceTable =
filenameTableMap.get(columnData.getSourceTable());
+
targetTable.addVirtualColumn(columnData.getName(),
+
columnData.getSourceColumn(),
+
sourceTable,
+
columnData.getTargetJoinKey(),
+
columnData.isImmutable());
+ }
}
}
--
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.
