Author: clopes
Date: 2012-05-08 11:29:34 -0700 (Tue, 08 May 2012)
New Revision: 29147
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
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/DNodeView.java
Log:
Fixing compilation errors--worked on Eclipse :(
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-05-08 18:28:39 UTC (rev 29146)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-05-08 18:29:34 UTC (rev 29147)
@@ -781,7 +781,9 @@
@SuppressWarnings("unchecked")
@Override
- protected <T, V extends T> void applyVisualProperty(final
VisualProperty<? extends T> vp, V value) {
+ protected <T, V extends T> void applyVisualProperty(final
VisualProperty<? extends T> vpOriginal, V value) {
+ VisualProperty<?> vp = vpOriginal;
+
// If value is null, simply use the VP's default value.
if(value == null)
value = (V) vp.getDefault();
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-05-08 18:28:39 UTC (rev 29146)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-08 18:29:34 UTC (rev 29147)
@@ -2545,10 +2545,12 @@
}
@Override
- protected <T, V extends T> void applyVisualProperty(final
VisualProperty<? extends T> vp, V value) {
+ protected <T, V extends T> void applyVisualProperty(final
VisualProperty<? extends T> vpOriginal, V value) {
if (value == null)
return;
+ final VisualProperty<?> vp = vpOriginal;
+
if (vp == DVisualLexicon.NETWORK_NODE_SELECTION) {
boolean b = ((Boolean) value).booleanValue();
if (b)
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-05-08 18:28:39 UTC (rev 29146)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-05-08 18:29:34 UTC (rev 29147)
@@ -1148,7 +1148,9 @@
}
@Override
- protected <T, V extends T> void applyVisualProperty(final
VisualProperty<? extends T> vp, V value) {
+ protected <T, V extends T> void applyVisualProperty(final
VisualProperty<? extends T> vpOriginal, V value) {
+ VisualProperty<?> vp = vpOriginal;
+
// Null means set value to VP's default.
if(value == null)
value = (V) vp.getDefault();
--
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.
