Author: kono
Date: 2011-11-28 16:44:44 -0800 (Mon, 28 Nov 2011)
New Revision: 27630
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NodeViewDefaultSupport.java
Log:
Remove Custom Graphics function had been fixed.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2011-11-29 00:36:12 UTC (rev 27629)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2011-11-29 00:44:44 UTC (rev 27630)
@@ -45,6 +45,7 @@
import org.cytoscape.ding.Label;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.Layer;
+import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.impl.visualproperty.CustomGraphicsVisualProperty;
import org.cytoscape.graph.render.stateful.CustomGraphic;
import org.cytoscape.graph.render.stateful.NodeDetails;
@@ -584,7 +585,11 @@
void setCustomGraphicsDefault(final CustomGraphicsVisualProperty vp,
final CyCustomGraphics<CustomGraphic> customGraphics) {
- defaultCustomGraphicsMap.put(vp, customGraphics);
+
+ if(customGraphics == NullCustomGraphics.getNullObject())
+ defaultCustomGraphicsMap.remove(vp);
+ else
+ defaultCustomGraphicsMap.put(vp, customGraphics);
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NodeViewDefaultSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NodeViewDefaultSupport.java
2011-11-29 00:36:12 UTC (rev 27629)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NodeViewDefaultSupport.java
2011-11-29 00:44:44 UTC (rev 27630)
@@ -238,11 +238,8 @@
void setCustomGraphics(final VisualProperty<?> vp, final
CyCustomGraphics<CustomGraphic> customGraphics) {
synchronized (lock) {
- // Pick from Custom Graphics 1-9.
- final CyCustomGraphics<CustomGraphic> currentCG =
defaultCustomGraphicsMap.get(vp);
nodeDetails.setCustomGraphicsDefault((CustomGraphicsVisualProperty) vp,
customGraphics);
}
-
}
}
--
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.
