From 3683cff5a7b79017e350c08b2599939595be8bb4 Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Fri, 2 Apr 2004 13:51:58 +0000
Subject: [PATCH] fixed problem with .cdtproject not updating

---
 core/org.eclipse.cdt.core/ChangeLog                         | 6 ++++++
 .../src/org/eclipse/cdt/internal/core/CDescriptor.java      | 2 +-
 .../org/eclipse/cdt/internal/core/CExtensionReference.java  | 6 +++++-
 .../src/org/eclipse/cdt/internal/core/COwner.java           | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index a1cd9aa8c9a..b7e94702cef 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-02 David Inglis
+
+	Fixed problem with .cdtproject not getting updated.
+	
+	* src/org/eclipse/cdt/internal/core/CDescriptor.java
+	
 2004-03-30 Alain Magloire
 
 	Reset the non C Resource when the project is closed.
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java
index 4eca580537c..96ad8a15020 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java
@@ -128,12 +128,12 @@ public class CDescriptor implements ICDescriptor {
 		if (!descriptionPath.toFile().exists()) {
 			fOwner = new COwner(manager.getOwnerConfiguration(project));
 			fOwner.configure(project, this);
-			isInitializing = false;
 			fManager.updateDescriptor(this);
 		} else {
 			String ownerId = readCDTProjectFile(descriptionPath);
 			fOwner = new COwner(manager.getOwnerConfiguration(ownerId));
 		}
+		isInitializing = false;
 	}
 
 	protected CDescriptor(CDescriptorManager manager, IProject project, COwner owner) throws CoreException {
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CExtensionReference.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CExtensionReference.java
index 3b3633c7769..92fe7c55368 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CExtensionReference.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CExtensionReference.java
@@ -51,6 +51,10 @@ public class CExtensionReference implements ICExtensionReference {
 		return false;
 	}
 
+	public int hashCode() {
+		return fExtPoint.hashCode() + fId.hashCode();
+	}
+	
 	public void setExtensionData(String key, String value) throws CoreException {
 		getInfo().setAttribute(key, value);
 		if (!fDescriptor.isInitializing) {
@@ -70,4 +74,4 @@ public class CExtensionReference implements ICExtensionReference {
 	public IConfigurationElement[] getExtensionElements() throws CoreException {
 		return fDescriptor.getConfigurationElement(this);
 	}
-}
+}
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java
index f630d793984..c1482a640c3 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java
@@ -58,4 +58,8 @@ public class COwner implements ICOwnerInfo {
 		}
 		return false;
 	}
+
+	public int hashCode() {
+		return getID().hashCode();
+	}
 }
\ No newline at end of file