Author: clopes
Date: 2011-12-08 14:13:41 -0800 (Thu, 08 Dec 2011)
New Revision: 27747
Modified:
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
Log:
Fixed bug: networks without views are not destroyed when loading or creating a
new session.
Modified:
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
===================================================================
---
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
2011-12-08 22:08:15 UTC (rev 27746)
+++
core3/impl/trunk/session-impl/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
2011-12-08 22:13:41 UTC (rev 27747)
@@ -447,13 +447,17 @@
private void disposeCurrentSession(boolean removeVisualStyles) {
logger.debug("Disposing current session...");
- // Destroy network views and models
+ // Destroy network views
Set<CyNetworkView> netViews = nvMgr.getNetworkViewSet();
- for (CyNetworkView nv : netViews) {
+ for (CyNetworkView nv : netViews)
nvMgr.destroyNetworkView(nv);
- netMgr.destroyNetwork(nv.getModel());
- }
+
+ // Destroy networks
+ Set<CyNetwork> networks = netMgr.getNetworkSet();
+
+ for (CyNetwork n : networks)
+ netMgr.destroyNetwork(n);
// Destroy styles
if (removeVisualStyles) {
--
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.
