diff options
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConvertToMakeWizardPage.java')
-rw-r--r-- | build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConvertToMakeWizardPage.java | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConvertToMakeWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConvertToMakeWizardPage.java index c299f6ff5a4..5d3ff735f03 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConvertToMakeWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ConvertToMakeWizardPage.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.wizards; - + import java.util.ArrayList; import java.util.List; @@ -49,15 +49,15 @@ import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; * @noinstantiate This class is not intended to be instantiated by clients. */ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { - + private static final String WZ_TITLE = "WizardMakeProjectConversion.title"; //$NON-NLS-1$ private static final String WZ_DESC = "WizardMakeProjectConversion.description"; //$NON-NLS-1$ - + /** * @since 5.1 */ protected CWizardHandler h_selected = null; - + // widgets private Button specifyProjectTypeButton; private Tree tree; @@ -145,6 +145,7 @@ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { final IWizardItemsListListener filter = new IWizardItemsListListener() { // Show only category + @Override public List<EntryDescriptor> filterItems( List<? extends EntryDescriptor> items) { List<EntryDescriptor> results = new ArrayList<EntryDescriptor>(); @@ -158,10 +159,12 @@ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { return results; } + @Override public boolean isCurrent() { return true; } + @Override public void toolChainListChanged(int count) { // Do nothing } @@ -231,7 +234,7 @@ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { protected String getWzTitleResource(){ return MakeUIPlugin.getResourceString(WZ_TITLE); } - + /** * Method getWzDescriptionResource returns the correct description * Label for this class overriding the default in the superclass. @@ -240,21 +243,21 @@ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { protected String getWzDescriptionResource(){ return MakeUIPlugin.getResourceString(WZ_DESC); } - + /** * Method isCandidate returns true for: * - non-CDT projects * - old style Make CDT projects - * So new model projects and + * So new model projects and * old style managed projects * are refused. */ @Override public boolean isCandidate(IProject project) { - boolean a = !AbstractPage.isCDTPrj(project); + boolean a = !AbstractPage.isCDTPrj(project); boolean b = ManagedBuilderCorePlugin.getDefault().isOldStyleMakeProject(project); - return a || b; - } + return a || b; + } @Override public void convertProject(IProject project, String bsId, IProgressMonitor monitor) throws CoreException{ @@ -262,7 +265,7 @@ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { try { if (ManagedBuilderCorePlugin.getDefault().isOldStyleMakeProject(project)) { ManagedBuilderCorePlugin.getDefault().convertOldStdMakeToNewStyle(project, monitor); - } else { + } else { super.convertProject(project, bsId, new SubProgressMonitor(monitor, 1)); if (isSetProjectType()) { h_selected.convertProject(project, monitor); @@ -279,7 +282,7 @@ public class ConvertToMakeWizardPage extends ConvertProjectWizardPage { try { if (ManagedBuilderCorePlugin.getDefault().isOldStyleMakeProject(project)) { ManagedBuilderCorePlugin.getDefault().convertOldStdMakeToNewStyle(project, monitor); - } else { + } else { super.convertProject(project, new SubProgressMonitor(monitor, 1), projectID); if (isSetProjectType()) { h_selected.convertProject(project, monitor); |