[cdt-patch] Applied: CDT_1_1: PR 37064 Model updated

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/ChangeLog,v
retrieving revision 1.89.2.2
diff -u -r1.89.2.2 ChangeLog
--- ChangeLog	29 Apr 2003 19:42:36 -0000	1.89.2.2
+++ ChangeLog	29 Apr 2003 19:56:33 -0000
@@ -1,5 +1,18 @@
 2003-04-29 Alain Magloire
 
+	PR 37064
+
+	* model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java (elementChanged):
+	Call close() for Openable to remove the elements in the cache.
+	(close): new method to close the openable.
+	(contentChanged): Removed.
+
+	* utils/org/eclipse/cdt/utils/spawner/Spawner.java (raise):
+	Change the visibility of the native method to public.
+	Change the visibility of the flags to public.
+
+2003-04-29 Alain Magloire
+
 	PR 36920
 	PR 36919
 
Index: model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java,v
retrieving revision 1.8
diff -u -r1.8 DeltaProcessor.java
--- model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java	12 Apr 2003 14:03:54 -0000	1.8
+++ model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java	29 Apr 2003 19:56:33 -0000
@@ -45,17 +45,6 @@
 	ICElement movedFromElement = null;
 
 	/**
-	 * Generic processing for elements with changed contents:<ul>
-	 * <li>The element is closed such that any subsequent accesses will re-open
-	 * the element reflecting its new structure.
-	 * <li>An entry is made in the delta reporting a content change (K_CHANGE with F_CONTENT flag set).
-	 * </ul>
-	 */
-	protected void contentChanged(ICElement element, IResourceDelta delta) {
-		fCurrentDelta.changed(element, ICElementDelta.F_CONTENT);
-	}
-
-	/**
 	 * Creates the create corresponding to this resource.
 	 * Returns null if none was found.
 	 */
@@ -206,8 +195,29 @@
 		}
 	}
 
+	/*
+	 * Closes the given element, which removes it from the cache of open elements.
+	 */
+	private void close(Openable element) {
+		try {
+			element.close();
+		} catch (CModelException e) {
+			// do nothing
+		}
+	}
+
+	/**
+	 * Generic processing for elements with changed contents:<ul>
+	 * <li>The element is closed such that any subsequent accesses will re-open
+	 * the element reflecting its new structure.
+	 * <li>An entry is made in the delta reporting a content change (K_CHANGE with F_CONTENT flag set).
+	 * </ul>
+	 */
 	protected void elementChanged(ICElement element, IResourceDelta delta) {
-			fCurrentDelta.changed(element, ICElementDelta.F_CONTENT);
+		if (element instanceof Openable) {
+			close((Openable)element);
+		}
+		fCurrentDelta.changed(element, ICElementDelta.F_CONTENT);
 	}
 
 	/**
@@ -403,7 +413,7 @@
 				if ((flags & IResourceDelta.CONTENT) != 0) {
 					// content has changed
 					if (element != null) {
-						contentChanged(element, delta);
+						elementChanged(element, delta);
 						updateIndexAddResource(element, delta);
 					}
 				} else if (resource.getType() == IResource.PROJECT) {
Index: utils/org/eclipse/cdt/utils/spawner/Spawner.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/Spawner.java,v
retrieving revision 1.5
diff -u -r1.5 Spawner.java
--- utils/org/eclipse/cdt/utils/spawner/Spawner.java	17 Oct 2002 13:59:44 -0000	1.5
+++ utils/org/eclipse/cdt/utils/spawner/Spawner.java	29 Apr 2003 19:56:34 -0000
@@ -13,11 +13,11 @@
 
 public class Spawner extends Process {
 
-	private int NOOP = 0;
-	private int HUP = 1;
-	private int INT = 2;
-	private int KILL = 9;
-	private int TERM = 15;
+	public int NOOP = 0;
+	public int HUP = 1;
+	public int INT = 2;
+	public int KILL = 9;
+	public int TERM = 15;
 
 	int pid = 0;
 	int status;
@@ -235,7 +235,7 @@
 
 	native int exec0( String[] cmdarray, String[] envp, String dir, int[] chan) throws IOException;
 	native int exec1( String[] cmdarray, String[] envp, String dir) throws IOException;
-	native int raise(int pid, int sig);
+	public native int raise(int pid, int sig);
 	native int waitFor(int pid);
 
 	static {