From 30cde08c837ea77248aab266db16207922bab22f Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 10 Aug 2016 16:06:49 -0400 Subject: [PATCH] Add templates that map to old new project wizards. Change-Id: I23a01ca9adcb73aa684d3be5932975e75f1a2462 --- core/org.eclipse.cdt.ui/icons/cdt_logo_48.png | Bin 0 -> 3654 bytes core/org.eclipse.cdt.ui/plugin.xml | 24 ++++ .../cdt/internal/ui/newui/Messages.properties | 4 +- .../internal/ui/wizards/CCProjectWizard2.java | 18 +++ .../ui/wizards/CDTProjectWizard2.java | 125 ++++++++++++++++++ .../internal/ui/wizards/CProjectWizard2.java | 18 +++ 6 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 core/org.eclipse.cdt.ui/icons/cdt_logo_48.png create mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CCProjectWizard2.java create mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java create mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CProjectWizard2.java diff --git a/core/org.eclipse.cdt.ui/icons/cdt_logo_48.png b/core/org.eclipse.cdt.ui/icons/cdt_logo_48.png new file mode 100644 index 0000000000000000000000000000000000000000..4f2aecee517a651167bf2876564ac0c53eae21b9 GIT binary patch literal 3654 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 K)2l-`-}xUPuCq7* literal 0 HcmV?d00001 diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml index c79fe1ed8b4..52b573d3793 100644 --- a/core/org.eclipse.cdt.ui/plugin.xml +++ b/core/org.eclipse.cdt.ui/plugin.xml @@ -4958,6 +4958,30 @@ id="org.eclipse.cdt.ui.cdtTag" label="C/C++"> + + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties index 0533e13d030..e02d0bc1b81 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties @@ -290,8 +290,8 @@ ProjectContentsArea_9=File with given name already exists CDTCommonProjectWizard_0=Old project will be overridden CDTCommonProjectWizard_1=Existing project settings will be overridden.\nImport feature can be used instead to preserve old settings.\nOK to override ? CDTCommonProjectWizard_creatingProject=Creating project -NewModelProjectWizard_0=CDT Project -NewModelProjectWizard_1=Create CDT project of selected type +NewModelProjectWizard_0=C/C++ Project +NewModelProjectWizard_1=Create C/C++ project of selected type NewModelProjectWizard_2=C++ Project NewModelProjectWizard_3=Create C++ project of selected type NewModelProjectWizard_4=C Project diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CCProjectWizard2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CCProjectWizard2.java new file mode 100644 index 00000000000..6af8377624e --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CCProjectWizard2.java @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2016 QNX Software Systems and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.wizards; + +import org.eclipse.cdt.ui.wizards.CCProjectWizard; + +public class CCProjectWizard2 extends CDTProjectWizard2 { + + public CCProjectWizard2() { + super(new CCProjectWizard()); + } + +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java new file mode 100644 index 00000000000..e65c0a22972 --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CDTProjectWizard2.java @@ -0,0 +1,125 @@ +/******************************************************************************* + * Copyright (c) 2016 QNX Software Systems and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.wizards; + +import java.net.URI; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardContainer; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.tools.templates.core.IGenerator; +import org.eclipse.tools.templates.ui.TemplateWizard; +import org.eclipse.ui.IWorkbench; + +import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard; + +public class CDTProjectWizard2 extends TemplateWizard implements IGenerator, ICDTCommonProjectWizard { + + private final CDTCommonProjectWizard cdtWizard; + + protected CDTProjectWizard2(CDTCommonProjectWizard cdtWizard) { + this.cdtWizard = cdtWizard; + } + + @Override + public void addPages() { + cdtWizard.addPages(); + + for (IWizardPage page : cdtWizard.getPages()) { + addPage(page); + } + } + + @Override + public void init(IWorkbench theWorkbench, IStructuredSelection currentSelection) { + super.init(theWorkbench, currentSelection); + cdtWizard.init(theWorkbench, currentSelection); + } + + @Override + public void setContainer(IWizardContainer wizardContainer) { + super.setContainer(wizardContainer); + cdtWizard.setContainer(wizardContainer); + } + + @Override + public boolean performFinish() { + return cdtWizard.performFinish(); + } + + @Override + public boolean performCancel() { + return cdtWizard.performCancel(); + } + + @Override + protected IGenerator getGenerator() { + return this; + } + + @Override + public void generate(IProgressMonitor monitor) throws CoreException { + // Nothing to do for now, the performFinish already did it + } + + @Override + public IProject createIProject(String name, URI location) throws CoreException { + return cdtWizard.createIProject(name, location); + } + + @Override + public IProject createIProject(String name, URI location, IProgressMonitor monitor) throws CoreException { + return createIProject(name, location, monitor); + } + + @Override + public String[] getContentTypeIDs() { + return cdtWizard.getContentTypeIDs(); + } + + @Override + public String[] getExtensions() { + return cdtWizard.getExtensions(); + } + + @Override + public String[] getLanguageIDs() { + return cdtWizard.getLanguageIDs(); + } + + @Override + public IProject getLastProject() { + return cdtWizard.getLastProject(); + } + + @Override + public String[] getNatures() { + return cdtWizard.getNatures(); + } + + @Override + public IProject getProject(boolean defaults) { + return cdtWizard.getProject(defaults); + } + + @Override + public IProject getProject(boolean defaults, boolean onFinish) { + return cdtWizard.getProject(defaults, onFinish); + } + + @Override + public void setInitializationData(IConfigurationElement config, String propertyName, Object data) + throws CoreException { + setInitializationData(config, propertyName, data); + } + +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CProjectWizard2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CProjectWizard2.java new file mode 100644 index 00000000000..d468d54d43b --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CProjectWizard2.java @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2016 QNX Software Systems and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.wizards; + +import org.eclipse.cdt.ui.wizards.CProjectWizard; + +public class CProjectWizard2 extends CDTProjectWizard2 { + + public CProjectWizard2() { + super(new CProjectWizard()); + } + +}