Author: ruschein
Date: 2010-12-20 15:14:16 -0800 (Mon, 20 Dec 2010)
New Revision: 23251
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableTest.java
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
Log:
Fixed a problem with getting column values when the column was the primary key
column.
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-12-20 23:14:14 UTC (rev 23250)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableTest.java
2010-12-20 23:14:16 UTC (rev 23251)
@@ -548,4 +548,10 @@
final CyRow row = table.getRow(2L);
assertTrue(eventHelper.getCalledMicroListeners().contains("handleRowCreated"));
}
+
+ @Test
+ public void testGetWithPrimaryKey() {
+ final CyRow row = table.getRow(107L);
+ assertEquals(row.get(table.getPrimaryKey(),
table.getPrimaryKeyType()), 107L);
+ }
}
Modified:
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
===================================================================
---
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
2010-12-20 23:14:14 UTC (rev 23250)
+++
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
2010-12-20 23:14:16 UTC (rev 23251)
@@ -202,12 +202,6 @@
return rows.size();
}
- /**
- * DOCUMENT ME!
- *
- * @param columnName
- * DOCUMENT ME!
- */
synchronized public void deleteColumn(String columnName) {
if (attributes.containsKey(columnName)) {
attributes.remove(columnName);
@@ -220,16 +214,6 @@
}
}
- /**
- * DOCUMENT ME!
- * @param type
- * DOCUMENT ME!
- * @param columnName
- * DOCUMENT ME!
- *
- * @param <T>
- * DOCUMENT ME!
- */
public <T> void createColumn(String columnName, Class<? extends T>
type) {
if (columnName == null)
throw new NullPointerException("attribute name is
null");
@@ -254,8 +238,7 @@
eventHelper.fireAsynchronousEvent(new ColumnCreatedEvent(this,
columnName));
}
- public <T> void createListColumn(final String columnName, final
Class<T> listElementType)
- {
+ public <T> void createListColumn(final String columnName, final
Class<T> listElementType) {
if (columnName == null)
throw new NullPointerException("attribute name is
null");
@@ -274,18 +257,6 @@
eventHelper.fireAsynchronousEvent(new ColumnCreatedEvent(this,
columnName));
}
- /**
- * DOCUMENT ME!
- *
- * @param <T>
- * DOCUMENT ME!
- * @param columnName
- * DOCUMENT ME!
- * @param type
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
public <T> List<T> getColumnValues(String columnName, Class<? extends
T> type) {
if (columnName == null)
throw new NullPointerException("column name is null!");
@@ -319,14 +290,6 @@
return l;
}
- /**
- * DOCUMENT ME!
- *
- * @param suid
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
public CyRow getRow(final Object key) {
checkKey(key);
CyRow row = rows.get(key);
@@ -548,6 +511,9 @@
}
private Object getValueOrEquation(final Object key, final String
columnName) {
+ if (columnName.equals(primaryKey))
+ return key;
+
Map<Object, Object> keyToValueMap = attributes.get(columnName);
if (keyToValueMap == null)
return null;
--
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.
