Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2015-12-05 13:21:54 -0500
committerGerrit Code Review @ Eclipse.org2015-12-28 13:20:43 -0500
commit1c258538dee14f70d9f309e4500c30da6b4ee8b9 (patch)
treea1c1b4234a2b3b2c2dc8cdbdcc65a51b2d38eaa6
parent00e7081b1756173f360766dd408190cd68af9f81 (diff)
downloadorg.eclipse.cdt-1c258538dee14f70d9f309e4500c30da6b4ee8b9.tar.gz
org.eclipse.cdt-1c258538dee14f70d9f309e4500c30da6b4ee8b9.tar.xz
org.eclipse.cdt-1c258538dee14f70d9f309e4500c30da6b4ee8b9.zip
Remore unused New New Wizard
This code is not used and hasn't been touched since 2012. Now it can be referred as the "old new new wizard". Change-Id: Iccc60651a8233a5ef5b138dfcc334cfcf926d109 Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
-rw-r--r--build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/plugin.xml23
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/pom.xml2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java2
-rw-r--r--[-rwxr-xr-x]build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties3
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ToolChainSelectionPage.java100
-rw-r--r--core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF2
-rw-r--r--[-rwxr-xr-x]core/org.eclipse.cdt.ui/plugin.properties4
-rw-r--r--core/org.eclipse.cdt.ui/plugin.xml12
-rw-r--r--core/org.eclipse.cdt.ui/pom.xml2
-rw-r--r--core/org.eclipse.cdt.ui/schema/projectTypePages.exsd80
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCDTProjectWizard.java92
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ProjectTypePage.java33
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TemplateSelectionPage.java337
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF2
-rw-r--r--debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF2
-rw-r--r--launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF2
20 files changed, 10 insertions, 711 deletions
diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
index 04613e4262..8b62ac883f 100644
--- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.make.core;bundle-version="[7.0.0,8.1.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
index f489d38be0..203fb1c4c9 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true
-Bundle-Version: 8.2.2.qualifier
+Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.make.core,
org.eclipse.cdt.make.ui,
org.eclipse.cdt.managedbuilder.core;bundle-version="[8.1.0,9.0.0)",
- org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.console;bundle-version="[3.5.100,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index abc9c5e2b2..9f9adfb4a2 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -844,29 +844,6 @@
</description>
</wizard>
</extension>
- <extension
- point="org.eclipse.cdt.ui.projectTypePages">
- <projectTypePage
- class="org.eclipse.cdt.managedbuilder.ui.wizards.ToolChainSelectionPage"
- id="org.eclipse.cdt.managedbuilder.ui.exeProjectTypePage"
- projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
- </projectTypePage>
- <projectTypePage
- class="org.eclipse.cdt.managedbuilder.ui.wizards.ToolChainSelectionPage"
- id="org.eclipse.cdt.managedbuilder.ui.staticLibProjectTypePage"
- projectType="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
- </projectTypePage>
- <projectTypePage
- class="org.eclipse.cdt.managedbuilder.ui.wizards.ToolChainSelectionPage"
- id="org.eclipse.cdt.managedbuilder.ui.sharedLibProjectTypePage"
- projectType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib">
- </projectTypePage>
- <projectTypePage
- class="org.eclipse.cdt.managedbuilder.ui.wizards.ToolChainSelectionPage"
- id="org.eclipse.cdt.managedbuilder.ui.makefileProjectTypePage"
- projectType="org.eclipse.cdt.build.makefile.projectType">
- </projectTypePage>
- </extension>
<extension
point="org.eclipse.cdt.ui.LanguageSettingsProviderAssociation">
<id-association
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/pom.xml b/build/org.eclipse.cdt.managedbuilder.ui/pom.xml
index 518810248f..cbb813a5e6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/pom.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/pom.xml
@@ -11,7 +11,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>8.2.2-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.managedbuilder.ui</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
index 90b13c3156..d20f4f40e5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
@@ -278,8 +278,6 @@ public class Messages extends NLS {
public static String WizardDefaultsTab_0;
public static String WizardDefaultsTab_1;
public static String RefreshPolicyTab_resourcesTreeLabel;
- public static String ToolChainSelectionPage_Description;
- public static String ToolChainSelectionPage_Title;
static {
// Initialize resource bundle.
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
index b7e3f6f550..a4b640700e 100755..100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
@@ -288,9 +288,6 @@ NewCfgDialog_3=-- not selected --
NewCfgDialog_4=Import from projects
NewCfgDialog_5=Import predefined
-ToolChainSelectionPage_Description=Select the initial toolchain for this project.
-ToolChainSelectionPage_Title=Select Tool Chain
-
# Language Settings Providers
BuiltinSpecsDetectorOptionPage_AllocateConsole=Allocate console in the Console View
BuiltinSpecsDetectorOptionPage_Browse=Browse...
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ToolChainSelectionPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ToolChainSelectionPage.java
deleted file mode 100644
index 5c0079ff92..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ToolChainSelectionPage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Doug Schaefer 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
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.managedbuilder.ui.wizards;
-
-import org.eclipse.cdt.managedbuilder.core.IToolChain;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
-import org.eclipse.cdt.ui.templateengine.Template;
-import org.eclipse.cdt.ui.wizards.ProjectTypePage;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.List;
-
-/**
- * @since 8.1
- *
- */
-public class ToolChainSelectionPage extends WizardPage implements ProjectTypePage {
-
- private IWizardPage nextPage;
- private String[] toolChainIds;
- private String selectedToolChainId;
- private List toolChainList;
-
- public ToolChainSelectionPage() {
- super("ToolChainSelectionPage"); //$NON-NLS-1$
- setTitle(Messages.ToolChainSelectionPage_Title);
- setDescription(Messages.ToolChainSelectionPage_Description);
- }
-
- @Override
- public void createControl(Composite parent) {
- Composite comp = new Composite(parent, SWT.NONE);
- comp.setLayout(new GridLayout(1, true));
-
- toolChainList = new List(comp, SWT.BORDER | SWT.SINGLE);
- toolChainList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- for (String toolChainId : toolChainIds) {
- IToolChain toolChain = ManagedBuildManager.getExtensionToolChain(toolChainId);
- if (toolChain != null)
- toolChainList.add(toolChain.getName());
- }
-
- toolChainList.addSelectionListener(new SelectionListener() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (toolChainList.getSelectionCount() == 0)
- selectedToolChainId = null;
- else
- selectedToolChainId = toolChainIds[toolChainList.getSelectionIndex()];
- }
-
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
-
- setControl(comp);
- }
-
- @Override
- public boolean init(Template template, IWizard wizard, IWizardPage nextPage) {
- this.nextPage = nextPage;
- setWizard(wizard);
- toolChainIds = template.getTemplateInfo().getToolChainIds();
-
- // only need this page if there are multiple toolChains to select from.
- return toolChainIds != null && toolChainIds.length > 1;
- }
-
- @Override
- public IWizardPage getNextPage() {
- if (nextPage != null)
- return nextPage;
- return super.getNextPage();
- }
-
- @Override
- public boolean isPageComplete() {
- return selectedToolChainId != null;
- }
-
-}
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index f56f421f0c..c235b6036f 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
-Bundle-Version: 5.12.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 97d518527a..2d6978947e 100755..100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -664,10 +664,6 @@ callHierarchyProviders.name = Call Hierarchy Providers
externalSearchProviders.name = External Search Providers
RefreshExclusionContributorExtensionPoint = Refresh Exclusion Contributor
-# New New Project Wizard
-newProjectWizard.name = C/C++ Project (prototype)
-projectTypePages = Project Type Pages
-
semanticHighlightingExtensionPoint = Semantic Highlighting Extension Point
UserSettingEntries.name = CDT User Setting Entries
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index d0ac898027..930033961e 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -30,7 +30,6 @@
<extension-point id="workingSetConfigurations" name="%workingSetConfigurationsExtensionPoint" schema="schema/workingSetConfigurations.exsd"/>
<extension-point id="LanguageSettingsProviderAssociation" name="%LanguageSettingsProviderAssociationExtensionPoint" schema="schema/LanguageSettingsProviderAssociation.exsd"/>
<extension-point id="RefreshExclusionContributor" name="%RefreshExclusionContributorExtensionPoint" schema="schema/RefreshExclusionContributor.exsd"/>
- <extension-point id="projectTypePages" name="%projectTypePages" schema="schema/projectTypePages.exsd"/>
<extension-point id="semanticHighlighting" name="%semanticHighlightingExtensionPoint" schema="schema/semanticHighlighting.exsd"/>
<extension
@@ -459,17 +458,6 @@
%Cproject.desc
</description>
</wizard>
- <!-- (defered) wizard
- canFinishEarly="false"
- category="org.eclipse.cdt.ui.newCWizards"
- class="org.eclipse.cdt.ui.wizards.NewCDTProjectWizard"
- finalPerspective="org.eclipse.cdt.ui.CPerspective"
- hasPages="true"
- icon="icons/elcl16/newmngc_app.gif"
- id="org.eclipse.cdt.ui.wizards.newProject"
- name="%newProjectWizard.name"
- project="true">
- </wizard-->
</extension>
<!-- Define the document setup participant for the C/C++ and Assembly Editors -->
diff --git a/core/org.eclipse.cdt.ui/pom.xml b/core/org.eclipse.cdt.ui/pom.xml
index 3ed7481ec3..9978bc4fa3 100644
--- a/core/org.eclipse.cdt.ui/pom.xml
+++ b/core/org.eclipse.cdt.ui/pom.xml
@@ -11,7 +11,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>5.12.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.ui</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/org.eclipse.cdt.ui/schema/projectTypePages.exsd b/core/org.eclipse.cdt.ui/schema/projectTypePages.exsd
deleted file mode 100644
index 006828ce16..0000000000
--- a/core/org.eclipse.cdt.ui/schema/projectTypePages.exsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.cdt.ui" id="projectTypePages" name="%ProjectTypePages"/>
- </appInfo>
- <documentation>
- This extension is used to register a page in the CDT new project wizard to support
-specifying additional information based on the project type associated with a template.
- </documentation>
- </annotation>
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="projectTypePage" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
- <element name="projectTypePage">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="identifier"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="projectType" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.cdt.ui.wizards.ProjectTypePage"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-</schema>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
index 94bb2de358..0a9283d51c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
@@ -71,13 +71,6 @@ public final class CUIMessages extends NLS {
public static String FileTransferDragAdapter_refreshing;
public static String FileTransferDragAdapter_problem;
public static String FileTransferDragAdapter_problemTitle;
- public static String NewCDTProjectWizard_mainPageDesc;
- public static String NewCDTProjectWizard_mainPageTitle;
- public static String NewCDTProjectWizard_refPageDesc;
- public static String NewCDTProjectWizard_refPageTitle;
- public static String NewCDTProjectWizard_templatePageDesc;
- public static String NewCDTProjectWizard_templatePageTitle;
- public static String NewCDTProjectWizard_windowTitle;
public static String CUIPlugin_initPrefs;
static {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
index 00705b5d30..35f54d2a07 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
@@ -74,12 +74,4 @@ FileTransferDragAdapter_refreshing=Refreshing...
FileTransferDragAdapter_problem=Problem while moving or copying files.
FileTransferDragAdapter_problemTitle=Drag & Drop
-NewCDTProjectWizard_mainPageDesc=Create a new C/C++ Project
-NewCDTProjectWizard_mainPageTitle=Project
-NewCDTProjectWizard_refPageDesc=Select referenced projects
-NewCDTProjectWizard_refPageTitle=Project References
-NewCDTProjectWizard_templatePageDesc=Select a project template for the new project
-NewCDTProjectWizard_templatePageTitle=Project Template
-NewCDTProjectWizard_windowTitle=New C/C++ Project
-
-CUIPlugin_initPrefs=Initialize C/C++ UI Preferences \ No newline at end of file
+CUIPlugin_initPrefs=Initialize C/C++ UI Preferences
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCDTProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCDTProjectWizard.java
deleted file mode 100644
index df418029cc..0000000000
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCDTProjectWizard.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.eclipse.cdt.ui.wizards;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.eclipse.ui.dialogs.WizardNewProjectReferencePage;
-
-import org.eclipse.cdt.internal.ui.CUIMessages;
-
-/**
- * This is the new CDT project wizard.
- *
- * Without subclassing, it is in it's most generic form.
- *
- * Subclasses can filter or select the languages and add template filters.
- *
- * @author Doug Schaefer
- * @since 5.4
- */
-public class NewCDTProjectWizard extends Wizard implements INewWizard {
-
- private IStructuredSelection selection;
- private WizardNewProjectCreationPage mainPage;
- private TemplateSelectionPage templatePage;
- private WizardNewProjectReferencePage referencePage;
-
- @Override
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- this.selection = selection;
- setNeedsProgressMonitor(true);
- setWindowTitle(CUIMessages.NewCDTProjectWizard_windowTitle);
- }
-
- @Override
- public boolean performFinish() {
- return true;
- }
-
- @Override
- public void addPages() {
- super.addPages();
-
- mainPage = new WizardNewProjectCreationPage("basicNewProjectPage") { //$NON-NLS-1$
- @Override
- public void createControl(Composite parent) {
- super.createControl(parent);
- createWorkingSetGroup(
- (Composite) getControl(),
- selection,
- new String[] { "org.eclipse.ui.resourceWorkingSetPage", //$NON-NLS-1$
- "org.eclipse.cdt.ui.CElementWorkingSetPage" }); //$NON-NLS-1$
- Dialog.applyDialogFont(getControl());
- }
- };
- mainPage.setTitle(CUIMessages.NewCDTProjectWizard_mainPageTitle);
- mainPage.setDescription(CUIMessages.NewCDTProjectWizard_mainPageDesc);
- addPage(mainPage);
-
- templatePage = new TemplateSelectionPage();
- templatePage.setTitle(CUIMessages.NewCDTProjectWizard_templatePageTitle);
- templatePage.setDescription(CUIMessages.NewCDTProjectWizard_templatePageDesc);
- addPage(templatePage);
-
- // only add page if there are already projects in the workspace
- if (ResourcesPlugin.getWorkspace().getRoot().getProjects().length > 0) {
- referencePage = new WizardNewProjectReferencePage(
- "basicReferenceProjectPage");//$NON-NLS-1$
- referencePage.setTitle(CUIMessages.NewCDTProjectWizard_refPageTitle);
- referencePage
- .setDescription(CUIMessages.NewCDTProjectWizard_refPageDesc);
- this.addPage(referencePage);
- }
- }
-
- @Override
- public boolean canFinish() {
- IWizardPage page = mainPage;
- while (page != null) {
- if (!page.isPageComplete())
- return false;
- page = page.getNextPage();
- }
- return true;
- }
-
-}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ProjectTypePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ProjectTypePage.java
deleted file mode 100644
index ad5eae3b08..0000000000
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ProjectTypePage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Doug Schaefer 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
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.ui.wizards;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-
-import org.eclipse.cdt.ui.templateengine.Template;
-
-/**
- * @since 5.4
- */
-public interface ProjectTypePage extends IWizardPage {
-
- /**
- * Init the page. Return false if the page isn't needed.
- *
- * @param template The selected template
- * @param wizard The wizard object
- * @param nextPage The next page after this one
- * @return whether page is really needed
- */
- boolean init(Template template, IWizard wizard, IWizardPage nextPage);
-
-}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TemplateSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TemplateSelectionPage.java
deleted file mode 100644
index 2608bce5a5..0000000000
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TemplateSelectionPage.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Wind River 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
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.ui.wizards;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.cdt.core.templateengine.TemplateCategory;
-import org.eclipse.cdt.core.templateengine.TemplateEngine2;
-import org.eclipse.cdt.core.templateengine.TemplateInfo2;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.templateengine.Template;
-import org.eclipse.cdt.ui.templateengine.TemplateEngineUI;
-
-/**
- * @author Doug Schaefer
- * @since 5.4
- */
-public class TemplateSelectionPage extends WizardPage {
-
- private static class Node {
- private final Object object;
- private final Node parent;
- private final List<Node> children = new LinkedList<Node>();
-
- public Node(Node parent, Object object) {
- this.parent = parent;
- this.object = object;
-
- if (parent != null)
- parent.addChild(this);
- }
-
- private void addChild(Node child) {
- children.add(child);
- }
-
- public Node getChild(Object child) {
- for (Node childNode : children)
- if (childNode.getObject().equals(child))
- return childNode;
- return null;
- }
-
- public Object getObject() {
- return object;
- }
-
- public Node getParent() {
- return parent;
- }
-
- public List<Node> getChildren() {
- return children;
- }
- }
-
- private static Node tree;
-
- private final TemplateEngine2 coreEngine = TemplateEngine2.getDefault();
- private final TemplateEngineUI uiEngine = TemplateEngineUI.getDefault();
-
- private TreeViewer templateTree;
- private Template selectedTemplate;
- private IWizardPage nextPage;
-
- public TemplateSelectionPage() {
- super("templateSelection"); //$NON-NLS-1$
- }
-
- @Override
- public void createControl(Composite parent) {
- Composite comp = new Composite(parent, SWT.NONE);
- comp.setLayout(new GridLayout(1, false));
-
- templateTree = new TreeViewer(comp);
- templateTree.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- templateTree.setContentProvider(new ITreeContentProvider() {
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public boolean hasChildren(Object element) {
- if (element instanceof Node)
- return !((Node)element).getChildren().isEmpty();
- return false;
- }
-
- @Override
- public Object getParent(Object element) {
- if (element instanceof Node)
- return ((Node)element).getParent();
- return null;
- }
-
- @Override
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof Node)
- return ((Node)inputElement).getChildren().toArray();
- return null;
- }
-
- @Override
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof Node)
- return ((Node)parentElement).getChildren().toArray();
- return null;
- }
- });
- templateTree.setLabelProvider(new ILabelProvider() {
- @Override
- public void removeListener(ILabelProviderListener listener) {
- }
-
- @Override
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public void addListener(ILabelProviderListener listener) {
- }
-
- @Override
- public String getText(Object element) {
- if (element instanceof Node) {
- Object object = ((Node)element).getObject();
- if (object instanceof TemplateCategory)
- return ((TemplateCategory)object).getLabel();
- else if (object instanceof Template)
- return ((Template)object).getLabel();
- }
- return element.toString();
- }
-
- @Override
- public Image getImage(Object element) {
- return null;
- }
- });
- templateTree.addSelectionChangedListener(new ISelectionChangedListener() {
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- selectedTemplate = null;
- nextPage = null;
- IStructuredSelection selection = (IStructuredSelection)templateTree.getSelection();
- Object selObj = selection.getFirstElement();
- if (selObj instanceof Node) {
- Object object = ((Node)selObj).getObject();
- if (object instanceof Template) {
- IWizard wizard = getWizard();
- selectedTemplate = (Template)object;
-
- // Get the template pages
- IWizardPage[] templatePages = selectedTemplate.getTemplateWizardPages(TemplateSelectionPage.this,
- wizard.getNextPage(TemplateSelectionPage.this), wizard);
- if (templatePages != null && templatePages.length > 0)
- nextPage = templatePages[0];
-
- String projectType = selectedTemplate.getTemplateInfo().getProjectType();
- ProjectTypePage projectTypePage = getProjectTypePage(projectType);
- if (projectTypePage != null) {
- if (projectTypePage.init(selectedTemplate, wizard, nextPage))
- nextPage = projectTypePage;
- }
- setPageComplete(true);
- } else {
- setPageComplete(false);
- }
- } else {
- setPageComplete(false);
- }
- }
- });
- buildTree();
- templateTree.setInput(tree);
-
- setControl(comp);
- }
-
- public Template getSelectedTemplate() {
- return selectedTemplate;
- }
-
- @Override
- public boolean isPageComplete() {
- return selectedTemplate != null;
- }
-
- @Override
- public IWizardPage getNextPage() {
- if (nextPage != null)
- return nextPage;
- return super.getNextPage();
- }
-
- private void buildTree() {
- if (tree != null)
- return;
- tree = new Node(null, null);
-
- Template[] templates = uiEngine.getTemplates();
- for (Template template : templates) {
- List<String> parentCategoryIds = ((TemplateInfo2)template.getTemplateInfo()).getParentCategoryIds();
- boolean inTree = false;
- if (!parentCategoryIds.isEmpty()) {
- for (String parentCategoryId : parentCategoryIds) {
- List<Node> parents = getParents(parentCategoryId);
- if (!parents.isEmpty()) {
- for (Node parent : parents)
- new Node(parent, template);
- inTree = true;
- }
- }
- }
-
- if (!inTree) {
- // no parents
- new Node(tree, template);
- }
- }
- }
-
- private List<Node> getParents(String parentCategoryId) {
- List<Node> nodes = new LinkedList<Node>();
-
- TemplateCategory category = coreEngine.getCategory(parentCategoryId);
- if (category == null) {
- // undefined, log it
- CUIPlugin.log(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, "Undefined parent category " + parentCategoryId)); //$NON-NLS-1$
- return nodes;
- }
-
- // Hook me up to my parents
- List<String> parentCategoryIds = category.getParentCategoryIds();
- boolean inTree = false;
- if (!parentCategoryIds.isEmpty()) {
- for (String myParentId : parentCategoryIds) {
- List<Node> parents = getParents(myParentId);
- if (!parents.isEmpty()) {
- for (Node parent : parents) {
- Node node = parent.getChild(category);
- if (node == null)
- nodes.add(new Node(parent, category));
- else
- nodes.add(node);
- }
- inTree = true;
- }
- }
- }
-
- if (!inTree) {
- // parents not found, I'm an orphan
- Node node = tree.getChild(category);
- if (node == null)
- nodes.add(new Node(tree, category));
- else
- nodes.add(node);
- }
-
- return nodes;
- }
-
- private ProjectTypePage getProjectTypePage(String projectType) {
- if (projectType != null && !projectType.isEmpty()) {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IExtensionPoint point = reg.getExtensionPoint(CUIPlugin.PLUGIN_ID, "projectTypePages"); //$NON-NLS-1$
- if (point == null)
- return null;
- IExtension[] exts = point.getExtensions();
- for (IExtension ext : exts) {
- IConfigurationElement[] elems = ext.getConfigurationElements();
- for (IConfigurationElement elem : elems) {
- if (elem.getName().equals("projectTypePage")) { //$NON-NLS-1$
- String ept = elem.getAttribute("projectType"); //$NON-NLS-1$
- if (projectType.equals(ept)) {
- try {
- Object obj = elem.createExecutableExtension("class"); //$NON-NLS-1$
- if (obj instanceof ProjectTypePage)
- return (ProjectTypePage)obj;
- } catch (CoreException e) {
- CUIPlugin.log(e.getStatus());
- }
- }
- }
- }
- }
- }
-
- return null;
- }
-
-}
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
index 833fa549fe..ba14e482c8 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.debug.ui;bundle-version="[7.0.0,8.1.0)",
org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
index a025b9ec0e..46be539dd1 100644
--- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
@@ -50,7 +50,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)",
org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)",
- org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)",
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index 8b07f2db46..e036518bbd 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.1.0)",
org.eclipse.cdt.debug.ui;bundle-version="[7.0.0,8.1.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",

Back to the top