Author: kono
Date: 2012-03-05 17:46:33 -0800 (Mon, 05 Mar 2012)
New Revision: 28436
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NodeViewDefaultSupport.java
Log:
refs #712
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-03-06 01:26:41 UTC (rev 28435)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-03-06 01:46:33 UTC (rev 28436)
@@ -2951,11 +2951,16 @@
// Filter some special cases here: In DING, there is no default
W, H, and D. Also, Custm Graphics should be applied for each view.
if (vp == BasicVisualLexicon.NODE_SIZE || vp ==
BasicVisualLexicon.NODE_WIDTH
- || vp == BasicVisualLexicon.NODE_HEIGHT ||
(VisualProperty<?>)vp instanceof CustomGraphicsVisualProperty) {
+ || vp == BasicVisualLexicon.NODE_HEIGHT) {
applyToAll(vp, defaultValue);
return;
}
+ if((VisualProperty<?>)vp instanceof
CustomGraphicsVisualProperty) {
+ applyToAll(vp, defaultValue);
+ return;
+ }
+
if (vp != DVisualLexicon.NODE_LABEL_POSITION && defaultValue
instanceof ObjectPosition) {
if (defaultValue !=
ObjectPositionImpl.DEFAULT_POSITION) {
applyToAll(vp, defaultValue);
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
2012-03-06 01:26:41 UTC (rev 28435)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NodeViewDefaultSupport.java
2012-03-06 01:46:33 UTC (rev 28436)
@@ -38,7 +38,6 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
-import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.values.NodeShape;
class NodeViewDefaultSupport {
--
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.
