From 6e458063557134d8dbf7884008d81783bbaa651c Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Thu, 11 Mar 2010 21:11:41 +0000
Subject: [PATCH] Reused import existing as new with existing. Fixed title on
 import.

---
 .../plugin.properties                                |  4 +++-
 build/org.eclipse.cdt.managedbuilder.ui/plugin.xml   | 12 ++++++++++++
 .../ui/wizards/NewMakeProjFromExisting.java          |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 13b1085fb6c..13d9f784048 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -63,9 +63,11 @@ MBS.create.configuration=Create New Configuration
 WizardConvertMakeProject.name=Convert to a C/C++ Project
 WizardConvertMakeProject.description=Convert to a C/C++ Project
 
-WizardMakeProjFromExisting.name=Existing Code
+WizardMakeProjFromExisting.name=Existing Code as Makefile Project
 WizardMakeProjFromExisting.description=Creates a new Makefile project in a directory containing existing code
 
+NewMakeFromExisting.name=Makefile Project with Existing Code
+
 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 278e7255cc0..7a7b3e7547e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -23,6 +23,18 @@
             class="org.eclipse.core.resources.IProject">
          </selection>
       </wizard>
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.cdt.managedbuilder.ui.wizards.NewMakeProjFromExisting"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            icon="icons/obj16/convert-normal.gif"
+            id="org.eclipse.cdt.ui.wizards.NewMakeFromExisting"
+            name="%NewMakeFromExisting.name"
+            project="true">
+         <description>
+            %WizardMakeProjFromExisting.description
+         </description>
+      </wizard>
    </extension>
 
    <extension
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
index 67b81d7a81e..d9f881f5363 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
@@ -37,6 +37,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
@@ -44,7 +45,7 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation;
  * Wizard to create a new CDT project that wraps existing code.
  * @since 7.0
  */
-public class NewMakeProjFromExisting extends Wizard implements IImportWizard {
+public class NewMakeProjFromExisting extends Wizard implements IImportWizard, INewWizard {
 
 	NewMakeProjFromExistingPage page;