Author: rodche
Date: 2011-09-21 08:23:33 -0700 (Wed, 21 Sep 2011)
New Revision: 26906
Modified:
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CyNetworkNamingImpl.java
Log:
Check for null and logging - added
Modified:
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CyNetworkNamingImpl.java
===================================================================
---
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CyNetworkNamingImpl.java
2011-09-21 03:43:09 UTC (rev 26905)
+++
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CyNetworkNamingImpl.java
2011-09-21 15:23:33 UTC (rev 26906)
@@ -33,9 +33,12 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CyNetworkNamingImpl implements CyNetworkNaming {
+ private static final Logger logger =
LoggerFactory.getLogger(CyNetworkNamingImpl.class);
private final CyNetworkManager networkManager;
public CyNetworkNamingImpl(final CyNetworkManager networkManager) {
@@ -53,6 +56,12 @@
}
public String getSuggestedNetworkTitle(String desiredTitle) {
+ if(desiredTitle == null || "".equals(desiredTitle.trim())) {
+ desiredTitle = "Network";
+ logger.warn("getSuggestedNetworkTitle: desiredTitle " +
+ "was '" + desiredTitle + "'");
+ }
+
for (int i = 0; true; i++) {
String titleCandidate = desiredTitle + ((i == 0) ? "" :
("." + i));
@@ -62,9 +71,16 @@
}
private boolean isNetworkTitleTaken(final String titleCandidate) {
- for (CyNetwork existingNetwork : networkManager.getNetworkSet()
)
- if (existingNetwork.getCyRow().get("name",
String.class).equals(titleCandidate))
- return true;
+ for (CyNetwork existingNetwork : networkManager.getNetworkSet()
) {
+ String name =
existingNetwork.getCyRow().get(CyNetwork.NAME, String.class);
+ if(name != null) {
+ if (name.equals(titleCandidate))
+ return true;
+ } else {
+ logger.error("isNetworkTitleTaken: CyNetwork "
+ + existingNetwork.getSUID() + " 'name'
is NULL!");
+ }
+ }
return false;
}
--
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.
