From 12e19c87738b2f7045cb16b009476a66b49373e0 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Thu, 12 Apr 2007 14:44:44 +0000
Subject: [PATCH] Bug #160012: New Project Wizard rework

---
 .../plugin.properties                         |   6 --
 .../plugin.xml                                |  42 ---------
 .../ui/properties/messages.properties         |  10 +--
 .../ui/wizards/CDTConfigWizardPage.java       |  13 +--
 .../ui/wizards/MBSWizardHandler.java          |  53 ++++++++++-
 .../icons/elcl16/newmngc_app.gif              | Bin 0 -> 612 bytes
 .../icons/elcl16/newmngcc_app.gif             | Bin 0 -> 630 bytes
 core/org.eclipse.cdt.ui/plugin.properties     |   8 ++
 core/org.eclipse.cdt.ui/plugin.xml            |  56 +++++++++---
 .../cdt/ui/newui/PluginResources.properties   |   6 ++
 .../cdt}/ui/wizards/CCProjectWizard.java      |  15 ++--
 .../ui/wizards/CDTCommonProjectWizard.java    |  84 +++---------------
 .../cdt}/ui/wizards/CDTProjectWizard.java     |  11 +--
 .../cdt}/ui/wizards/CProjectWizard.java       |  15 ++--
 .../cdt/ui/wizards/CWizardHandler.java        |   3 +-
 .../cdt/ui/wizards/ICWizardHandler.java       |   6 ++
 16 files changed, 160 insertions(+), 168 deletions(-)
 create mode 100644 core/org.eclipse.cdt.ui/icons/elcl16/newmngc_app.gif
 create mode 100644 core/org.eclipse.cdt.ui/icons/elcl16/newmngcc_app.gif
 rename {build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder => core/org.eclipse.cdt.ui/src/org/eclipse/cdt}/ui/wizards/CCProjectWizard.java (77%)
 rename build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSProjectWizard.java => core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java (72%)
 rename {build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder => core/org.eclipse.cdt.ui/src/org/eclipse/cdt}/ui/wizards/CDTProjectWizard.java (68%)
 rename {build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder => core/org.eclipse.cdt.ui/src/org/eclipse/cdt}/ui/wizards/CProjectWizard.java (74%)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 6e68c1506c8..d2c0d95ee0c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -64,12 +64,6 @@ WizardConvertMakeProject.name=Convert to a C/C++ Make Project
 WizardConvertMakeProject.name1=Convert to a C/C++ Make Project1
 WizardConvertMakeProject.description=Convert to a C/C++ Project which uses a simple makefile
 
-CDTproject=CDT project
-CDTproject.desc=Create a new language-neutral project
-CPPproject=C++ project
-CPPproject.desc=Create a new C++ project
-Cproject=C project
-Cproject.desc=Create a new C project
 Tool.settings=Tool settings
 Build.steps=Build steps
 Build.artifact=Build artifact
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 222d0bfeaaa..ad5c995b610 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -8,48 +8,6 @@
    <extension
          point="org.eclipse.ui.newWizards">
 <!-- Managed Make Builder Projects -->
-      <wizard
-            canFinishEarly="false"
-            category="org.eclipse.cdt.ui.newCDTWizards"
-            class="org.eclipse.cdt.managedbuilder.ui.wizards.CDTProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
-            hasPages="true"
-            icon="icons/elcl16/newmngcc_app.gif"
-            id="org.eclipse.cdt.managedbuilder.ui.wizards.NewCWizard3"
-            name="%CDTproject"
-            project="true">
-          <description>
-             %CDTproject.desc
-          </description>
-       </wizard>
-      <wizard
-            canFinishEarly="false"
-            category="org.eclipse.cdt.ui.newCCWizards"
-            class="org.eclipse.cdt.managedbuilder.ui.wizards.CCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
-            hasPages="true"
-            icon="icons/elcl16/newmngcc_app.gif"
-            id="org.eclipse.cdt.managedbuilder.ui.wizards.NewCWizard1"
-            name="%CPPproject"
-            project="true">
-          <description>
-             %CPPproject.desc
-          </description>
-       </wizard>
-       <wizard
-             canFinishEarly="false"
-             category="org.eclipse.cdt.ui.newCWizards"
-             class="org.eclipse.cdt.managedbuilder.ui.wizards.CProjectWizard"
-             finalPerspective="org.eclipse.cdt.ui.CPerspective"
-             hasPages="true"
-             icon="icons/elcl16/newmngcc_app.gif"
-             id="org.eclipse.cdt.managedbuilder.ui.wizards.NewCWizard2"
-             name="%Cproject"
-             project="true">
-         <description>
-             %Cproject.desc
-         </description>
-      </wizard>
       <wizard
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.ConvertToMakeWizard"
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
index 3b50d498672..227950966c6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
@@ -76,9 +76,6 @@ PreferredToolchainsTab.2=Make toolhain(s) unpreferred
 StdProjectTypeHandler.0=-- Other Toolchain --
 StdProjectTypeHandler.2=Default
 StdProjectTypeHandler.3=creation Make project: IBuilder is null
-WizardNewProjectCreationPage_nameLabel=
-WizardNewProjectCreationPage_projectNameEmpty=
-WizardNewProjectCreationPage_projectExistsMessage=
 CNewWizard.0=Others
 CWizardHandler.0=Toolchain:
 CWizardHandler.1=Tool chain is a set of tools\n
@@ -87,11 +84,6 @@ CWizardHandler.3=intended to build your project.\n
 CWizardHandler.4=Additional tools, like debugger,\n
 CWizardHandler.5=can be assotiated with tool chain.
 CWizardHandler.6=Cannot create managed project with NULL configuration
-NewModelProjectWizard.0=CDT project
-NewModelProjectWizard.1=Create CDT project of selected type
-NewModelProjectWizard.2=C++ project
-NewModelProjectWizard.3=Create C++ project of selected type
-NewModelProjectWizard.4=C project
-NewModelProjectWizard.5=Create C project of selected type
 StdBuildWizard.0=Makefile project
 MBSWizardHandler.0=At least one toolchain should be selected
+MBSWizardHandler.1=At least one configuration should be selected. Please check needed configurations.
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
index e677b1d2efe..4943625ce66 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
@@ -23,6 +23,7 @@ import org.eclipse.cdt.ui.newui.CDTPrefUtil;
 import org.eclipse.cdt.ui.newui.UIMessages;
 import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
 import org.eclipse.cdt.ui.wizards.ICWizardHandler;
+import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -83,10 +84,10 @@ public class CDTConfigWizardPage extends WizardPage {
 		if (pagesLoaded) return;
 		pagesLoaded = true;
 		
-		if (! (getWizard() instanceof MBSProjectWizard)) return; 
-		MBSProjectWizard wz = (MBSProjectWizard)getWizard();
+		if (! (getWizard() instanceof CDTCommonProjectWizard)) return; 
+		CDTCommonProjectWizard wz = (CDTCommonProjectWizard)getWizard();
 		
-		IWizardPage p = MBSCustomPageManager.getPreviousPage(PAGE_ID);
+		IWizardPage p = getWizard().getStartingPage();  
 		MBSCustomPageManager.init();
 		MBSCustomPageManager.addStockPage(p, CDTMainWizardPage.PAGE_ID);
 		MBSCustomPageManager.addStockPage(this, CDTConfigWizardPage.PAGE_ID);
@@ -315,8 +316,8 @@ public class CDTConfigWizardPage extends WizardPage {
 	 * Edit properties
 	 */
 	private void advancedDialog() {
-		if (getWizard() instanceof MBSProjectWizard) {
-			MBSProjectWizard nmWizard = (MBSProjectWizard)getWizard();
+		if (getWizard() instanceof CDTCommonProjectWizard) {
+			CDTCommonProjectWizard nmWizard = (CDTCommonProjectWizard)getWizard();
 			IProject newProject = nmWizard.getProject(true);
 			if (newProject != null) {
 				boolean oldManage = CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOMNG);
@@ -336,7 +337,7 @@ public class CDTConfigWizardPage extends WizardPage {
 		return MBSCustomPageManager.getNextPage(PAGE_ID);
 	}
 	
-	private void setCustomPagesFilter(MBSProjectWizard wz) {
+	private void setCustomPagesFilter(CDTCommonProjectWizard wz) {
 		String[] natures = wz.getNatures();
 		if (natures == null || natures.length == 0)
 			MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.NATURE, null);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index aa6ebdb15cf..19834507250 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.managedbuilder.ui.wizards;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedMap;
@@ -32,13 +33,13 @@ import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
 import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
 import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
 import org.eclipse.cdt.ui.newui.CDTPrefUtil;
-import org.eclipse.cdt.ui.newui.UIMessages;
 import org.eclipse.cdt.ui.wizards.CWizardHandler;
 import org.eclipse.cdt.ui.wizards.IWizardItemsListListener;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.swt.SWT;
@@ -197,6 +198,9 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 		}
 		if (active != null) active.setActive();
 		coreModel.setProjectDescription(project, des);
+		
+		// process custom pages
+		doCustom();
 	}
 
 	public IWizardPage getSpecificPage() {
@@ -225,6 +229,8 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 	public boolean supportsPreferred() { return true; }
 
 	public boolean isChanged() { 
+		if (savedToolChains == null)
+			return true;
 		IToolChain[] tcs = getSelectedToolChains();
 		if (savedToolChains.length != tcs.length) 
 			return true;
@@ -276,8 +282,51 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 		if (tis == null || tis.length == 0)
 			return Messages.getString("MBSWizardHandler.0"); //$NON-NLS-1$
 		if (fConfigPage != null && fConfigPage.isVisible && !fConfigPage.isCustomPageComplete())
-			return UIMessages.getString("CConfigWizardPage.11"); //$NON-NLS-1$
+			return Messages.getString("MBSWizardHandler.1"); //$NON-NLS-1$
 		return null;
 	}
+	
+	private void doCustom() {
+		IRunnableWithProgress[] operations = MBSCustomPageManager.getOperations();
+		if(operations != null)
+			for(int k = 0; k < operations.length; k++)
+				try {
+					wizard.getContainer().run(false, true, operations[k]);
+				} catch (InvocationTargetException e) {
+					ManagedBuilderUIPlugin.log(e);
+				} catch (InterruptedException e) {
+					ManagedBuilderUIPlugin.log(e);
+				}
+	}
+	
+	public void postProcess(IProject newProject) {
+		deleteExtraConfigs(newProject);
+	}
+	
+	private void deleteExtraConfigs(IProject newProject) {
+		if (isChanged()) return; // no need to delete 
+		if (listener.isCurrent()) return; // nothing to delete
+		ICProjectDescription prjd = CoreModel.getDefault().getProjectDescription(newProject, true);
+		if (prjd == null) return;
+		ICConfigurationDescription[] all = prjd.getConfigurations();
+		if (all == null) return;
+		CfgHolder[] req = getCfgItems(false);
+		boolean modified = false;
+		for (int i=0; i<all.length; i++) {
+			boolean found = false;
+			for (int j=0; j<req.length; j++) {
+				if (all[i].getName().equals(req[j].getName())) {
+					found = true; break;
+				}
+			}
+			if (!found) {
+				modified = true;
+				prjd.removeConfiguration(all[i]);
+			}
+		}
+		if (modified) try {
+			CoreModel.getDefault().setProjectDescription(newProject, prjd);
+		} catch (CoreException e) {}
+	}
 
 }
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/newmngc_app.gif b/core/org.eclipse.cdt.ui/icons/elcl16/newmngc_app.gif
new file mode 100644
index 0000000000000000000000000000000000000000..23b0284f84e58833456759f47018ba0bbb182844
GIT binary patch
literal 612
zcmZ?wbhEHb6krfwc*el+^ueRBrp+5qzu0^3p-b5+xAN6)6{|ff*Z9`1_pMnM*syWe
znfn?^(+a1ozy9!L#^#5)TOZ|bdsMOONy~v}6OO&O@%sCfm!IGN`v2+o|Er(>Kl=9X
z@wb1ke*S;=>;K2!{~v$<_vHJ(mp}i%{q_IZkAJU!{eSoS|NGznKmYmv```Z;KmUFD
z^Z(o5|G)nI|M~C#&SS^_{e9n5?$}#v*HPurT;|wZ?)dl1`Mw&vj!K8WpU-cdsJwNO
z@~-J>vzx7^*4s>Ju=(?R@w`g0WsOqHnxvLCNv-RWU*Bi4zRz@7r}@G*i-m2Lvzx7d
z-)){*BD|^JWOcXMgG=lF|NqZ0n1JF>7Dfh!00te9qd;-Oz<#hHpsBf~wXNN{g@uK+
zhn<6qk=a_mvx%QyfL~BZSVYv)O5e(=sk@hros-+e)YQVl)Fr@Ia@%%ES!ZW^CrAG+
zl8T3qC~7-+J81X@xJs(4^YQZV$XxKz(Qym#lhjhbtf$9wL03-BFTh<=P3^L(xcFNo
z6&3dYk3%w-C7#R3Xu9=yFu8iN2`DUMlxY9Z%*Jc8;KzvtiOmg}JUTfyJ_I=PYZw~k
h$aoel;ngs5nHE#Ye2PcHB<WHEqp_OLj7A0qYXH6u<zoN<

literal 0
HcmV?d00001

diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/newmngcc_app.gif b/core/org.eclipse.cdt.ui/icons/elcl16/newmngcc_app.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b39411daf59ff4a97fdcfa0a6dae3c84fc04956
GIT binary patch
literal 630
zcmZ?wbhEHb6krfwc*el+^ueRBrp+5qzu0^3p-b5+xAN6)6{|ff*Z9`1_pMnM*syWe
znfpKg{MSgD=GU;=zhQORyaR<()?a`4^2eY58Ji#GZhe%$?NP<9CoKn_O*r=A#_R9j
z|NQ^_`~SB;|9}4df92)pH$VTs|MmaV@Bddn|9|!K|LdRs-~Iak@%R6)fBygY`~T(7
z|8IW%fBWnImp}hs{rdmz_y5m-{(t}b|M$QD-~RsJdF=SVzwevM9eZo-I;tF+%N(1_
z9shng-&bSTQR(pa^ZBh4mA6h(-ZfoqcC*#gdYdT?Hh-Qko>wWhtWj!Nlho2CsdZiQ
z>-$XB_n9v1G+)?ev9Qf@cC+>GyUjC8gg5n@tnM~@aB1ED|Nj{V4k-R)VPs$kW6%LP
z0Td?;?3WwDnwnc$+u9vlSXfwl*g3cunH^0#n?yuJMa0A<B&F;fOdTAWx_jB!Ik~;8
zt?lfry~2W(w{2He^YnD}a1Y(0tabQ^ma$u)n^AC>x3Z8RFRzN8s;Xg-p^8sfi1I}f
z6J8x{1sw%#?T|3v`@H&!ANkbO_!RYh!~EVUsjKtzDmY|(cyL5mJKzqZ!1YIrJbe67
z2LzH@PjE0^l&W#K$k=+EPqr;$r=ilZw#kM*c{4UB9%GRUE9mh!*wDz%Z<=}Q%Z0;U
Ue9~4;uQo86Xap>1WMHrc0INa$RR910

literal 0
HcmV?d00001

diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 8a1e4693d87..5171925e589 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -401,3 +401,11 @@ page.c.general=C/C++ General
 Configurations.menu=Build configurations
 Index.menu=Index
 CDTWizard=CDT New Project Wizard
+
+CDTproject=CDT project
+CDTproject.desc=Create a new language-neutral project
+CPPproject=C++ project
+CPPproject.desc=Create a new C++ project
+Cproject=C project
+Cproject.desc=Create a new C project
+
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 15ce3c5328c..86e136b67d5 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -483,6 +483,51 @@
             %NewWizards.folder.description
          </description>
       </wizard>
+      
+            <wizard
+            canFinishEarly="false"
+            category="org.eclipse.cdt.ui.newCDTWizards"
+            class="org.eclipse.cdt.ui.wizards.CDTProjectWizard"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/elcl16/newmngcc_app.gif"
+            id="org.eclipse.cdt.ui.wizards.NewCWizard3"
+            name="%CDTproject"
+            project="true">
+          <description>
+             %CDTproject.desc
+          </description>
+       </wizard>
+      <wizard
+            canFinishEarly="false"
+            category="org.eclipse.cdt.ui.newCCWizards"
+            class="org.eclipse.cdt.ui.wizards.CCProjectWizard"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/elcl16/newmngcc_app.gif"
+            id="org.eclipse.cdt.ui.wizards.NewCWizard1"
+            name="%CPPproject"
+            project="true">
+          <description>
+             %CPPproject.desc
+          </description>
+       </wizard>
+       <wizard
+             canFinishEarly="false"
+             category="org.eclipse.cdt.ui.newCWizards"
+             class="org.eclipse.cdt.ui.wizards.CProjectWizard"
+             finalPerspective="org.eclipse.cdt.ui.CPerspective"
+             hasPages="true"
+             icon="icons/elcl16/newmngcc_app.gif"
+             id="org.eclipse.cdt.ui.wizards.NewCWizard2"
+             name="%Cproject"
+             project="true">
+         <description>
+             %Cproject.desc
+         </description>
+      </wizard>
+      
+      
    </extension>
 <!-- Define the document setup participant for the C/C++ and Assembly Editors -->
    <extension
@@ -1244,11 +1289,6 @@
             contextId="org.eclipse.cdt.ui.cEditorScope"
             commandId="org.eclipse.cdt.ui.edit.text.c.goto.matching.bracket"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-     <key
-            sequence="M1+E"
-            contextId="org.eclipse.cdt.ui.cEditorScope"
-            commandId="org.eclipse.cdt.ui.edit.text.c.toggle.source.header"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -1374,12 +1414,6 @@
             categoryId="org.eclipse.cdt.ui.category.source"
             id="org.eclipse.cdt.ui.edit.text.c.goto.matching.bracket">
       </command>
-      <command
-            name="%ActionDefinition.toggleSourceHeader.name"
-            description="%ActionDefinition.toggleSourceHeader.description"
-            categoryId="org.eclipse.cdt.ui.category.source"
-            id="org.eclipse.cdt.ui.edit.text.c.toggle.source.header">
-      </command>
    </extension>
    <extension
          id="pdomSearchPage"
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
index becad01d361..758840196f8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
@@ -536,3 +536,9 @@ StdProjectTypeHandler.2=Default
 StdProjectTypeHandler.3=creation Make project: IBuilder is null
 
 CDTConfigWizardPage.0=Select configurations
+NewModelProjectWizard.0=CDT project
+NewModelProjectWizard.1=Create CDT project of selected type
+NewModelProjectWizard.2=C++ project
+NewModelProjectWizard.3=Create C++ project of selected type
+NewModelProjectWizard.4=C project
+NewModelProjectWizard.5=Create C project of selected type
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java
similarity index 77%
rename from build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java
index d15ef6f28a1..004d979ed02 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java
@@ -8,22 +8,23 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.managedbuilder.ui.wizards;
+package org.eclipse.cdt.ui.wizards;
 
-import org.eclipse.cdt.core.CCProjectNature;
-import org.eclipse.cdt.core.CProjectNature;
-import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-public class CCProjectWizard extends MBSProjectWizard {
+import org.eclipse.cdt.core.CCProjectNature;
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.ui.newui.UIMessages;
+
+public class CCProjectWizard extends CDTCommonProjectWizard {
 
 	public CCProjectWizard() {
-		super(Messages.getString("NewModelProjectWizard.2"), Messages.getString("NewModelProjectWizard.3")); //$NON-NLS-1$ //$NON-NLS-2$
+		super(UIMessages.getString("NewModelProjectWizard.2"), UIMessages.getString("NewModelProjectWizard.3")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
-	protected String[] getNatures() {
+	public String[] getNatures() {
 		return new String[] { CProjectNature.C_NATURE_ID, CCProjectNature.CC_NATURE_ID };
 	}
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
similarity index 72%
rename from build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSProjectWizard.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
index 972612b71cb..20ee4ec688c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
@@ -9,23 +9,13 @@
  * IBM Rational Software - Initial API and implementation
  * Intel corp - rework for New Project Model
  *******************************************************************************/
-package org.eclipse.cdt.managedbuilder.ui.wizards;
+package org.eclipse.cdt.ui.wizards;
 
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
-import org.eclipse.cdt.core.settings.model.ICProjectDescription;
-import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
-import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
-import org.eclipse.cdt.ui.wizards.ICWizardHandler;
-import org.eclipse.cdt.ui.wizards.IWizardWithMemory;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
@@ -45,7 +35,11 @@ import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
-public abstract class MBSProjectWizard extends BasicNewResourceWizard 
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.newui.UIMessages;
+
+public abstract class CDTCommonProjectWizard extends BasicNewResourceWizard 
 implements IExecutableExtension, IWizardWithMemory  
 {
 	private static final String PREFIX= "CProjectWizard"; //$NON-NLS-1$
@@ -62,15 +56,14 @@ implements IExecutableExtension, IWizardWithMemory
 	
 	public String lastProjectName = null;
 	private ICWizardHandler savedHandler = null;
-	private boolean savedDefaults = false;
 
 	protected List localPages = new ArrayList(); // replacing Wizard.pages since we have to delete them
 	
-	public MBSProjectWizard() {
-		this(Messages.getString("NewModelProjectWizard.0"),Messages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$
+	public CDTCommonProjectWizard() {
+		this(UIMessages.getString("NewModelProjectWizard.0"),UIMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-	public MBSProjectWizard(String title, String desc) {
+	public CDTCommonProjectWizard(String title, String desc) {
 		super();
 		setDialogSettings(CUIPlugin.getDefault().getDialogSettings());
 		setNeedsProgressMonitor(true);
@@ -83,11 +76,8 @@ implements IExecutableExtension, IWizardWithMemory
 		fMainPage.setTitle(wz_title);
 		fMainPage.setDescription(wz_desc);
 		addPage(fMainPage);
-		MBSCustomPageManager.init();
-		MBSCustomPageManager.addStockPage(fMainPage, CDTMainWizardPage.PAGE_ID);
 	}
 
-
 	/**
 	 * @return true if user has changed settings since project creation
 	 */
@@ -101,7 +91,6 @@ implements IExecutableExtension, IWizardWithMemory
 		if (newProject != null && isChanged()) 
 			clearProject(); 
 		if (newProject == null)	{
-			savedDefaults = defaults;
 			savedHandler = fMainPage.h_selected;
 			savedHandler.saveState();
 			lastProjectName = fMainPage.getProjectName();
@@ -139,18 +128,9 @@ implements IExecutableExtension, IWizardWithMemory
 	}
 
 	public boolean performFinish() {
-		// needs delete only if project was 
-		// created before and still valid
-		boolean needsDelete = (newProject != null && savedDefaults && !isChanged());
 		// create project if it is not created yet
 		if (getProject(fMainPage.isCurrent()) == null) return false;
-		// process custom pages
-		doCustom();
-		// project is created with all possible configs
-		// to let user modify all of them. Resulting
-		// project should contain only selected cfgs.
-		if (needsDelete) deleteExtraConfigs();
-		
+		fMainPage.h_selected.postProcess(newProject);
 		BasicNewProjectResourceWizard.updatePerspective(fConfigElement);
 		selectAndReveal(newProject);
 		return true;
@@ -161,46 +141,6 @@ implements IExecutableExtension, IWizardWithMemory
         return true;
     }
 
-	private void deleteExtraConfigs() {
-		if (fMainPage.isCurrent()) return; // nothing to delete
-		if (!(fMainPage.h_selected instanceof MBSWizardHandler))
-			return;
-		ICProjectDescription prjd = CoreModel.getDefault().getProjectDescription(newProject, true);
-		if (prjd == null) return;
-		ICConfigurationDescription[] all = prjd.getConfigurations();
-		if (all == null) return;
-		CfgHolder[] req = ((MBSWizardHandler)fMainPage.h_selected).getCfgItems(false);
-		boolean modified = false;
-		for (int i=0; i<all.length; i++) {
-			boolean found = false;
-			for (int j=0; j<req.length; j++) {
-				if (all[i].getName().equals(req[j].getName())) {
-					found = true; break;
-				}
-			}
-			if (!found) {
-				modified = true;
-				prjd.removeConfiguration(all[i]);
-			}
-		}
-		if (modified) try {
-			CoreModel.getDefault().setProjectDescription(newProject, prjd);
-		} catch (CoreException e) {}
-	}
-
-	private void doCustom() {
-		IRunnableWithProgress[] operations = MBSCustomPageManager.getOperations();
-		if(operations != null)
-			for(int k = 0; k < operations.length; k++)
-				try {
-					getContainer().run(false, true, operations[k]);
-				} catch (InvocationTargetException e) {
-					ManagedBuilderUIPlugin.log(e);
-				} catch (InterruptedException e) {
-					ManagedBuilderUIPlugin.log(e);
-				}
-	}
-	
 	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
 		fConfigElement= config;
 	}
@@ -215,7 +155,7 @@ implements IExecutableExtension, IWizardWithMemory
 							newProject = createIProject(lastProjectName, fMainPage.getProjectLocation());
 							if (newProject != null) 
 								fMainPage.h_selected.createProject(newProject, defaults);
-						} catch (CoreException e) {	ManagedBuilderUIPlugin.log(e); }
+						} catch (CoreException e) {	CUIPlugin.getDefault().log(e); }
 					}
 				});
 			}
@@ -259,7 +199,7 @@ implements IExecutableExtension, IWizardWithMemory
 	}
 	
 	protected abstract IProject continueCreation(IProject prj); 
-	protected abstract String[] getNatures();
+	public abstract String[] getNatures();
 	
 	public void dispose() {
 		fMainPage.dispose();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java
similarity index 68%
rename from build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java
index 15f2d928403..d46b0bd87d8 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java
@@ -8,18 +8,19 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.managedbuilder.ui.wizards;
+package org.eclipse.cdt.ui.wizards;
 
-import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
 import org.eclipse.core.resources.IProject;
 
-public class CDTProjectWizard extends MBSProjectWizard {
+import org.eclipse.cdt.ui.newui.UIMessages;
+
+public class CDTProjectWizard extends CDTCommonProjectWizard {
 
 	public CDTProjectWizard() {
-		super(Messages.getString("NewModelProjectWizard.0"), Messages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$
+		super(UIMessages.getString("NewModelProjectWizard.0"), UIMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
-	protected String[] getNatures() {
+	public String[] getNatures() {
 		return new String[0];
 	}
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java
similarity index 74%
rename from build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java
index d5f0ec2daab..d2f116fb738 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java
@@ -8,22 +8,23 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.managedbuilder.ui.wizards;
+package org.eclipse.cdt.ui.wizards;
 
-import org.eclipse.cdt.core.CProjectNature;
-import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-public class CProjectWizard extends MBSProjectWizard {
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.ui.newui.UIMessages;
+
+public class CProjectWizard extends CDTCommonProjectWizard {
 
 	public CProjectWizard() {
-		super(Messages.getString("NewModelProjectWizard.4"),  //$NON-NLS-1$
-			  Messages.getString("NewModelProjectWizard.5")); //$NON-NLS-1$
+		super(UIMessages.getString("NewModelProjectWizard.4"),  //$NON-NLS-1$
+			  UIMessages.getString("NewModelProjectWizard.5")); //$NON-NLS-1$
 	}
 
-	protected String[] getNatures() {
+	public String[] getNatures() {
 		return new String[] { CProjectNature.C_NATURE_ID };
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
index 8f0520dbcb3..19055f5f756 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
@@ -67,7 +67,7 @@ public class CWizardHandler implements ICWizardHandler {
 		if (table == null) {
 			table = new Table(parent, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 			TableItem ti = new TableItem(table, SWT.NONE);
-			ti.setText("Single item"); //$NON-NLS-1$
+			ti.setText("---"); //$NON-NLS-1$
 			ti.setImage(IMG0);
 			table.select(0);
 		}
@@ -97,5 +97,6 @@ public class CWizardHandler implements ICWizardHandler {
 			throws CoreException {}
 	public boolean isChanged() { return true; } 
 	public void saveState() {}
+	public void postProcess(IProject proj) {}
 
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICWizardHandler.java
index fe2021aca33..bc86bdb275e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICWizardHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICWizardHandler.java
@@ -54,6 +54,12 @@ public interface ICWizardHandler {
 	 * @throws CoreException
 	 */
 	public void createProject(IProject proj, boolean defaults) throws CoreException;
+	/**
+	 * Called when Finish button pressed, 
+	 * even if project was created before.
+	 * @param proj
+	 */
+	public void postProcess(IProject proj);
 	/**
 	 * @return true if only supported project types and toolchains are displayed
 	 */