Author: mes
Date: 2012-06-01 13:35:06 -0700 (Fri, 01 Jun 2012)
New Revision: 29420
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/CalculatorConverter.java
Log:
tweaked support for importing old-style vizmap.props files where certain
dependencies were being read in twice
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-06-01 14:54:24 UTC (rev 29419)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/CalculatorConverter.java
2012-06-01 20:35:06 UTC (rev 29420)
@@ -451,9 +451,14 @@
boolean b = false;
if (key != null) {
- b |= key
-
.matches("(node|edge)AppearanceCalculator\\.[^\\.]+\\."
- +
"(nodeSizeLocked|nodeLabelColorFromNodeColor|nodeCustomGraphicsSizeSync|arrowColorMatchesEdge)");
+ // We need to distinguish node dependencies from edge
dependencies because in
+ // some old versions of vizmap.props (e.g. 2.5 era) we
would see a dependency
+ // (e.g. nodeSizeLocked) listed under both
nodeAppearanceCalculator and
+ // edgeAppearanceCalculator, which means two Dependency
objects get mapped
+ // to the same "nodeSizeLocked"
VisualPropertyDependency.
+ b |=
key.matches("nodeAppearanceCalculator\\.[^\\.]+\\." +
+
"(nodeSizeLocked|nodeLabelColorFromNodeColor|nodeCustomGraphicsSizeSync)");
+ b |=
key.matches("edgeAppearanceCalculator\\.[^\\.]+\\.arrowColorMatchesEdge");
}
return b;
--
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.
