[cdt-patch] Comment out reference to the old builder.

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/ChangeLog,v
retrieving revision 1.62
diff -u -r1.62 ChangeLog
--- ChangeLog	5 Feb 2003 20:29:01 -0000	1.62
+++ ChangeLog	14 Feb 2003 01:13:04 -0000
@@ -1,3 +1,12 @@
+2003-02-13 Alain Magloire
+
+	* src/org/eclipse/cdt/core/CCorePlugin.java:
+	* src/org/eclipse/cdt/internal/core/make/Makebuilder.java:
+	Comment out reference to the Builder, for now.
+
+	* builder/org/eclipse/cdt/core/builder/CIncrementalBuilder.java:
+	Comment reference to the CCorePlugin.
+
 2003-02-05 Doug Schaefer
 
     * src/org/eclipse/cdt/internal/parser.generated:
Index: builder/org/eclipse/cdt/core/builder/CIncrementalBuilder.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/builder/org/eclipse/cdt/core/builder/CIncrementalBuilder.java,v
retrieving revision 1.2
diff -u -r1.2 CIncrementalBuilder.java
--- builder/org/eclipse/cdt/core/builder/CIncrementalBuilder.java	6 Sep 2002 20:16:04 -0000	1.2
+++ builder/org/eclipse/cdt/core/builder/CIncrementalBuilder.java	14 Feb 2003 01:13:04 -0000
@@ -73,6 +73,6 @@
 
 	//FIXME: Not implemented
 	private ICBuilder[] getCBuilder () throws CoreException {
-		return CCorePlugin.getDefault().getBuilders(getProject());
+		return new ICBuilder[0];
 	}
 }
Index: src/org/eclipse/cdt/core/CCorePlugin.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java,v
retrieving revision 1.9
diff -u -r1.9 CCorePlugin.java
--- src/org/eclipse/cdt/core/CCorePlugin.java	27 Nov 2002 04:46:52 -0000	1.9
+++ src/org/eclipse/cdt/core/CCorePlugin.java	14 Feb 2003 01:13:07 -0000
@@ -10,7 +10,6 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.eclipse.cdt.core.builder.ICBuilder;
 import org.eclipse.cdt.core.index.IndexModel;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.resources.IConsole;
@@ -370,13 +369,14 @@
     throws CoreException{
     	this.convertProjectToCC(projectHandle, monitor, projectID, true);
     }
-    
-	public ICBuilder[] getBuilders(IProject project) throws CoreException {
-		ICExtension extensions[] = fDescriptorManager.createExtensions(BUILDER_MODEL_ID, project);
-		ICBuilder builders[] = new ICBuilder[extensions.length];
-		System.arraycopy(extensions, 0, builders, 0, extensions.length);
-		return builders;
-	}
+ 
+// Extract the builder from the .cdtproject.  
+//	public ICBuilder[] getBuilders(IProject project) throws CoreException {
+//		ICExtension extensions[] = fDescriptorManager.createExtensions(BUILDER_MODEL_ID, project);
+//		ICBuilder builders[] = new ICBuilder[extensions.length];
+//		System.arraycopy(extensions, 0, builders, 0, extensions.length);
+//		return builders;
+//	}
 	
 	public IProcessList getProcessList() {
 		IExtensionPoint extension = getDescriptor().getExtensionPoint("ProcessList");
Index: src/org/eclipse/cdt/internal/core/make/MakeBuilder.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeBuilder.java,v
retrieving revision 1.3
diff -u -r1.3 MakeBuilder.java
--- src/org/eclipse/cdt/internal/core/make/MakeBuilder.java	4 Oct 2002 18:11:18 -0000	1.3
+++ src/org/eclipse/cdt/internal/core/make/MakeBuilder.java	14 Feb 2003 01:13:07 -0000
@@ -6,14 +6,9 @@
 
 import org.eclipse.cdt.core.AbstractCExtension;
 import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.ICExtensionReference;
-import org.eclipse.cdt.core.builder.CIncrementalBuilder;
-import org.eclipse.cdt.core.builder.ICBuilder;
-import org.eclipse.cdt.core.builder.IOptimization;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 
-public class MakeBuilder extends AbstractCExtension implements ICBuilder {
+public class MakeBuilder extends AbstractCExtension /*implements ICBuilder */ {
 
 	public IPath[] getIncludePaths() {
 		return new IPath[0];
@@ -36,21 +31,22 @@
 	public void setLibraries(String[] libs) {
 	}
 
-	public IOptimization getOptimization() {
-		return null;
-	}
-
-	public IProject[] build(CIncrementalBuilder cbuilder) {
-		ICExtensionReference ref = getExtensionReference();
-		System.out.println("MakeBuilder!!!!\n Command is:" + ref.getExtensionData("command"));
-		return null;
-	}
+//	public IOptimization getOptimization() {
+//		return null;
+//	}
+//
+//	public IProject[] build(CIncrementalBuilder cbuilder) {
+//		ICExtensionReference ref = getExtensionReference();
+//		System.out.println("MakeBuilder!!!!\n Command is:" + ref.getExtensionData("command"));
+//		return null;
+//	}
+//
+//	public void setOptimization(IOptimization o) {
+//	}
 
 	public String getID() {
 		return CCorePlugin.PLUGIN_ID + ".makeBuilder";
 	}
 
-	public void setOptimization(IOptimization o) {
-	}
 
 }