2004-09-22 Chris Wiebe

wizard cleanup & refactoring
	* src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java
	* src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java
	* src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java
	* src/org/eclipse/cdt/ui/CUIPlugin.java
	* browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPerspectiveFactory.java
	* src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java
	* src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties
	* src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java

core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPerspectiveFactory.java

@@ -11,6 +11,7 @@
 package org.eclipse.cdt.internal.ui.browser.cbrowsing;
 
 import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.core.runtime.IAdaptable;
@@ -75,13 +76,21 @@ public class CBrowsingPerspectiveFactory implements IPerspectiveFactory {
 		layout.addShowInPart(IPageLayout.ID_RES_NAV);
 
 		// new actions - C project creation wizard
-		String[] wizIDs = CUIPlugin.getCProjectWizardIDs();
+		String[] wizIDs = CWizardRegistry.getProjectWizardIDs();
 		for (int i = 0; i < wizIDs.length; ++i) {
 			layout.addNewWizardShortcut(wizIDs[i]);
 		}
-		layout.addNewWizardShortcut(CUIPlugin.CLASS_WIZARD_ID);
 		layout.addNewWizardShortcut(CUIPlugin.FOLDER_WIZARD_ID);
-		layout.addNewWizardShortcut(CUIPlugin.FILE_WIZARD_ID);
+		// new actions - C type creation wizard
+		wizIDs = CWizardRegistry.getTypeWizardIDs();
+		for (int i = 0; i < wizIDs.length; ++i) {
+			layout.addNewWizardShortcut(wizIDs[i]);
+		}
+		// new actions - C file creation wizard
+		wizIDs = CWizardRegistry.getFileWizardIDs();
+		for (int i = 0; i < wizIDs.length; ++i) {
+			layout.addNewWizardShortcut(wizIDs[i]);
+		}
 	}
 
 	public void createInitialLayout(IPageLayout layout) {
@@ -119,13 +128,21 @@ public class CBrowsingPerspectiveFactory implements IPerspectiveFactory {
 		layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
 		
 		// new actions - C project creation wizard
-		String[] wizIDs = CUIPlugin.getCProjectWizardIDs();
+		String[] wizIDs = CWizardRegistry.getProjectWizardIDs();
 		for (int i = 0; i < wizIDs.length; ++i) {
 			layout.addNewWizardShortcut(wizIDs[i]);
 		}
-		layout.addNewWizardShortcut(CUIPlugin.CLASS_WIZARD_ID);
 		layout.addNewWizardShortcut(CUIPlugin.FOLDER_WIZARD_ID);
-		layout.addNewWizardShortcut(CUIPlugin.FILE_WIZARD_ID);
+		// new actions - C type creation wizard
+		wizIDs = CWizardRegistry.getTypeWizardIDs();
+		for (int i = 0; i < wizIDs.length; ++i) {
+			layout.addNewWizardShortcut(wizIDs[i]);
+		}
+		// new actions - C file creation wizard
+		wizIDs = CWizardRegistry.getFileWizardIDs();
+		for (int i = 0; i < wizIDs.length; ++i) {
+			layout.addNewWizardShortcut(wizIDs[i]);
+		}
 	}
 
 	private void createVerticalLayout(IPageLayout layout) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java

@@ -5,6 +5,7 @@ package org.eclipse.cdt.internal.ui;
  * All Rights Reserved.
  */
  
+import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.search.ui.SearchUI;
 import org.eclipse.ui.IFolderLayout;
@@ -61,12 +62,20 @@ public class CPerspectiveFactory implements IPerspectiveFactory {
 		layout.addShowInPart(IPageLayout.ID_RES_NAV);
 
 		// new actions - C project creation wizard
-		String[] wizIDs = CUIPlugin.getCProjectWizardIDs();
+		String[] wizIDs = CWizardRegistry.getProjectWizardIDs();
 		for (int i = 0; i < wizIDs.length; ++i) {
 			layout.addNewWizardShortcut(wizIDs[i]);
 		}
-		layout.addNewWizardShortcut(CUIPlugin.CLASS_WIZARD_ID);
 		layout.addNewWizardShortcut(CUIPlugin.FOLDER_WIZARD_ID);
-		layout.addNewWizardShortcut(CUIPlugin.FILE_WIZARD_ID);
+		// new actions - C type creation wizard
+		wizIDs = CWizardRegistry.getTypeWizardIDs();
+		for (int i = 0; i < wizIDs.length; ++i) {
+			layout.addNewWizardShortcut(wizIDs[i]);
+		}
+		// new actions - C file creation wizard
+		wizIDs = CWizardRegistry.getFileWizardIDs();
+		for (int i = 0; i < wizIDs.length; ++i) {
+			layout.addNewWizardShortcut(wizIDs[i]);
+		}
 	}
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.ui.wizards;
+package org.eclipse.cdt.internal.ui.dialogs;
 
 import java.util.Collection;
 
@@ -18,7 +18,6 @@ import org.eclipse.jface.util.Assert;
 
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 
-import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
 
 /**
  * Implementation of a <code>ISelectionValidator</code> to validate the

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.ui.wizards;
+package org.eclipse.cdt.internal.ui.dialogs;
 
 import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.Viewer;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java

@@ -26,9 +26,9 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
 import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
+import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
+import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.util.PixelConverter;
-import org.eclipse.cdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.cdt.internal.ui.wizards.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java

@@ -20,8 +20,8 @@ import org.eclipse.cdt.core.model.ILibraryEntry;
 import org.eclipse.cdt.core.model.IPathEntry;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
 import org.eclipse.cdt.internal.ui.util.PixelConverter;
-import org.eclipse.cdt.internal.ui.wizards.TypedElementSelectionValidator;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java

@@ -17,8 +17,8 @@ import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.IPathEntry;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.util.PixelConverter;
-import org.eclipse.cdt.internal.ui.wizards.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java

@@ -18,8 +18,8 @@ import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.IPathEntry;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.util.PixelConverter;
-import org.eclipse.cdt.internal.ui.wizards.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java

@@ -13,9 +13,9 @@ import java.util.List;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.dialogs.StatusDialog;
+import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
+import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
-import org.eclipse.cdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.cdt.internal.ui.wizards.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java

@@ -12,8 +12,8 @@ import java.util.List;
 
 import org.eclipse.cdt.internal.ui.dialogs.StatusDialog;
 import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.cdt.internal.ui.wizards.TypedElementSelectionValidator;
+import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
-import org.eclipse.cdt.internal.ui.wizards.TypedViewerFilter;
+import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java

@@ -24,8 +24,8 @@ import org.eclipse.cdt.internal.corext.Assert;
 import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
 import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
 import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
+import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
 import org.eclipse.cdt.internal.ui.util.PixelConverter;
-import org.eclipse.cdt.internal.ui.wizards.TypedElementSelectionValidator;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties

@@ -22,118 +22,8 @@ AbstractOpenWizardAction.createerror.message=The wizard could not be opened. See
 NewElementWizard.op_error.title=New
 NewElementWizard.op_error.message=Creation of element failed.
 
-NewElementWizard.typecomment.deprecated.title=Type Creation
-NewElementWizard.typecomment.deprecated.message=You can configure the default layout of newly created files and types on the 'code generation' preference page.  This was previously implemented on the template page in the templates 'filecomment' and 'typecomment'.
-# ------- NewContainerWizardPage ------- 
-
-NewContainerWizardPage.container.label=Source Fol&der:
-NewContainerWizardPage.container.button=Br&owse...
-
-NewContainerWizardPage.error.EnterContainerName=Folder name is empty.
-NewContainerWizardPage.error.ContainerIsBinary=''{0}'' is a JAR archive.
-NewContainerWizardPage.error.ContainerDoesNotExist=Folder ''{0}'' does not exist.
-NewContainerWizardPage.error.NotAFolder=''{0}'' must be a project or folder.
-NewContainerWizardPage.error.ProjectClosed=Project ''{0}'' must be accessible.
-
-NewContainerWizardPage.warning.NotAJavaProject=Folder is not a Java project.
-NewContainerWizardPage.warning.NotInAJavaProject=Folder is not in a Java project.
-NewContainerWizardPage.warning.NotOnClassPath=Folder is not on the Java build class path.
-
-NewContainerWizardPage.ChooseSourceContainerDialog.title=Folder Selection
-NewContainerWizardPage.ChooseSourceContainerDialog.description=&Choose a folder:
-
-# ------- NewPackageWizardPage ------- 
-
-NewPackageCreationWizard.title=New Java Package
-
-NewPackageWizardPage.package.label=&Name:
-
-
-NewPackageWizardPage.error.InvalidPackageName=Invalid package name. {0}
-NewPackageWizardPage.error.IsOutputFolder=Name conflict with output folder.
-
-NewPackageWizardPage.error.PackageExists=Package already exists.
-NewPackageWizardPage.error.EnterName=Enter a package name.
-NewPackageWizardPage.warning.PackageNotShown=Package already exists. Note: Views might filter empty parent packages.
-NewPackageWizardPage.warning.DiscouragedPackageName=Discouraged package name. {0}
-
-NewPackageWizardPage.title=Java Package
-NewPackageWizardPage.description=Create a Java package.
-NewPackageWizardPage.info=Creates folders corresponding to packages.
-# ------- NewTypeWizardPage ------- 
-
-NewTypeWizardPage.package.label=Pac&kage:
-NewTypeWizardPage.package.button=Bro&wse...
-
-NewTypeWizardPage.enclosing.selection.label=Enclosing t&ype:
-NewTypeWizardPage.enclosing.button=Bro&wse...
-
-NewTypeWizardPage.error.InvalidPackageName=Package name is not valid. {0}
-NewTypeWizardPage.error.ClashOutputLocation=Package clashes with project output folder.
-NewTypeWizardPage.warning.DiscouragedPackageName=This package name is discouraged. {0}
-
-NewTypeWizardPage.default=(default)
-
-NewTypeWizardPage.ChoosePackageDialog.title=Package Selection
-NewTypeWizardPage.ChoosePackageDialog.description=&Choose a folder:
-NewTypeWizardPage.ChoosePackageDialog.empty=Cannot find packages to select.
-
-NewTypeWizardPage.ChooseEnclosingTypeDialog.title=Enclosing Type Selection
-NewTypeWizardPage.ChooseEnclosingTypeDialog.description=&Choose a type to which the new class will be added:
-
-NewTypeWizardPage.error.EnclosingTypeEnterName=Name of enclosing type must be entered.
-NewTypeWizardPage.error.EnclosingTypeNotExists=Enclosing type does not exist.
-NewTypeWizardPage.error.EnclosingNotInCU=Enclosing type is binary.
-NewTypeWizardPage.error.EnclosingNotEditable=Enclosing type is not editable.
-NewTypeWizardPage.warning.EnclosingNotInSourceFolder=Enclosing type is not in specified source folder.
-
-NewTypeWizardPage.typename.label=Na&me:
-
-NewTypeWizardPage.superclass.label=&Superclass:
-NewTypeWizardPage.superclass.button=Brows&e...
-
-NewTypeWizardPage.interfaces.class.label=&Interfaces:
-NewTypeWizardPage.interfaces.ifc.label=Extended &interfaces:
-NewTypeWizardPage.interfaces.add=&Add...
-NewTypeWizardPage.interfaces.remove=&Remove
-
-NewTypeWizardPage.modifiers.acc.label=Modifiers:
-NewTypeWizardPage.modifiers.public=&public
-NewTypeWizardPage.modifiers.private=pri&vate
-NewTypeWizardPage.modifiers.protected=pro&tected
-NewTypeWizardPage.modifiers.default=defa&ult
-NewTypeWizardPage.modifiers.abstract=abs&tract
-NewTypeWizardPage.modifiers.final=fina&l
-NewTypeWizardPage.modifiers.static=stati&c
-
-NewTypeWizardPage.error.EnterTypeName=Type name is empty.
-NewTypeWizardPage.error.TypeNameExists=Type already exists.
-NewTypeWizardPage.error.InvalidTypeName=Type name is not valid. {0}
-NewTypeWizardPage.error.QualifiedName=Type name must not be qualified.
-NewTypeWizardPage.warning.TypeNameDiscouraged=Type name is discouraged. {0}
-
-NewTypeWizardPage.error.InvalidSuperClassName=Superclass name is not valid.
-NewTypeWizardPage.warning.SuperClassNotExists=Warning: Superclass does not exist in current project.
-NewTypeWizardPage.warning.SuperClassIsFinal=Warning: Superclass ''{0}'' is final.
-NewTypeWizardPage.warning.SuperClassIsNotVisible=Warning: Superclass ''{0}'' is not visible.
-NewTypeWizardPage.warning.SuperClassIsNotClass=Warning: Superclass ''{0}'' is an interface.
-
-NewTypeWizardPage.warning.InterfaceIsNotVisible=Extended interface ''{0}'' is not visible.
-NewTypeWizardPage.warning.InterfaceNotExists=Extended interface ''{0}'' does not exist in current project.
-NewTypeWizardPage.warning.InterfaceIsNotInterface=Extended interface ''{0}'' is not an interface.
-
-NewTypeWizardPage.error.ModifiersFinalAndAbstract=Class cannot be both final and abstract
-
-NewTypeWizardPage.SuperClassDialog.title=Superclass Selection
-NewTypeWizardPage.SuperClassDialog.message=&Choose a type:
-
-NewTypeWizardPage.InterfacesDialog.class.title= Implemented Interfaces Selection
-NewTypeWizardPage.InterfacesDialog.interface.title= Extended Interfaces Selection
-NewTypeWizardPage.InterfacesDialog.message=&Choose interfaces:
-
-NewTypeWizardPage.operationdesc=Creating type....
-
 # -----------NewClassWizardPage -------------
+NewClassWizardPage.operationdesc=Creating type....
 NewClassWizardPage.classname.label=&Name:
 
 NewClassWizardPage.baseclass.label=&Base class:
@@ -164,9 +54,6 @@ CreateLinkedResourceGroup.linkTargetEmpty = Link target must be specified
 CreateLinkedResourceGroup.linkTargetInvalid = Link target name is invalid
 CreateLinkedResourceGroup.linkTargetNotAbsolute = Link target must be absolute path or path variable and relative path.
 
-
-
-
 NewClassWizardPage.error.EnterClassName=Class name is empty.
 NewClassWizardPage.error.ClassNameExists=Class already exists.
 NewClassWizardPage.error.InvalidClassName=Class name is not valid. {0}
@@ -198,240 +85,6 @@ BaseClassSelectionDialog.title=Choose Base Class
 BaseClassSelectionDialog.message=&Choose a class (? = any character, * = any string):
 BaseClassSelectionDialog.filter=
 
-# ------- NewClassWizardPage ------- 
-
-# these are UNUSED by the CDT
-# NewClassWizardPage.title=Java Class
-# NewClassWizardPage.description=Create a new Java class.
-# NewClassWizardPage.methods.label=Which method stubs would you like to create?
-# NewClassWizardPage.methods.main=public static void main(Strin&g[] args)
-# NewClassWizardPage.methods.constructors=&Constructors from superclass
-# NewClassWizardPage.methods.inherited=In&herited abstract methods
-
-
-# ------- NewInterfaceWizardPage -------
-
-NewInterfaceCreationWizard.title=New Java Interface
-
-NewInterfaceWizardPage.title=Java Interface
-NewInterfaceWizardPage.description=Create a new Java interface.
-
-# ------- JavaCapabilityWizard ------- 
-
-JavaCapabilityWizard.title=Configure Java Capability
-JavaCapabilityWizard.op_error.title=Error Configure Java Capability
-JavaCapabilityWizard.op_error.message=An error occurred while configuring the Java project
-
-# ------- JavaCapabilityConfigurationPage ------- 
-
-JavaCapabilityConfigurationPage.title=Java Settings
-JavaCapabilityConfigurationPage.description=Define the Java build settings.
-JavaCapabilityConfigurationPage.op_desc_java=Configuring Java project...
-
-
-# ------- NewProjectCreationWizard ------- 
-
-NewProjectCreationWizard.title=New Java Project
-NewProjectCreationWizard.op_error.title=Error Creating Java Project
-NewProjectCreationWizard.op_error_create.message=An error occurred while creating the Java project
-NewProjectCreationWizard.MainPage.title=Java Project
-NewProjectCreationWizard.MainPage.description=Create a new Java project.
-
-NewProjectCreationWizardPage.op_error.title=Error Creating Java Project
-NewProjectCreationWizardPage.op_error_remove.message=An error occurred while removing a temporary project
-NewProjectCreationWizardPage.EarlyCreationOperation.desc=Creating project and examining existing resources...
-NewProjectCreationWizardPage.EarlyCreationOperation.error.title=New Java Project
-NewProjectCreationWizardPage.EarlyCreationOperation.error.desc=An error occurred while creating project. Check log for details.
-NewProjectCreationWizardPage.createproject.desc=Creating project...
-NewProjectCreationWizardPage.removeproject.desc=Removing project...
-
-# ------- NewJavaProjectWizardPage------- 
-
-NewJavaProjectWizardPage.title=Java Settings
-NewJavaProjectWizardPage.description=Define the Java build settings.
-
-NewJavaProjectWizardPage.op_desc=Creating Java project...
-
-
-# ------- NewSourceFolderWizardPage-------
-
-NewSourceFolderCreationWizard.title=New Source Folder
-
-NewSourceFolderWizardPage.title=Source folder
-NewSourceFolderWizardPage.description=Add a new source folder
-
-NewSourceFolderWizardPage.root.label=Fol&der name:
-NewSourceFolderWizardPage.root.button=Br&owse...
-
-NewSourceFolderWizardPage.project.label=Project &name:
-NewSourceFolderWizardPage.project.button=Bro&wse...
-
-NewSourceFolderWizardPage.exclude.label=&Update exclusion filters in other source folders to solve nesting.
-
-NewSourceFolderWizardPage.ChooseExistingRootDialog.title=Existing Folder Selection
-NewSourceFolderWizardPage.ChooseExistingRootDialog.description=&Choose folder as source folder:
-
-NewSourceFolderWizardPage.ChooseProjectDialog.title=Project Selection
-NewSourceFolderWizardPage.ChooseProjectDialog.description=&Choose project for the new source folder:
-
-NewSourceFolderWizardPage.error.EnterRootName=Root name must be entered.
-NewSourceFolderWizardPage.error.InvalidRootName=Invalid folder name. {0}
-NewSourceFolderWizardPage.error.NotAFolder=Not a folder.
-NewSourceFolderWizardPage.error.AlreadyExisting=Already a source folder.
-
-NewSourceFolderWizardPage.error.EnterProjectName=Project name must be entered.
-NewSourceFolderWizardPage.error.InvalidProjectPath=Invalid project path.
-NewSourceFolderWizardPage.error.NotAJavaProject=Project is not a Java project.
-NewSourceFolderWizardPage.error.ProjectNotExists=Project does not exist.
-
-NewSourceFolderWizardPage.warning.ReplaceSFandOL=To avoid overlapping, the existing project source folder entry will be replaced and the output folder set to ''{0}''.
-NewSourceFolderWizardPage.warning.ReplaceOL=An exclusion pattern will be added to the project source folder entry and the output folder will be set to ''{0}''.
-NewSourceFolderWizardPage.warning.ReplaceSF=To avoid overlapping, the existing project source folder entry will be replaced.
-NewSourceFolderWizardPage.warning.AddedExclusions=Exclusion patterns of {0} source folder(s) updated to solve nesting.
-
-# ------- NewSnippetFileWizardPage------- 
-
-NewSnippetFileCreationWizard.title=New Scrapbook Page
-
-NewSnippetFileWizardPage.title=Create Java Scrapbook Page
-
-NewSnippetFileWizardPage.error.AlreadyExists=A resource with the specified path already exists.
-NewSnippetFileWizardPage.error.OnlyInJavaProject=The scrapbook page can only be created in a Java project.
-
-NewSnippetFileWizardPage.open_error.message=Error in NewScrapbookPage
-
-# ------- NewContainerDialog------- 
-
-NewContainerDialog.error.invalidpath=Invalid folder path: ''{0}''
-NewContainerDialog.error.enterpath=Folder name must be entered
-NewContainerDialog.error.pathexists=This folder is already in the list or it is an output folder.
-
-# ------- SourceAttachmentBlock------- 
-
-SourceAttachmentBlock.message=Select the location (folder, JAR or zip) containing the source for ''{0}'':
-SourceAttachmentBlock.filename.description=Source attachments for variable entries are defined by variable paths. The first segment of such a path describes a variable name, the rest is an optional path extension.
-
-SourceAttachmentBlock.filename.label=Lo&cation path:
-SourceAttachmentBlock.filename.externalfile.button=External &File...
-SourceAttachmentBlock.filename.externalfolder.button=External F&older...
-SourceAttachmentBlock.filename.internal.button=&Workspace...
-
-SourceAttachmentBlock.filename.varlabel=Lo&cation variable path:
-SourceAttachmentBlock.filename.variable.button=&Variable...
-SourceAttachmentBlock.filename.external.varbutton=&Extension....
-
-SourceAttachmentBlock.filename.error.notvalid=The archive path is not a valid path.
-SourceAttachmentBlock.filename.error.filenotexists=The path ''{0}'' does not exist.
-SourceAttachmentBlock.filename.error.varnotexists=Variable in the location path does not exist.
-SourceAttachmentBlock.filename.error.deviceinpath=Location must be described a variable path.
-SourceAttachmentBlock.filename.warning.varempty=Location variable path is empty.
-
-SourceAttachmentBlock.intjardialog.title=Source Location Selection
-SourceAttachmentBlock.intjardialog.message=&Select folder or JAR/zip archive containing the source:
-
-SourceAttachmentBlock.extvardialog.title=Variable Extension Selection
-SourceAttachmentBlock.extvardialog.description=Select source location:
-
-SourceAttachmentBlock.extjardialog.text=JAR/ZIP File Selection
-SourceAttachmentBlock.extfolderdialog.text=Folder Selection
-
-SourceAttachmentBlock.putoncpdialog.title=Setting Source Attachment
-SourceAttachmentBlock.putoncpdialog.message=Source can only be attached to libraries on the build path.\nDo you want to add the library to the build path?
-
-SourceAttachmentDialog.title=Source Attachment Configuration
-SourceAttachmentDialog.error.title=Error Attaching Source
-SourceAttachmentDialog.error.message=An error occurred while associating the source.
-
-# ------- EditVariableEntryDialog ------- 
-
-EditVariableEntryDialog.filename.varlabel=Edit classpath variable entry:
-EditVariableEntryDialog.filename.variable.button=&Variable...
-EditVariableEntryDialog.filename.external.varbutton=&Extension....
-
-EditVariableEntryDialog.extvardialog.title=Variable Extension Selection
-EditVariableEntryDialog.extvardialog.description=Select JAR archive:
-
-EditVariableEntryDialog.filename.error.notvalid=The archive path is not a valid path.
-EditVariableEntryDialog.filename.error.filenotexists=The path ''{0}'' does not point to an existing archive.
-EditVariableEntryDialog.filename.error.varnotexists=Variable in the archive path does not exist.
-EditVariableEntryDialog.filename.error.deviceinpath=The archive has to be described by a variable path.
-EditVariableEntryDialog.filename.warning.varempty=Archive variable path is empty.
-EditVariableEntryDialog.filename.error.alreadyexists=Classpath entry already exists.
-
-
-# ------- VariableBlock------- 
-
-VariableBlock.vars.label=Defined &classpath variables:
-VariableBlock.vars.add.button=Ne&w...
-VariableBlock.vars.edit.button=&Edit...
-VariableBlock.vars.remove.button=&Remove
-VariableBlock.operation_desc=Setting classpath variables...
-
-VariableBlock.operation_errror.title=Classpath Variables
-VariableBlock.operation_errror.message=Problem while setting classpath variable. See log for details.
-
-VariableBlock.needsbuild.title=Classpath Variables Changed
-VariableBlock.needsbuild.message=The classpath variables have changed. A full rebuild is recommended to make changes effective. Do the full build now?
-
-VariablePathDialogField.variabledialog.title=Variable Selection
-
-CPVariableElementLabelProvider.reserved=(reserved)
-CPVariableElementLabelProvider.empty=(empty)
-
-# ------- VariableCreationDialog------- 
-
-VariableCreationDialog.titlenew=New Variable Entry
-VariableCreationDialog.titleedit=Edit Variable Entry
-	
-VariableCreationDialog.name.label=&Name:
-VariableCreationDialog.path.label=&Path:
-VariableCreationDialog.path.file.button=&File...
-VariableCreationDialog.path.dir.button=F&older...
-
-VariableCreationDialog.error.entername=Variable name must be entered.
-VariableCreationDialog.error.invalidname=Invalid name: ''{0}''.
-VariableCreationDialog.error.nameexists=Variable name already exists.
-VariableCreationDialog.error.invalidpath=The path is invalid.
-
-VariableCreationDialog.warning.pathnotexists=Path does not exist.
-
-
-VariableCreationDialog.extjardialog.text=JAR Selection
-VariableCreationDialog.extdirdialog.text=Folder Selection
-VariableCreationDialog.extdirdialog.message=&Specify folder to be represented by the variable:
-
-# ------- NewVariableEntryDialog ------- 
-NewVariableEntryDialog.vars.extend=E&xtend...
-NewVariableEntryDialog.vars.config=&Edit...
-
-NewVariableEntryDialog.vars.label=Select &variables to add to build path:
-
-NewVariableEntryDialog.ExtensionDialog.title=Variable Extension
-NewVariableEntryDialog.ExtensionDialog.description=Choose extensions to ''{0}''.
-
-NewVariableEntryDialog.info.isfolder=Variable points to a folder: Click 'extend' to choose an archive inside the folder.
-NewVariableEntryDialog.info.noselection=Select variable(s) to add to the classpath.
-NewVariableEntryDialog.info.selected={0} variables selected.
-
-# ------- OutputLocationDialog ------- 
-
-OutputLocationDialog.title=Source Folder Output Location
-
-OutputLocationDialog.usedefault.label=Project's default output folder.
-OutputLocationDialog.usespecific.label=Specific output folder (path relative to ''{0}'').
-OutputLocationDialog.location.button=Bro&wse...
-
-OutputLocationDialog.error.existingisfile=Location is an existing file
-OutputLocationDialog.error.invalidpath=Invalid path: {0}
-
-OutputLocationDialog.ChooseOutputFolder.title=Folder Selection
-OutputLocationDialog.ChooseOutputFolder.description=&Choose the folder for the build output:
-
-# ------- ClasspathContainerWizard------- 
-
-ClasspathContainerWizard.pagecreationerror.title= Library Wizard
-ClasspathContainerWizard.pagecreationerror.message=Wizard page creation failed. Check log for details.
-
 # --- New File ---
 WizardNewFileCreationPage.progress = Creating
 WizardNewFileCreationPage.errorTitle = Creation Problems
@@ -440,3 +93,7 @@ WizardNewFileCreationPage.file = file
 WizardNewFileCreationPage.internalErrorTitle = Creation problems
 WizardNewFileCreationPage.internalErrorMessage = Internal error: {0}
 WizardNewFileCreationPage.fileExistsMessage = A file ''{0}'' already exists in the file system.
+
+# ----------- SourceFolderSelectionDialog -------------
+SourceFolderSelectionDialog.title= Folder Selection
+SourceFolderSelectionDialog.description= &Choose a source folder:

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/SourceFolderSelectionDialog.java

@@ -6,13 +6,13 @@
  * 
  * Contributors: QNX Software Systems - initial API and implementation
  ******************************************************************************/
-package org.eclipse.cdt.internal.ui.wizards.classwizard;
+package org.eclipse.cdt.internal.ui.wizards;
 
 import org.eclipse.cdt.core.model.ICContainer;
 import org.eclipse.cdt.core.model.ICModel;
 import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.internal.ui.wizards.TypedElementSelectionValidator;
+import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
-import org.eclipse.cdt.internal.ui.wizards.TypedViewerFilter;
+import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
 import org.eclipse.cdt.ui.CElementContentProvider;
 import org.eclipse.cdt.ui.CElementLabelProvider;
 import org.eclipse.cdt.ui.CElementSorter;
@@ -61,7 +61,7 @@ public class SourceFolderSelectionDialog extends ElementTreeSelectionDialog {
         setValidator(fValidator);
         setSorter(fSorter);
         addFilter(fFilter);
-        setTitle(NewClassWizardMessages.getString("NewClassCreationWizardPage.ChooseSourceFolderDialog.title")); //$NON-NLS-1$
+        setTitle(NewWizardMessages.getString("SourceFolderSelectionDialog.title")); //$NON-NLS-1$
-        setMessage(NewClassWizardMessages.getString("NewClassCreationWizardPage.ChooseSourceFolderDialog.description")); //$NON-NLS-1$
+        setMessage(NewWizardMessages.getString("SourceFolderSelectionDialog.description")); //$NON-NLS-1$
     }
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java

@@ -32,6 +32,7 @@ import org.eclipse.cdt.internal.ui.CElementAdapterFactory;
 import org.eclipse.cdt.internal.ui.ICStatusConstants;
 import org.eclipse.cdt.internal.ui.IContextMenuConstants;
 import org.eclipse.cdt.internal.ui.ResourceAdapterFactory;
+import org.eclipse.cdt.internal.ui.browser.typehierarchy.ITypeHierarchyViewPart;
 import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager;
 import org.eclipse.cdt.internal.ui.editor.CDocumentProvider;
 import org.eclipse.cdt.internal.ui.editor.CustomBufferFactory;
@@ -51,7 +52,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
@@ -69,9 +69,7 @@ import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.internal.IWorkbenchConstants;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 import org.eclipse.ui.texteditor.ConfigurationElementSorter;
@@ -93,9 +91,7 @@ public class CUIPlugin extends AbstractUIPlugin {
 	public final static String CWIZARD_CATEGORY_ID = "org.eclipse.cdt.ui.newCWizards"; //$NON-NLS-1$
 	public final static String CCWIZARD_CATEGORY_ID = "org.eclipse.cdt.ui.newCCWizards"; //$NON-NLS-1$
 	
-	public static final String FILE_WIZARD_ID = "org.eclipse.ui.wizards.new.file"; //$NON-NLS-1$
+	public static final String FOLDER_WIZARD_ID = "org.eclipse.cdt.ui.wizards.NewFolderCreationWizard"; //$NON-NLS-1$
-	public static final String FOLDER_WIZARD_ID = "org.eclipse.ui.wizards.new.folder"; //$NON-NLS-1$
-	public static final String CLASS_WIZARD_ID = "org.eclipse.cdt.ui.wizards.NewClassWizard"; //$NON-NLS-1$
 	public static final String SEARCH_ACTION_SET_ID = PLUGIN_ID + ".SearchActionSet"; //$NON-NLS-1$
 	public static final String BUILDER_ID = PLUGIN_CORE_ID + ".cbuilder"; //$NON-NLS-1$
 
@@ -668,52 +664,6 @@ public class CUIPlugin extends AbstractUIPlugin {
 		fCEditorTextHoverDescriptors= null;
 	}
 
-	private final static String TAG_WIZARD = "wizard"; //$NON-NLS-1$
-	private final static String ATT_CATEGORY = "category";//$NON-NLS-1$
-	private final static String ATT_PROJECT = "project";//$NON-NLS-1$
-	
-	/**
-	 * Returns IDs of all C project wizards contributed to the workbench.
-	 * 
-	 * @return an array of wizard ids
-	 */
-	public static String[] getCProjectWizardIDs() {
-	    ArrayList CActions = new ArrayList();
-	    ArrayList CCActions = new ArrayList();
-
-	    IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(PlatformUI.PLUGIN_ID, IWorkbenchConstants.PL_NEW);
-		if (extensionPoint != null) {
-			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				IConfigurationElement element= elements[i];
-				if (element.getName().equals(TAG_WIZARD)) {
-				    String category = element.getAttribute(ATT_CATEGORY);
-				    if (category != null && (category.equals(CUIPlugin.CCWIZARD_CATEGORY_ID)
-				        	|| category.equals(CUIPlugin.CWIZARD_CATEGORY_ID))) {
-					    String project = element.getAttribute(ATT_PROJECT);
-					    if (project != null && Boolean.valueOf(project).booleanValue()) {
-				            String id = element.getAttribute(IWorkbenchConstants.TAG_ID);
-				            if (id != null) {
-				                if (category.equals(CUIPlugin.CWIZARD_CATEGORY_ID)) {
-				                    if (!CActions.contains(id))
-					                    CActions.add(id);
-				                } else {
-				                    if (!CCActions.contains(id))
-				                        CCActions.add(id);
-				                }
-				            }
-				        }
-				    }
-				}
-			}
-		}
-		
-		//TODO: check for duplicate actions
-		// show C actions, then C++ Actions
-		CActions.addAll(CCActions);
-		return (String[]) CActions.toArray(new String[CActions.size()]);
-	}
-
 	/**
 	 * Returns the registry of the extensions to the <code>org.eclipse.jdt.ui.javaFoldingStructureProvider</code>
 	 * extension point.