* Example useage: *
- * mainPage = new ConvertCtoCCProjectWizardPage("CtoCCConvertProjectPage");
+ * mainPage = new ConvertCtoCCStdMakeProjectWizardPage("CtoCCConvertProjectPage");
* mainPage.setTitle("Project Conversion");
* mainPage.setDescription("Convert a project's nature from C to C++.");
*
*
*/
-public class ConvertCtoCCProjectWizardPage extends ConvertProjectWizardPage {
+public class ConvertCtoCCStdMakeProjectWizardPage extends ConvertProjectWizardPage {
private static final String WZ_TITLE = "CtoCCConversionWizard.title"; //$NON-NLS-1$
private static final String WZ_DESC = "CtoCCConversionWizard.description"; //$NON-NLS-1$
/**
- * Constructor for ConvertCtoCCProjectWizardPage.
+ * Constructor for ConvertCtoCCStdMakeProjectWizardPage.
* @param pageName
*/
- public ConvertCtoCCProjectWizardPage(String pageName) {
+ public ConvertCtoCCStdMakeProjectWizardPage(String pageName) {
super(pageName);
}
@@ -90,7 +89,7 @@ public class ConvertCtoCCProjectWizardPage extends ConvertProjectWizardPage {
*/
public void convertProject(IProject project, IProgressMonitor monitor, String projectID)
throws CoreException {
- CoreUtility.addNatureToProject(project, CoreModel.CC_NATURE_ID, monitor);
- CCorePlugin.getDefault().mapCProjectOwner(project, projectID);
+
+ CCorePlugin.getDefault().convertProjectFromCtoCC(project, monitor, projectID);
}
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
index 9f10930748e..1192cc8f803 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
@@ -60,8 +60,8 @@ import org.eclipse.ui.PlatformUI;
public abstract class ConvertProjectWizardPage
extends WizardPage {
- public static final String KEY_TITLE = "ProjectConvertionWizard.title";
- public static final String KEY_CONVERTING = "ProjectConvertionWizard.converting";
+ public static final String KEY_TITLE = "ConvertionWizard.title";
+ public static final String KEY_CONVERTING = "ConvertionWizard.converting";
private static final String PROJECT_LIST = "ConversionWizard.projectlist";
// The Main widget containing the table and its list of condidate open projects
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertUKtoCCProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java
similarity index 67%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertUKtoCCProjectWizardPage.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java
index 3ea05f46f98..64cf97b7281 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertUKtoCCProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java
@@ -8,14 +8,13 @@ package org.eclipse.cdt.ui.wizards.conversion;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.util.CoreUtility;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
/**
*
- * ConvertUKtoCCProjectWizardPage
+ * ConvertSimpleToCCStdMakeProjectWizardPage
* Standard main page for a wizard that adds a C++ project Nature to a project with no nature associated with it.
* This conversion is one way in that the project cannot be converted back (i.e have the nature removed).
*
@@ -24,22 +23,22 @@ import org.eclipse.core.runtime.IProgressMonitor;
** Example useage: *
- * mainPage = new ConvertUKtoCCProjectWizardPage("UKtoCCConvertProjectPage");
+ * mainPage = new ConvertSimpleToCCStdMakeProjectWizardPage("UKtoCCConvertProjectPage");
* mainPage.setTitle("Project Conversion");
* mainPage.setDescription("Add C++ a Nature to a project.");
*
*
*/
-public class ConvertUKtoCCProjectWizardPage extends ConvertProjectWizardPage {
+public class ConvertSimpleToCCStdMakeProjectWizardPage extends ConvertSimpleToCStdMakeProjectWizardPage {
- private static final String WZ_TITLE = "UKtoCCConversionWizard.title"; //$NON-NLS-1$
- private static final String WZ_DESC = "UKtoCCConversionWizard.description"; //$NON-NLS-1$
+ private static final String WZ_TITLE = "SimpleToCCStdMakeConversionWizard.title"; //$NON-NLS-1$
+ private static final String WZ_DESC = "SimpleToCCStdMakeConversionWizard.description"; //$NON-NLS-1$
/**
- * Constructor for ConvertUKtoCCProjectWizardPage.
+ * Constructor for ConvertSimpleToCCStdMakeProjectWizardPage.
* @param pageName
*/
- public ConvertUKtoCCProjectWizardPage(String pageName) {
+ public ConvertSimpleToCCStdMakeProjectWizardPage(String pageName) {
super(pageName);
}
@@ -67,20 +66,16 @@ public class ConvertUKtoCCProjectWizardPage extends ConvertProjectWizardPage {
* @return boolean
*/
protected boolean isCandidate(IProject project) {
- boolean noCNature = false;
+ boolean noCNature = super.isCandidate(project);
boolean noCCNature = false;
// hasNature() throws a CoreException if the
// project is not open and/or is not visible to this view
// which is what happens when a project does not have a
// C nature
- try {
- project.hasNature(CoreModel.C_NATURE_ID);
- } catch (CoreException e) {
- noCNature = true;
- }
+
try {
- project.hasNature(CoreModel.CC_NATURE_ID);
+ noCCNature = !project.hasNature(CoreModel.CC_NATURE_ID);
} catch (CoreException e) {
noCCNature = true;
}
@@ -88,8 +83,8 @@ public class ConvertUKtoCCProjectWizardPage extends ConvertProjectWizardPage {
}
/**
- * Method convertProject adds a C++ Nature to those projects
- * that were selected by the user.
+ * Method convertProject adds a C++ Nature and default make builder
+ * to those projects that were selected by the user.
*
* @param project
* @param monitor
@@ -100,9 +95,7 @@ public class ConvertUKtoCCProjectWizardPage extends ConvertProjectWizardPage {
throws CoreException {
if (!project.isOpen()){
project.open(monitor);
- }
- CoreUtility.addNatureToProject(project, CoreModel.C_NATURE_ID, monitor);
- CoreUtility.addNatureToProject(project, CoreModel.CC_NATURE_ID, monitor);
- CCorePlugin.getDefault().mapCProjectOwner(project, projectID);
+ }
+ CCorePlugin.getDefault().convertProjectToCC(project, monitor, projectID);
}
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertUKtoCProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java
similarity index 69%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertUKtoCProjectWizardPage.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java
index 50193d6034a..21765938f7f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertUKtoCProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java
@@ -8,14 +8,13 @@ package org.eclipse.cdt.ui.wizards.conversion;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.util.CoreUtility;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
/**
*
- * ConvertUKtoCProjectWizardPage
+ * ConvertSimpleToCStdMakeProjectWizardPage
* Standard main page for a wizard that adds a C project Nature to a project with no nature associated with it.
* This conversion is one way in that the project cannot be converted back (i.e have the nature removed).
*
@@ -24,22 +23,22 @@ import org.eclipse.core.runtime.IProgressMonitor;
** Example useage: *
- * mainPage = new ConvertUKtoCProjectWizardPage("UKtoCConvertProjectPage");
+ * mainPage = new ConvertSimpleToCStdMakeProjectWizardPage("UKtoCConvertProjectPage");
* mainPage.setTitle("Project Conversion");
* mainPage.setDescription("Add C a Nature to a project.");
*
*
*/
-public class ConvertUKtoCProjectWizardPage extends ConvertProjectWizardPage {
+public class ConvertSimpleToCStdMakeProjectWizardPage extends ConvertProjectWizardPage {
- private static final String WZ_TITLE = "UKtoCConversionWizard.title"; //$NON-NLS-1$
- private static final String WZ_DESC = "UKtoCConversionWizard.description"; //$NON-NLS-1$
+ private static final String WZ_TITLE = "SimpleToCStdMakeConversionWizard.title"; //$NON-NLS-1$
+ private static final String WZ_DESC = "SimpleToCStdMakeConversionWizard.description"; //$NON-NLS-1$
/**
- * Constructor for ConvertUKtoCProjectWizardPage.
+ * Constructor for ConvertSimpleToCStdMakeProjectWizardPage.
* @param pageName
*/
- public ConvertUKtoCProjectWizardPage(String pageName) {
+ public ConvertSimpleToCStdMakeProjectWizardPage(String pageName) {
super(pageName);
}
@@ -61,20 +60,20 @@ public class ConvertUKtoCProjectWizardPage extends ConvertProjectWizardPage {
/**
* Method isCandidate returns projects that have
- * no "C" Nature
+ * no "C" Nature, but are Projects in the Eclipse sense.
*
* @param project
* @return boolean
*/
- protected boolean isCandidate(IProject project) {
+ protected boolean isCandidate(IProject project) {
boolean noCNature = false;
-
+
// hasNature() throws a CoreException if the
// project is not open and/or is not visible to this view
// which is what happens when a project does not have a
// C nature
try {
- project.hasNature(CoreModel.C_NATURE_ID);
+ noCNature = !project.hasNature(CoreModel.C_NATURE_ID);
} catch (CoreException e) {
noCNature = true;
}
@@ -82,8 +81,8 @@ public class ConvertUKtoCProjectWizardPage extends ConvertProjectWizardPage {
}
/**
- * Method convertProject adds a C Nature to those projects
- * that were selected by the user.
+ * Method convertProject adds a C Nature and default make builder
+ * to those projects that were selected by the user.
*
* @param project
* @param monitor
@@ -92,10 +91,10 @@ public class ConvertUKtoCProjectWizardPage extends ConvertProjectWizardPage {
*/
public void convertProject(IProject project, IProgressMonitor monitor, String projectID)
throws CoreException {
+
+ CCorePlugin.getDefault().convertProjectToC(project, monitor, projectID);
if (!project.isOpen()){
project.open(monitor);
- }
- CoreUtility.addNatureToProject(project, CoreModel.C_NATURE_ID, monitor);
- CCorePlugin.getDefault().mapCProjectOwner(project, projectID);
+ }
}
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/CtoCCConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/CtoCCConversionWizard.java
index e59efde77b8..fcffda56665 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/CtoCCConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/CtoCCConversionWizard.java
@@ -81,11 +81,8 @@ public class CtoCCConversionWizard extends ConversionWizard {
* @see Wizard#createPages
*/
public void addPages() {
- mainPage = new ConvertCtoCCProjectWizardPage(getPrefix());
+ mainPage = new ConvertCtoCCStdMakeProjectWizardPage(getPrefix());
addPage(mainPage);
-
- // ensure proper window name by overwriting the title set by the super class
- this.setWindowTitle(getWindowTitleResource());
}
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/UKtoCCConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java
similarity index 67%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/UKtoCCConversionWizard.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java
index 2d8deb74478..b887c3f3d2b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/UKtoCCConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java
@@ -11,27 +11,27 @@ import org.eclipse.cdt.internal.ui.CPlugin;
* This wizard provides a method by which the user can
* add a C++ nature to a project that previously had no nature associated with it.
*/
-public class UKtoCCConversionWizard extends ConversionWizard {
+public class SimpleToCCStdMakeConversionWizard extends ConversionWizard {
- private static final String WZ_TITLE = "UKtoCCConversionWizard.title"; //$NON-NLS-1$
- private static final String WZ_DESC = "UKtoCCConversionWizard.description"; //$NON-NLS-1$
- private static final String PREFIX= "UKtoCCConversionWizard"; //$NON-NLS-1$
+ private static final String WZ_TITLE = "SimpleToCCStdMakeConversionWizard.title"; //$NON-NLS-1$
+ private static final String WZ_DESC = "SimpleToCCStdMakeConversionWizard.description"; //$NON-NLS-1$
+ private static final String PREFIX= "SimpleToCCStdMakeConversionWizard"; //$NON-NLS-1$
- private static final String WINDOW_TITLE = "UKtoCCConversionWizard.windowTitle";//$NON-NLS-1$
+ private static final String WINDOW_TITLE = "SimpleToCCStdMakeConversionWizard.windowTitle";//$NON-NLS-1$
/**
- * UKtoCCConversionWizard Wizard constructor
+ * SimpleToCCStdMakeConversionWizard Wizard constructor
*/
- public UKtoCCConversionWizard() {
+ public SimpleToCCStdMakeConversionWizard() {
this(getWindowTitleResource(), getWzDescriptionResource());
}
/**
- * UKtoCCConversionWizard Wizard constructor
+ * SimpleToCCStdMakeConversionWizard Wizard constructor
*
* @param title
* @param desc
*/
- public UKtoCCConversionWizard(String title, String desc) {
+ public SimpleToCCStdMakeConversionWizard(String title, String desc) {
super(title, desc);
}
@@ -81,11 +81,8 @@ public class UKtoCCConversionWizard extends ConversionWizard {
* @see Wizard#createPages
*/
public void addPages() {
- mainPage = new ConvertUKtoCCProjectWizardPage(getPrefix());
+ mainPage = new ConvertSimpleToCCStdMakeProjectWizardPage(getPrefix());
addPage(mainPage);
-
- // ensure proper window name by overwriting the title set by the super class
- this.setWindowTitle(getWindowTitleResource());
}
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/UKtoCConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java
similarity index 67%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/UKtoCConversionWizard.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java
index 3c76afb0345..4d7d72b8fe4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/UKtoCConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java
@@ -11,27 +11,27 @@ import org.eclipse.cdt.internal.ui.CPlugin;
* This wizard provides a method by which the user can
* add a C nature to a project that previously had no nature associated with it.
*/
-public class UKtoCConversionWizard extends ConversionWizard {
+public class SimpleToCStdMakeConversionWizard extends ConversionWizard {
- private static final String WZ_TITLE = "UKtoCConversionWizard.title"; //$NON-NLS-1$
- private static final String WZ_DESC = "UKtoCConversionWizard.description"; //$NON-NLS-1$
- private static final String PREFIX= "UKtoCConversionWizard"; //$NON-NLS-1$
+ private static final String WZ_TITLE = "SimpleToCStdMakeConversionWizard.title"; //$NON-NLS-1$
+ private static final String WZ_DESC = "SimpleToCStdMakeConversionWizard.description"; //$NON-NLS-1$
+ private static final String PREFIX= "SimpleToCStdMakeConversionWizard"; //$NON-NLS-1$
- private static final String WINDOW_TITLE = "UKtoCConversionWizard.windowTitle";//$NON-NLS-1$
+ private static final String WINDOW_TITLE = "SimpleToCStdMakeConversionWizard.windowTitle";//$NON-NLS-1$
/**
- * UKtoCConversionWizard Wizard constructor
+ * SimpleToCStdMakeConversionWizard Wizard constructor
*/
- public UKtoCConversionWizard() {
+ public SimpleToCStdMakeConversionWizard() {
this(getWindowTitleResource(), getWzDescriptionResource());
}
/**
- * UKtoCConversionWizard Wizard constructor
+ * SimpleToCStdMakeConversionWizard Wizard constructor
*
* @param title
* @param desc
*/
- public UKtoCConversionWizard(String title, String desc) {
+ public SimpleToCStdMakeConversionWizard(String title, String desc) {
super(title, desc);
}
@@ -81,11 +81,8 @@ public class UKtoCConversionWizard extends ConversionWizard {
* @see Wizard#createPages
*/
public void addPages() {
- mainPage = new ConvertUKtoCProjectWizardPage(getPrefix());
+ mainPage = new ConvertSimpleToCStdMakeProjectWizardPage(getPrefix());
addPage(mainPage);
-
- // ensure proper window name by overwriting the title set by the super class
- this.setWindowTitle(getWindowTitleResource());
}
}