Author: clopes
Date: 2012-11-23 09:59:12 -0800 (Fri, 23 Nov 2012)
New Revision: 30836
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/CalculatorConverter.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
Log:
Fixed a session integration test and added a few comments
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/CalculatorConverter.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/CalculatorConverter.java
2012-11-22 20:37:07 UTC (rev 30835)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/CalculatorConverter.java
2012-11-23 17:59:12 UTC (rev 30836)
@@ -312,6 +312,8 @@
} else if ("PassThroughMapping".equalsIgnoreCase(functionType))
{
PassthroughMapping pm = new PassthroughMapping();
pm.setAttributeName(attrName);
+ // Cy2 doesn't write the "controllerType" property for
PassThroughMappings, so just set STRING
+ // (it should work, anyway).
pm.setAttributeType(AttributeType.STRING);
return pm;
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-11-22 20:37:07 UTC (rev 30835)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-11-23 17:59:12 UTC (rev 30836)
@@ -172,9 +172,9 @@
.getVisualMappingFunction(BasicVisualLexicon.NODE_TOOLTIP);
assertTrue(nodeTooltipMapping instanceof PassthroughMapping);
assertEquals("gal4RGexp",
nodeTooltipMapping.getMappingColumnName());
-
- // FIXME this should be Number.class, but returns String
- //assertEquals(Number.class,
nodeTooltipMapping.getMappingColumnType());
+ // Cy2 doesn't write the "controllerType" property for
PassThroughMappings,
+ // so it's always created as String (it shouldn't cause any
issues)
+ assertEquals(String.class,
nodeTooltipMapping.getMappingColumnType());
VisualMappingFunction<?, LineType> edgeLineStyleMapping = style
.getVisualMappingFunction(BasicVisualLexicon.EDGE_LINE_TYPE);
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
2012-11-22 20:37:07 UTC (rev 30835)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/mappings/PassthroughMappingImpl.java
2012-11-23 17:59:12 UTC (rev 30836)
@@ -69,6 +69,7 @@
final CyColumn column = row.getTable().getColumn(columnName);
if (column != null) {
+ // Always try to find the data type from the current
table/column first
final Class<?> columnClass = column.getType();
try {
--
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.
