Author: clopes
Date: 2012-10-18 08:52:25 -0700 (Thu, 18 Oct 2012)
New Revision: 30683
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
Log:
Minor changes to CyRootNetworkImpl.toString(), to prevent
NullPointerExceptions, which can happen if the network tables haven't been
created yet.
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
2012-10-18 14:08:31 UTC (rev 30682)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
2012-10-18 15:52:25 UTC (rev 30683)
@@ -370,7 +370,13 @@
@Override
public String toString() {
- return "CyRootNetwork: " + suid + " name: " +
getRow(this).get(NAME, String.class);
+ String name;
+ try {
+ name = getRow(this).get(NAME, String.class);
+ } catch (NullPointerException e) {
+ name = "(unavailable)";
+ }
+ return "CyRootNetwork: " + getSUID() + " name: " + name;
}
private synchronized int getNextNodeIndex() {
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
2012-10-18 14:08:31 UTC (rev 30682)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
2012-10-18 15:52:25 UTC (rev 30683)
@@ -323,11 +323,11 @@
public String toString() {
String name;
try {
- name = getRow(this).get("name", String.class);
+ name = getRow(this).get(NAME, String.class);
} catch (NullPointerException e) {
name = "(unavailable)";
}
- return "CyNetwork: " + getSUID() + " name: " + name;
+ return "CySubNetwork: " + getSUID() + " name: " + name;
}
@Override
--
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.
