Author: mes
Date: 2012-01-17 13:54:22 -0800 (Tue, 17 Jan 2012)
New Revision: 28032
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
Log:
fixed a bad exception message
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
2012-01-17 18:35:09 UTC (rev 28031)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
2012-01-17 21:54:22 UTC (rev 28032)
@@ -531,28 +531,29 @@
/**
* {@inheritDoc}
*/
- public CyRow getRow(CyTableEntry entry, String tableName) {
- if ( entry == null )
- throw new NullPointerException("null entry");
+ public CyRow getRow(CyTableEntry entry, String tableName) {
+ if ( entry == null )
+ throw new NullPointerException("null entry");
- if ( tableName == null )
- throw new NullPointerException("null table name");
+ if ( tableName == null )
+ throw new NullPointerException("null table name");
- CyTable table;
+ CyTable table;
- synchronized (this) {
- if ( entry instanceof CyNode && containsNode((CyNode)entry) )
- table = nodeTables.get(tableName);
- else if ( entry instanceof CyEdge && containsEdge((CyEdge)entry) )
- table = edgeTables.get(tableName);
- else if ( entry instanceof CyNetwork && entry.equals(this) )
- table = netTables.get(tableName);
- else
- throw new IllegalArgumentException("unrecognized table
entry!");
- }
+ synchronized (this) {
+ if ( entry instanceof CyNode &&
containsNode((CyNode)entry) )
+ table = nodeTables.get(tableName);
+ else if ( entry instanceof CyEdge &&
containsEdge((CyEdge)entry) )
+ table = edgeTables.get(tableName);
+ else if ( entry instanceof CyNetwork &&
entry.equals(this) )
+ table = netTables.get(tableName);
+ else
+ throw new
IllegalArgumentException("unrecognized (table entry): " + entry.toString() +
+ " (table
name): " + tableName);
+ }
- return table.getRow(entry.getSUID());
- }
+ return table.getRow(entry.getSUID());
+ }
public String toString() {
--
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.
