Author: rozagh
Date: 2012-06-13 16:09:13 -0700 (Wed, 13 Jun 2012)
New Revision: 29557

Modified:
   
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
Log:
Assign the created virtual column, a unique name based on the source column 
name. 

Modified: 
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
===================================================================
--- 
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
        2012-06-13 23:03:17 UTC (rev 29556)
+++ 
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
        2012-06-13 23:09:13 UTC (rev 29557)
@@ -945,10 +945,11 @@
                        VirtualColumnInfo virtualInfo = new 
VirtualColumnInfoImpl(true, sourceTable, sourceColumnName, 
                                                                                
  sourceTable.getPrimaryKey().getName(), 
                                                                                
  targetJoinKeyName, isImmutable);
-                       final CyColumn targetColumn = new CyColumnImpl(this, 
virtualColumnName, sourceColumn.getType(),
+                       targetName = getUniqueColumnName(virtualColumnName);
+
+                       final CyColumn targetColumn = new CyColumnImpl(this, 
targetName, sourceColumn.getType(),
                                                                       
sourceColumn.getListElementType(), virtualInfo,
                                                                       /* 
isPrimaryKey = */ false, isImmutable, null);
-                       targetName = getUniqueColumnName(virtualColumnName);
                        final String normalizedTargetName = 
normalizeColumnName(targetName);
                        types.put(normalizedTargetName, targetColumn);
                        virtualColumnMap.put(normalizedTargetName, new 
VirtualColumn((CyTableImpl)sourceTable, sourceColumnName, this,

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