Author: clopes
Date: 2012-08-14 12:12:31 -0700 (Tue, 14 Aug 2012)
New Revision: 30188
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/SUIDUpdater.java
Log:
Fixed SUIDUpdater bug, which appeared after latest changes to model-impl
(CyColumn.equals() does not work as intended with ColumnFacades).
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/SUIDUpdater.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/SUIDUpdater.java
2012-08-14 16:31:57 UTC (rev 30187)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/SUIDUpdater.java
2012-08-14 19:12:31 UTC (rev 30188)
@@ -62,20 +62,22 @@
}
public void updateSUIDColumns() {
- final Set<CyColumn> updated = new HashSet<CyColumn>();
+ final Set<String/*tableName_columnName*/> updated = new
HashSet<String>();
for (final CyTable tbl : tables) {
final Collection<CyColumn> columns = tbl.getColumns();
for (final CyColumn c : columns) {
- if (isUpdatableSUIDColumn(c) &&
!updated.contains(c)) {
+ final String columnId = tbl.getTitle() + "_" +
c.getName();
+
+ if (isUpdatableSUIDColumn(c) &&
!updated.contains(columnId)) {
Set<String> ignoredNames =
ignoredColumns.get(tbl);
if (ignoredNames != null &&
ignoredNames.contains(c.getName()))
continue;
updateRows(tbl, c);
- updated.add(c);
+ updated.add(columnId);
}
}
}
--
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.
