From 1ddccb2b110f200e12742e5ff639b95b6faac9e8 Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Mon, 7 May 2007 12:36:44 +0000
Subject: [PATCH] Fix to not display the "converToId" project types in the NPW

---
 .../src/org/eclipse/cdt/managedbuilder/core/IProjectType.java | 2 ++
 .../cdt/managedbuilder/internal/core/Configuration.java       | 2 +-
 .../eclipse/cdt/managedbuilder/internal/core/ProjectType.java | 4 ++++
 .../cdt/managedbuilder/ui/tests/util/TestProjectType.java     | 4 ++++
 .../cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java     | 2 +-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IProjectType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IProjectType.java
index 441d8d718d2..7e388733181 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IProjectType.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IProjectType.java
@@ -195,4 +195,6 @@ public interface IProjectType extends IBuildObject, IBuildObjectPropertiesContai
 	public String getNameAttribute();
 	
 	public IBuildPropertyValue getBuildArtefactType();
+	
+	boolean isSystemObject();
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index 5faa5505860..d8b88e54ebb 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -2490,7 +2490,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 			return true;
 		
 		if(getProjectType() != null)
-			return getProjectType().isTestProjectType();
+			return getProjectType().isSystemObject();
 		
 		return false;
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java
index f6c669c271f..768b0cd0914 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java
@@ -782,4 +782,8 @@ public class ProjectType extends BuildObject implements IProjectType, IBuildProp
 		}
 		return null;
 	}
+
+	public boolean isSystemObject() {
+		return isTestProjectType() || getConvertToId().length() != 0;
+	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestProjectType.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestProjectType.java
index 01d853689aa..965eef7cc25 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestProjectType.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestProjectType.java
@@ -46,4 +46,8 @@ public class TestProjectType implements IProjectType {
 	public IBuildPropertyValue getBuildArtefactType() {
 		return null;
 	}
+
+	public boolean isSystemObject() {
+		return isTestProjectType();
+	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
index a930b8ccc8f..b151c8b804e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
@@ -67,7 +67,7 @@ public class ManagedBuildWizard extends AbstractCWizard {
 		while(it.hasNext()) {
 			String s = (String)it.next();
 			IProjectType pt = (IProjectType)sm.get(s);
-			if (pt.isAbstract() || pt.isTestProjectType()) continue;
+			if (pt.isAbstract() || pt.isSystemObject()) continue;
 			if (supportedOnly && !pt.isSupported()) continue; // not supported
 			String nattr = pt.getNameAttribute(); 
 			if (nattr == null || nattr.length() == 0) continue; // new proj style