From df2d472f949baa6e18959d84d25edbcdb67e9a26 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Fri, 19 Mar 2004 03:11:03 +0000
Subject: [PATCH] Corret typos.

---
 core/org.eclipse.cdt.core/ChangeLog                       | 8 ++++++++
 .../model/org/eclipse/cdt/core/model/CoreModel.java       | 2 +-
 .../org/eclipse/cdt/internal/core/model/CProject.java     | 6 +++---
 .../cdt/internal/core/model/SetPathEntriesOperation.java  | 5 +----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 3cae3113011..3b8a4a26eab 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-19 Alain Magloire
+
+	Correct typos.
+
+	* model/org/eclipse/cdt/core/model/CoreModel.java
+	* model/org/eclipse/cdt/internal/core/model/CProject.java
+	* model/org/eclipse/cdt/internal/core/model/etPathEntriesOperation.java
+
 2004-03-18 Alain Magloire
 
 	Check for IPathEntry reorder changes.
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
index 4f286e71871..e11e4f2ff9d 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
@@ -629,7 +629,7 @@ public class CoreModel implements ICDescriptorListener {
 	 * @exception CModelException
 	 * @see IPathEntry
 	 */
-	public IPathEntry[] getResolvedClasspathEntries(ICProject cproject) throws CModelException {
+	public IPathEntry[] getResolvedPathEntries(ICProject cproject) throws CModelException {
 		return pathEntryManager.getResolvedPathEntries(cproject);
 	}
 
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java
index 2ede4a63b99..15078ec737f 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java
@@ -312,7 +312,7 @@ public class CProject extends CContainer implements ICProject {
 	 * @see org.eclipse.cdt.core.model.ICProject#getResolvedCPathEntries()
 	 */
 	public IPathEntry[] getResolvedPathEntries() throws CModelException {
-		return CoreModel.getDefault().getResolvedClasspathEntries(this);
+		return CoreModel.getDefault().getResolvedPathEntries(this);
 	}
 
 	/* (non-Javadoc)
@@ -453,7 +453,7 @@ public class CProject extends CContainer implements ICProject {
 	/*
 	 * @see ICProject
 	 */
-	public boolean isOnClasspath(ICElement element) {
+	public boolean isOnSourceRoot(ICElement element) {
 		try {
 			ISourceRoot[] roots = getSourceRoots();
 			for (int i = 0; i < roots.length; i++) {
@@ -470,7 +470,7 @@ public class CProject extends CContainer implements ICProject {
 	/*
 	 * @see ICProject
 	 */
-	public boolean isOnClasspath(IResource resource) {
+	public boolean isOnSourceRoot(IResource resource) {
 		try {
 			ISourceRoot[] roots = getSourceRoots();
 			for (int i = 0; i < roots.length; i++) {
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java
index 8dd557a99ca..dd9f9439502 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java
@@ -54,15 +54,12 @@ public class SetPathEntriesOperation extends CModelOperation {
 		updateProjectReferencesIfNecessary();
 		PathEntryManager mgr = PathEntryManager.getDefault();		
 		hasModifiedResource = true;
+		mgr.saveRawPathEntries(cproject, newRawEntries);
 		IPathEntry[] newResolvedEntries = mgr.getResolvedPathEntries(cproject);
 		ICElementDelta[] deltas = mgr.generatePathEntryDeltas(cproject, oldResolvedEntries, newResolvedEntries);
 		for (int i = 0; i < deltas.length; i++) {
 			addDelta(deltas[i]);
 		}
-		// Only save when necessary
-		if (deltas.length > 0) {
-			mgr.saveRawPathEntries(cproject, newRawEntries);
-		}
 		done();
 	}