X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.browsing.ui.nattable%2Fsrc%2Forg%2Fsimantics%2Fbrowsing%2Fui%2Fnattable%2FNatTableGraphExplorer.java;fp=bundles%2Forg.simantics.browsing.ui.nattable%2Fsrc%2Forg%2Fsimantics%2Fbrowsing%2Fui%2Fnattable%2FNatTableGraphExplorer.java;h=9d12fd9b592f70e44bf842819cee245f2b596beb;hb=d7ce5ab37a70cf207e3bfe0045c0df3f1fb98415;hp=37eafd4eb5e965e1e1811fc418576e8a37535b21;hpb=d613530ca19459bcc8a75015ec28533968b92c2d;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
index 37eafd4eb..9d12fd9b5 100644
--- a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
+++ b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
@@ -993,11 +993,15 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
        //       we have to remove all references here to reduce memory consumption.
        //	
        //       Proper fix would be to remove references between QueryCache and GENodeQueryManagers.
+    	
+    	// Clearing explorerContext replaces GECache with dummy implementation, which makes node disposal much faster.
+    	explorerContext.close();
     	if (rootNode != null) {
-     		rootNode.dispose();
+    		// Using fastDispose bypasses item removal from nodeMap, which is cleared later. 
+     		rootNode.fastDispose();
          	rootNode = null;	
         }	
-        explorerContext.dispose();
+    	explorerContext.dispose();
         explorerContext = null;
         processors.clear();
         detachPrimitiveProcessors();
@@ -1026,8 +1030,7 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
         }
         resourceManager.dispose();
         resourceManager = null;
-       		
-        contextToNodeMap.clear(); // should be empty at this point.
+        contextToNodeMap.clear();	
         contextToNodeMap = null;
         if (postSelectionProvider != null) {
         	postSelectionProvider.dispose();
@@ -2394,6 +2397,13 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
             }
         };
         
+        public void close() {
+        	cache.dispose();
+        	cache = new DummyCache();
+        	scheduleList.clear();
+        	autoExpanded.clear();
+        }
+        
         @Override
         public void dispose() {
         	cache.dispose();
@@ -2605,6 +2615,7 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
 		final HashMap<GECacheKey, IGECacheEntry> entries = new HashMap<GECacheKey, IGECacheEntry>();
 		final HashMap<GECacheKey, Set<UIElementReference>> treeReferences = new HashMap<GECacheKey, Set<UIElementReference>>();
 		final HashMap<NodeContext, Set<GECacheKey>> keyRefs = new HashMap<NodeContext, Set<GECacheKey>>();
+		private TObjectIntHashMap<NodeContext> references = new TObjectIntHashMap<NodeContext>();
 		
 		 /**
 	     * This single instance is used for all get operations from the cache. This
@@ -2731,7 +2742,7 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
 	    	return references.get(context) > 0;
 	    }
 
-	    private TObjectIntHashMap<NodeContext> references = new TObjectIntHashMap<NodeContext>();
+	    
 	    
 	    @Override
 	    public void incRef(NodeContext context) {