diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java index a0e0b29190a..f217dbe3fb6 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java @@ -17,13 +17,13 @@ import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.managedbuilder.core.ITargetPlatform; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIImages; -import org.eclipse.cdt.ui.wizards.ICNewWizard; +import org.eclipse.cdt.ui.wizards.CNewWizard; import org.eclipse.cdt.ui.wizards.IWizardItemsListListener; import org.eclipse.cdt.utils.Platform; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; -public abstract class AbstractCWizard implements ICNewWizard { +public abstract class AbstractCWizard extends CNewWizard { private static final String os = Platform.getOS(); private static final String arch = Platform.getOSArch(); diff --git a/core/org.eclipse.cdt.ui/schema/CDTWizard.exsd b/core/org.eclipse.cdt.ui/schema/CDTWizard.exsd index fa1da0b4570..3445900970e 100644 --- a/core/org.eclipse.cdt.ui/schema/CDTWizard.exsd +++ b/core/org.eclipse.cdt.ui/schema/CDTWizard.exsd @@ -50,7 +50,7 @@ - + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java index a01eb72a9bd..0a03aadfa4e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java @@ -418,9 +418,9 @@ import org.eclipse.cdt.internal.ui.CPluginImages; IConfigurationElement[] elements = extensions[i].getConfigurationElements(); for (int k = 0; k < elements.length; k++) { if (elements[k].getName().equals(ELEMENT_NAME)) { - ICNewWizard w = null; + CNewWizard w = null; try { - w = (ICNewWizard) elements[k].createExecutableExtension(CLASS_NAME); + w = (CNewWizard) elements[k].createExecutableExtension(CLASS_NAME); } catch (CoreException e) { System.out.println(UIMessages.getString("CMainWizardPage.5") + e.getLocalizedMessage()); //$NON-NLS-1$ return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICNewWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CNewWizard.java similarity index 92% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICNewWizard.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CNewWizard.java index bcc51913c93..58c62d8d9be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICNewWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CNewWizard.java @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite; * items in "Project types" list (left pane on * the 1st page in any CDT new project wizard) */ -public interface ICNewWizard { +public abstract class CNewWizard { /** * Creates tree items to be displayed in left pane. * @@ -33,7 +33,7 @@ public interface ICNewWizard { * @param supportedOnly - whether display supported types only * @param wizard - New Project wizard to be passed to ICWizardHandler */ - public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard); + public abstract EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard); /** * Implementor will be informed about widget where additional @@ -46,5 +46,6 @@ public interface ICNewWizard { * May be null if notification is not required * or implementor does not really support it. */ - public void setDependentControl(Composite parent, IWizardItemsListListener page); + public void setDependentControl(Composite parent, IWizardItemsListListener page){ + } } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java index 29f4985441b..e5d78a4f748 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java @@ -19,13 +19,13 @@ import org.eclipse.cdt.core.templateengine.TemplateInfo; import org.eclipse.cdt.ui.templateengine.Template; import org.eclipse.cdt.ui.templateengine.TemplateEngineUI; import org.eclipse.cdt.ui.wizards.EntryDescriptor; -import org.eclipse.cdt.ui.wizards.ICNewWizard; +import org.eclipse.cdt.ui.wizards.CNewWizard; import org.eclipse.cdt.ui.wizards.IWizardItemsListListener; /** * */ -public class TemplateCNewWizard implements ICNewWizard { +public class TemplateCNewWizard extends CNewWizard { /** * Creates and returns an array of items to be displayed */