Author: jm
Date: 2012-09-18 14:08:01 -0700 (Tue, 18 Sep 2012)
New Revision: 30380
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
Log:
Fixes #1451: Moved dependency check out of inner loop (different bug) and added
extra check for existing mappings when doing dependency check.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2012-09-18 19:42:17 UTC (rev 30379)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2012-09-18 21:08:01 UTC (rev 30380)
@@ -274,24 +274,25 @@
// }
}
- // Override dependency
- final Set<VisualPropertyDependency<?>>
dependencies = style.getAllVisualPropertyDependencies();
- for (VisualPropertyDependency<?> dep :
dependencies) {
- if (dep.isDependencyEnabled()) {
- final Set<?> vpGroup =
dep.getVisualProperties();
- VisualProperty<?> firstVP =
(VisualProperty<?>) vpGroup.iterator().next();
- final VisualLexiconNode node =
lex.getVisualLexiconNode(firstVP);
- final VisualProperty<?>
parentVP = node.getParent().getVisualProperty();
- if
(unusedVisualPropType.contains(parentVP) == false)
-
unusedVisualPropType.add(parentVP);
- // Remove group
- for (Object toBeRemoved :
vpGroup)
-
unusedVisualPropType.remove(toBeRemoved);
- }
- }
mapping = null;
}
+
+ // Override dependency
+ final Set<VisualPropertyDependency<?>> dependencies =
style.getAllVisualPropertyDependencies();
+ for (VisualPropertyDependency<?> dep : dependencies) {
+ if (dep.isDependencyEnabled()) {
+ final Set<?> vpGroup =
dep.getVisualProperties();
+ VisualProperty<?> firstVP =
(VisualProperty<?>) vpGroup.iterator().next();
+ final VisualLexiconNode node =
lex.getVisualLexiconNode(firstVP);
+ final VisualProperty<?> parentVP =
node.getParent().getVisualProperty();
+ if
(unusedVisualPropType.contains(parentVP) == false &&
style.getVisualMappingFunction(parentVP) == null)
+
unusedVisualPropType.add(parentVP);
+ // Remove group
+ for (Object toBeRemoved : vpGroup)
+
unusedVisualPropType.remove(toBeRemoved);
+ }
+ }
}
}
--
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.
