Author: clopes
Date: 2012-01-12 14:05:34 -0800 (Thu, 12 Jan 2012)
New Revision: 28000
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
Log:
Fixed destroyNetworkView()--it was still using the SUID.
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
2012-01-12 20:54:55 UTC (rev 27999)
+++
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
2012-01-12 22:05:34 UTC (rev 28000)
@@ -98,10 +98,10 @@
if (view == null)
throw new NullPointerException("view is null");
- final Long viewID = view.getModel().getSUID();
+ final CyNetwork network = view.getModel();
// do this outside of the lock to fail early
- if (!networkViewMap.containsKey(viewID))
+ if (!networkViewMap.containsKey(network))
throw new IllegalArgumentException("network view is not
recognized by this NetworkManager");
// let everyone know!
@@ -109,15 +109,15 @@
synchronized (this) {
// do this again within the lock to be safe
- if (!networkViewMap.containsKey(viewID))
+ if (!networkViewMap.containsKey(network))
throw new IllegalArgumentException("network
view is not recognized by this NetworkManager");
- networkViewMap.remove(viewID);
+ networkViewMap.remove(network);
}
cyEventHelper.fireEvent(new NetworkViewDestroyedEvent(this));
+ logger.debug("######### Network View deleted: " +
view.getSUID());
view = null;
- logger.debug("######### Network View deleted: " + viewID);
}
@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.
