Author: mes
Date: 2010-11-12 14:56:07 -0800 (Fri, 12 Nov 2010)
New Revision: 22831
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyRow.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/RowSetMicroListener.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableTest.java
Log:
clarified row setting and unsetting in comments and tests
Modified: core3/model-api/trunk/src/main/java/org/cytoscape/model/CyRow.java
===================================================================
--- core3/model-api/trunk/src/main/java/org/cytoscape/model/CyRow.java
2010-11-12 22:30:12 UTC (rev 22830)
+++ core3/model-api/trunk/src/main/java/org/cytoscape/model/CyRow.java
2010-11-12 22:56:07 UTC (rev 22831)
@@ -54,6 +54,7 @@
/**
* Set the specified column for this row to the specified value.
+ * To unset a column entry use null for value.
* @param columnName The name identifying the attribute.
* @param value The value to assign the specified column in this row
*/
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/RowSetMicroListener.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/RowSetMicroListener.java
2010-11-12 22:30:12 UTC (rev 22830)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/RowSetMicroListener.java
2010-11-12 22:56:07 UTC (rev 22831)
@@ -48,7 +48,8 @@
/**
* The method that should react to the changed row.
* @param columnName The name of the column changed.
- * @param value The value the column was set to.
+ * @param value The value the column was set to. The value may
+ * be null, in which case the row should be considered "unset".
*/
void handleRowSet(final String columnName, final Object value);
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableTest.java
2010-11-12 22:30:12 UTC (rev 22830)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableTest.java
2010-11-12 22:56:07 UTC (rev 22831)
@@ -263,5 +263,61 @@
assertEquals( mgr.getPrimaryKeyType(),
mgr.getColumnTypeMap().get(pk) );
}
+ public void testUnsetRowBoolean() {
+ mgr.createColumn("someBoolean", Boolean.class);
+ attrs.set("someBoolean", true);
+ assertTrue(attrs.isSet("someBoolean", Boolean.class));
+ attrs.set("someBoolean", null);
+ assertFalse(attrs.isSet("someBoolean", Boolean.class));
+ attrs.set("someBoolean", false);
+ assertTrue(attrs.isSet("someBoolean", Boolean.class));
+ attrs.set("someBoolean", null);
+ assertFalse(attrs.isSet("someBoolean", Boolean.class));
+ }
+
+ public void testUnsetRowString() {
+ mgr.createColumn("someString", String.class);
+ attrs.set("someString", "homer");
+ assertTrue(attrs.isSet("someString", String.class));
+ attrs.set("someString", null);
+ assertFalse(attrs.isSet("someString", String.class));
+ }
+
+ public void testUnsetRowInt() {
+ mgr.createColumn("someInt", Integer.class);
+ attrs.set("someInt", 5);
+ assertTrue(attrs.isSet("someInt", Integer.class));
+ attrs.set("someInt", null);
+ assertFalse(attrs.isSet("someInt", Integer.class));
+ }
+
+ public void testUnsetRowDouble() {
+ mgr.createColumn("someDouble", Double.class);
+ attrs.set("someDouble", 5.0);
+ assertTrue(attrs.isSet("someDouble", Double.class));
+ attrs.set("someDouble", null);
+ assertFalse(attrs.isSet("someDouble", Double.class));
+ }
+
+ public void testUnsetRowList() {
+ List<String> ls = new ArrayList<String>();
+ ls.add("asdf");
+ mgr.createColumn("someList", List.class);
+ attrs.set("someList", ls);
+ assertTrue(attrs.isSet("someList", List.class));
+ attrs.set("someList", null);
+ assertFalse(attrs.isSet("someList", List.class));
+ }
+
+ public void testUnsetRowMap() {
+ Map<Integer,String> mis = new HashMap<Integer,String>();
+ mis.put(1,"two");
+ mgr.createColumn("someMap", Map.class);
+ attrs.set("someMap", mis);
+ assertTrue(attrs.isSet("someMap", Map.class));
+ attrs.set("someMap", null);
+ assertFalse(attrs.isSet("someMap", Map.class));
+ }
+
// lots more needed
}
--
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.
