From a718c3de628e671c135b693fee26645433a2717f Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Thu, 3 Jun 2004 18:09:09 +0000
Subject: [PATCH] cleanup maps in manager on project close/delete

---
 .../eclipse/cdt/make/core/MakeCorePlugin.java |  5 +++
 .../scannerconfig/DiscoveredPathManager.java  | 36 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
index 62f36c40a1f..bcd28f9d09b 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
@@ -146,6 +146,10 @@ public class MakeCorePlugin extends Plugin {
 				fTargetManager.shutdown();
 				fTargetManager = null;
 			}
+			if (fDiscoveryPathManager != null) {
+				fDiscoveryPathManager.shutdown();
+				fDiscoveryPathManager = null;
+			}
 		} finally {
 			super.stop(context);
 		}
@@ -177,6 +181,7 @@ public class MakeCorePlugin extends Plugin {
 	public IDiscoveredPathManager getDiscoveryManager() {
 		if ( fDiscoveryPathManager == null) {
 			fDiscoveryPathManager = new DiscoveredPathManager();
+			fDiscoveryPathManager.startup();
 		}
 		return fDiscoveryPathManager;
 	}
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
index 1f280036fc0..810139ff0a2 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
@@ -39,6 +39,11 @@ import org.eclipse.cdt.make.internal.core.MakeMessages;
 import org.eclipse.cdt.make.internal.core.scannerconfig.util.ScannerConfigUtil;
 import org.eclipse.cdt.make.internal.core.scannerconfig.util.SymbolEntry;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.ISafeRunnable;
@@ -50,7 +55,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
-public class DiscoveredPathManager implements IDiscoveredPathManager {
+public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceChangeListener {
 
 	private static final String CDESCRIPTOR_ID = MakeCorePlugin.getUniqueIdentifier() + ".discoveredScannerInfo"; //$NON-NLS-1$
 	public static final String INCLUDE_PATH = "includePath"; //$NON-NLS-1$
@@ -65,6 +70,35 @@ public class DiscoveredPathManager implements IDiscoveredPathManager {
 	private static final int INFO_CHANGED = 1;
 	private static final int INFO_REMOVED = 2;
 
+	public DiscoveredPathManager() {
+	}
+	
+	public void startup() {
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
+	}
+	
+	public void shutdown() {
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
+	 */
+	public void resourceChanged(IResourceChangeEvent event) {
+		if (event.getSource() instanceof IWorkspace) {
+			IResource resource = event.getResource();
+
+			switch (event.getType()) {
+				case IResourceChangeEvent.PRE_DELETE :
+				case IResourceChangeEvent.PRE_CLOSE :
+					if (resource.getType() == IResource.PROJECT) {
+						fDiscoveredMap.remove(resource);
+					}
+					break;
+			}
+		}
+	}
+
 	public IDiscoveredPathInfo getDiscoveredInfo(IProject project) throws CoreException {
 		DiscoveredPathInfo info = (DiscoveredPathInfo)fDiscoveredMap.get(project);
 		if (info == null) {