From a68086ca960a0f29eff565211a72abaa662f321a Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Tue, 27 Nov 2007 16:08:32 +0000
Subject: [PATCH] Bug #210836 : NPEs in Project-Properties of Makefle Project
 (not managed)

---
 build/org.eclipse.cdt.managedbuilder.core/plugin.xml          | 2 +-
 .../org/eclipse/cdt/managedbuilder/internal/core/Builder.java | 4 ++++
 .../internal/tcmodification/ConfigurationModification.java    | 3 ++-
 .../cdt/managedbuilder/ui/properties/ToolChainEditTab.java    | 3 +--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index 54c9c3c88f4..fa013abb439 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -347,7 +347,7 @@
       	/-->
       </tool>
 	  <builder
-	  	  isAbstract="true"
+	  	  isAbstract="false"
 	      id="org.eclipse.cdt.build.core.settings.default.builder"
           command="make"
           arguments=""
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
index 997f3f7ae2c..459a644e5cf 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
@@ -2708,4 +2708,8 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider,
 	public boolean isExtensionBuildObject() {
 		return isExtensionElement();
 	}
+	public String toString() {
+		return getUniqueRealName();
+	}
+
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
index 0db584d09c9..798c2a89b6b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
@@ -169,7 +169,8 @@ public class ConfigurationModification extends FolderInfoModification implements
 	}
 
 	public boolean isBuilderCompatible() {
-		return getCurrentBuilderCompatibilityInfo().isCompatible();
+		BuilderCompatibilityInfoElement be = getCurrentBuilderCompatibilityInfo(); 
+		return be == null ? false : be.isCompatible();
 	}
 
 	public void setBuilder(IBuilder builder) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index 2c0c90c93b4..53015a51168 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -37,7 +37,6 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManag
 import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
 import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.resources.IFileModificationValidator;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.swt.SWT;
@@ -272,7 +271,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 			}
 		}
 		for (int i=0; i<bs.length; i++) {
-			if (bs[i].isSystemObject()) 
+			if (bs[i].isSystemObject() && ! b.equals(bs[i])) 
 				continue;
 			list.add(bs[i]);
 		}