Author: kono
Date: 2010-08-18 14:47:51 -0700 (Wed, 18 Aug 2010)
New Revision: 21455
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
Log:
Behavior of getVisualProperty() had been changed. If null is set to a VP, it
returns the VP's default, instead of returning null.
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
2010-08-18 21:25:11 UTC (rev 21454)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
2010-08-18 21:47:51 UTC (rev 21455)
@@ -1,5 +1,6 @@
package org.cytoscape.view.model;
+import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -27,8 +28,9 @@
view.setVisualProperty(integerVP, 1);
assertEquals(Integer.valueOf(1),
view.getVisualProperty(integerVP));
+ // For Null, return default value.
view.setVisualProperty(integerVP, null);
- assertNull(view.getVisualProperty(integerVP));
+ assertNotNull(view.getVisualProperty(integerVP));
view.setVisualProperty(integerVP,-12345);
assertEquals(Integer.valueOf(-12345),
view.getVisualProperty(integerVP));
@@ -39,8 +41,9 @@
view.setVisualProperty(stringVP, "");
assertEquals("", view.getVisualProperty(stringVP));
+ // For Null, return default value.
view.setVisualProperty(stringVP, null);
- assertNull(view.getVisualProperty(stringVP));
+ assertNotNull(view.getVisualProperty(stringVP));
}
Modified:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
2010-08-18 21:25:11 UTC (rev 21454)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ViewImpl.java
2010-08-18 21:47:51 UTC (rev 21455)
@@ -59,6 +59,7 @@
@Override
public <T, V extends T> void setVisualProperty(
VisualProperty<? extends T> vp, V value) {
+
if(value == null)
this.visualProperties.remove(vp);
else
@@ -73,9 +74,14 @@
@SuppressWarnings("unchecked")
@Override
public <T> T getVisualProperty(VisualProperty<T> vp) {
- if(visualPropertyLocks.get(vp) == null)
- return (T) this.visualProperties.get(vp);
- else
+
+ if(visualPropertyLocks.get(vp) == null) {
+ if(visualProperties.get(vp) == null)
+ return vp.getDefault();
+ else
+ return (T) visualProperties.get(vp);
+
+ } else
return (T) this.visualPropertyLocks.get(vp);
}
--
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.
