Bug 446418 - Update org.eclipse.pde.ui.templates to Java 1.6

Adds the @Override annotations to the classes Change-Id: I2123ff020763f600f64e2a49c6fbaffeea94a495 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
author: Lars Vogel 2014-10-08 17:05:56 +0000
committer: Vikas Chandra 2014-11-07 08:55:10 +0000
commit: 7190e4a854d543f301f51e616476800f003c7cfe (patch)
tree: 7a3003a606ae025a950bd522af3005ae00542491
parent: e07ca90978c9b63bff02237111e190179716a242 (diff)
download: eclipse.pde.ui-7190e4a854d543f301f51e616476800f003c7cfe.tar.gz
eclipse.pde.ui-7190e4a854d543f301f51e616476800f003c7cfe.tar.xz
eclipse.pde.ui-7190e4a854d543f301f51e616476800f003c7cfe.zip
51 files changed, 347 insertions, 0 deletions
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java
index 3d0f894792..c36e10fcea 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/Activator.java
@@ -35,11 +35,13 @@ public class Activator extends AbstractUIPlugin {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		fInstance = this;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		fInstance = null;
 		super.stop(context);
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
index 14619f5347..6e2bbad6ff 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateSection.java
@@ -28,15 +28,18 @@ public abstract class PDETemplateSection extends OptionTemplateSection {
 	public static final String VALUE_PERSPECTIVE_NAME = "RCP Perspective"; //$NON-NLS-1$
 	public static final String VALUE_APPLICATION_ID = "application"; //$NON-NLS-1$
 
+	@Override
 	protected ResourceBundle getPluginResourceBundle() {
 		Bundle bundle = Platform.getBundle(Activator.getPluginId());
 		return Platform.getResourceBundle(bundle);
 	}
 
+	@Override
 	protected URL getInstallURL() {
 		return Activator.getDefault().getInstallURL();
 	}
 
+	@Override
 	public URL getTemplateLocation() {
 		try {
 			String[] candidates = getDirectoryCandidates();
@@ -74,6 +77,7 @@ public abstract class PDETemplateSection extends OptionTemplateSection {
 	/* (non-Javadoc)
 	* @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
 	*/
+	@Override
 	public String[] getNewFiles() {
 		return new String[0];
 	}
@@ -93,6 +97,7 @@ public abstract class PDETemplateSection extends OptionTemplateSection {
 		return buffer.toString().toLowerCase(Locale.ENGLISH);
 	}
 
+	@Override
 	protected void generateFiles(IProgressMonitor monitor) throws CoreException {
 		super.generateFiles(monitor);
 		// Copy the default splash screen if the branding option is selected
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java
index a06aec4f0f..406d71d6d0 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BaseEditorTemplate.java
@@ -14,6 +14,7 @@ import org.eclipse.pde.internal.ui.templates.PDETemplateSection;
 
 public abstract class BaseEditorTemplate extends PDETemplateSection {
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.editors"; //$NON-NLS-1$
 	}
@@ -21,6 +22,7 @@ public abstract class BaseEditorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java
index b18a92c104..4d78331f18 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderNewWizard.java
@@ -27,6 +27,7 @@ public class BuilderNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.BuilderNewWizard_wtitle);
@@ -37,6 +38,7 @@ public class BuilderNewWizard extends NewPluginTemplateWizard {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new BuilderTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
index 24c52b3e5f..27f4c7cb40 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/BuilderTemplate.java
@@ -52,6 +52,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	 *
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "builder"; //$NON-NLS-1$
 	}
@@ -59,6 +60,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -77,6 +79,7 @@ public class BuilderTemplate extends PDETemplateSection {
 		actionOption = (BooleanOption) addOption(KEY_GEN_ACTION, PDETemplateMessages.BuilderTemplate_generateCommand, true, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_BUILDER);
 		page.setTitle(PDETemplateMessages.BuilderTemplate_title);
@@ -85,10 +88,12 @@ public class BuilderTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -96,6 +101,7 @@ public class BuilderTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so
 		// we can initialize directly from it
@@ -108,10 +114,12 @@ public class BuilderTemplate extends PDETemplateSection {
 	 *
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.core.resources.builders"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginModelFactory factory = model.getPluginFactory();
@@ -302,6 +310,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	 *
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
@@ -319,6 +328,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	 *
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
@@ -329,6 +339,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#isOkToCreateFile(File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 		String fileName = sourceFile.getName();
 		if (fileName.equals("AddRemove$natureClassName$Handler.java")) { //$NON-NLS-1$
@@ -343,6 +354,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getLabel()
 	 */
+	@Override
 	public String getLabel() {
 		return getPluginResourceString("newExtension.templates.builder.name"); //$NON-NLS-1$
 	}
@@ -350,6 +362,7 @@ public class BuilderTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getDescription()
 	 */
+	@Override
 	public String getDescription() {
 		return getPluginResourceString("newExtension.templates.builder.desc"); //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
index d6df37f843..e6db2239ac 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/CommonNavigatorTemplate.java
@@ -49,6 +49,7 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "commonNavigator"; //$NON-NLS-1$
 	}
@@ -56,6 +57,7 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		plugin = model.getPluginBase();
 		factory = model.getPluginFactory();
@@ -153,6 +155,7 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[0];
 	}
@@ -160,6 +163,7 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.navigator.CommonNavigator"; //$NON-NLS-1$
 	}
@@ -167,6 +171,7 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
 	 */
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page0 = createPage(0);
 		page0.setTitle(PDETemplateMessages.CommonNavigatorTemplate_pagetitle);
@@ -179,6 +184,7 @@ public class CommonNavigatorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java
index 2ce8118afd..8e6c23d997 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/DecoratorTemplate.java
@@ -55,6 +55,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		// Additional dependency required to decorate resource objects
 		if (schemaVersion != null) {
@@ -69,6 +70,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getDirectoryCandidates()
 	 */
+	@Override
 	public String getSectionId() {
 		// Identifier used for the folder name within the templates_3.X
 		// hierarchy  and as part of the lookup key for the template label
@@ -79,6 +81,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -105,6 +108,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
 	 */
+	@Override
 	public void addPages(Wizard wizard) {
 		int pageIndex = 0;
 
@@ -125,6 +129,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFolder(java.io.File)
 	 */
+	@Override
 	protected boolean isOkToCreateFolder(File sourceFolder) {
 		//Define rules for creating folders from the Templates_3.X folders
 		boolean isOk = true;
@@ -138,6 +143,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFile(java.io.File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 		//Define rules for creating files from the Templates_3.X folders
 		boolean isOk = true;
@@ -155,6 +161,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
 	 */
+	@Override
 	public void validateOptions(TemplateOption source) {
 		if (source == readOnlyOption) {
 			alterOptionStates();
@@ -165,6 +172,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -172,6 +180,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -182,6 +191,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
 	 */
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -192,6 +202,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		// This method creates the extension point structure through the use
 		// of IPluginElement objects. The element attributes are set based on
@@ -261,6 +272,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
@@ -268,6 +280,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		// Package name addition to create a location for containing
 		// any classes required by the decorator. 
@@ -280,6 +293,7 @@ public class DecoratorTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.decorators"; //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java
index 0471c6f2ee..d8c48a05af 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorNewWizard.java
@@ -23,6 +23,7 @@ public class EditorNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.EditorNewWizard_wtitle);
@@ -31,6 +32,7 @@ public class EditorNewWizard extends NewPluginTemplateWizard {
 	/*
 	 * @see NewExtensionTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new EditorTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java
index 4e2ba097e2..dcc5dcfe4e 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/EditorTemplate.java
@@ -42,6 +42,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		if (schemaVersion != null) {
 			IPluginReference[] dep = new IPluginReference[4];
@@ -54,6 +55,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 		return super.getDependencies(schemaVersion);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_EDITOR);
 		page.setTitle(PDETemplateMessages.EditorTemplate_title);
@@ -72,6 +74,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 				0);
 	}
 
+	@Override
 	public String getSectionId() {
 		return "editor"; //$NON-NLS-1$
 	}
@@ -79,10 +82,12 @@ public class EditorTemplate extends BaseEditorTemplate {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -90,6 +95,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -97,6 +103,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -104,6 +111,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 	/**
 	 * @see GenericTemplateSection#validateOptions(TemplateOption)
 	 */
+	@Override
 	public void validateOptions(TemplateOption source) {
 		if (source.isRequired() && source.isEmpty()) {
 			flagMissingRequiredOption(source);
@@ -124,6 +132,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 		resetPageState();
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
@@ -149,6 +158,7 @@ public class EditorTemplate extends BaseEditorTemplate {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java
index 0d37401119..e8c40022e8 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdNewWizard.java
@@ -24,6 +24,7 @@ public class HelloWorldCmdNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelloWorldCmdNewWizard_wtitle);
@@ -32,6 +33,7 @@ public class HelloWorldCmdNewWizard extends NewPluginTemplateWizard {
 	/*
 	 * @see NewExtensionTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloWorldCmdTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java
index cdbd444e3f..b5c1bb1f3c 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldCmdTemplate.java
@@ -39,6 +39,7 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public String getSectionId() {
 		return "helloWorldCmd"; //$NON-NLS-1$
 	}
@@ -46,6 +47,7 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -56,6 +58,7 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 		addOption(KEY_MESSAGE, PDETemplateMessages.HelloWorldCmdTemplate_messageText, PDETemplateMessages.HelloWorldCmdTemplate_defaultMessage, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELLO_WORLD);
 		page.setTitle(PDETemplateMessages.HelloWorldCmdTemplate_title);
@@ -64,10 +67,12 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -75,6 +80,7 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so
 		// we can initialize directly from it
@@ -82,10 +88,12 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.commands"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension commandsExtension = createExtension("org.eclipse.ui.commands", true); //$NON-NLS-1$
@@ -185,6 +193,7 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
@@ -194,6 +203,7 @@ public class HelloWorldCmdTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java
index 65edf75507..e0ef129ec8 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldNewWizard.java
@@ -24,6 +24,7 @@ public class HelloWorldNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelloWorldNewWizard_wtitle);
@@ -32,6 +33,7 @@ public class HelloWorldNewWizard extends NewPluginTemplateWizard {
 	/*
 	 * @see NewExtensionTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloWorldTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java
index 2026aba342..dbfbaeb297 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelloWorldTemplate.java
@@ -37,6 +37,7 @@ public class HelloWorldTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public String getSectionId() {
 		return "helloWorld"; //$NON-NLS-1$
 	}
@@ -44,6 +45,7 @@ public class HelloWorldTemplate extends PDETemplateSection {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -54,6 +56,7 @@ public class HelloWorldTemplate extends PDETemplateSection {
 		addOption(KEY_MESSAGE, PDETemplateMessages.HelloWorldTemplate_messageText, PDETemplateMessages.HelloWorldTemplate_defaultMessage, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELLO_WORLD);
 		page.setTitle(PDETemplateMessages.HelloWorldTemplate_title);
@@ -62,10 +65,12 @@ public class HelloWorldTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -73,6 +78,7 @@ public class HelloWorldTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -80,10 +86,12 @@ public class HelloWorldTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.actionSets"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension("org.eclipse.ui.actionSets", true); //$NON-NLS-1$
@@ -126,6 +134,7 @@ public class HelloWorldTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
@@ -133,6 +142,7 @@ public class HelloWorldTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java
index 7b72eb942c..04eb77ff3f 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpNewWizard.java
@@ -17,11 +17,13 @@ import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
 
 public class HelpNewWizard extends NewPluginTemplateWizard {
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelpNewWizard_wiz);
 	}
 
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelpTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java
index 2a4dc96145..242e4e73bf 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java
@@ -53,6 +53,7 @@ public class HelpTemplate extends PDETemplateSection {
 		alterOptionStates();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELP);
 		page.setTitle(PDETemplateMessages.HelpTemplate_title);
@@ -92,10 +93,12 @@ public class HelpTemplate extends PDETemplateSection {
 	/**
 	 * @see OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "help"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected boolean isOkToCreateFolder(File sourceFolder) {
 		boolean isOk = true;
 		String folderName = sourceFolder.getName();
@@ -116,6 +119,7 @@ public class HelpTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#isOkToCreateFile(File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 		boolean isOk = true;
 		String fileName = sourceFile.getName();
@@ -141,6 +145,7 @@ public class HelpTemplate extends PDETemplateSection {
 	/**
 	 * @see BaseOptionTemplateSection#validateOptions(TemplateOption)
 	 */
+	@Override
 	public void validateOptions(TemplateOption changed) {
 		if (changed == tocLabelOption) {
 			if (changed.isEmpty()) {
@@ -156,6 +161,7 @@ public class HelpTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#updateModel(IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
@@ -197,6 +203,7 @@ public class HelpTemplate extends PDETemplateSection {
 	/**
 	 * @see ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.help.toc"; //$NON-NLS-1$
 	}
@@ -204,6 +211,7 @@ public class HelpTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
@@ -211,6 +219,7 @@ public class HelpTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFoldersToInclude()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"html/", "*.xml"}; //$NON-NLS-1$ //$NON-NLS-2$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java
index d331971e77..bdbbc4f3e2 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ImportWizardTemplate.java
@@ -48,6 +48,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		// Additional dependency required to provide WizardNewFileCreationPage
 		if (schemaVersion != null) {
@@ -63,6 +64,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getDirectoryCandidates()
 	 */
+	@Override
 	public String getSectionId() {
 		// Identifier used for the folder name within the templates_3.X
 		// hierarchy  and as part of the lookup key for the template label
@@ -73,6 +75,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -102,6 +105,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
 	 */
+	@Override
 	public void addPages(Wizard wizard) {
 		int pageIndex = 0;
 
@@ -116,6 +120,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -123,6 +128,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -133,6 +139,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
 	 */
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -143,6 +150,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		// This method creates the extension point structure through the use
 		// of IPluginElement objects. The element attributes are set based on
@@ -179,6 +187,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
@@ -186,6 +195,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		// Package name addition to create a location for containing
 		// any classes required by the decorator. 
@@ -198,6 +208,7 @@ public class ImportWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.importWizards"; //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java
index 4f14d0ae7c..2f2282d2a0 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorNewWizard.java
@@ -24,6 +24,7 @@ public class MultiPageEditorNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.MultiPageEditorNewWizard_wtitle);
@@ -32,6 +33,7 @@ public class MultiPageEditorNewWizard extends NewPluginTemplateWizard {
 	/*
 	 * @see NewExtensionTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new MultiPageEditorTemplate(), new NewWizardTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java
index 851f187c2f..1be5d2f434 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/MultiPageEditorTemplate.java
@@ -35,10 +35,12 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 		createOptions();
 	}
 
+	@Override
 	public String getSectionId() {
 		return "multiPageEditor"; //$NON-NLS-1$
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		if (schemaVersion != null) {
 			IPluginReference[] dep = new IPluginReference[6];
@@ -56,6 +58,7 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -76,6 +79,7 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 				0);
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -83,6 +87,7 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -90,10 +95,12 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_MULTIPAGE_EDITOR);
 		page.setTitle(PDETemplateMessages.MultiPageEditorTemplate_title);
@@ -102,6 +109,7 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 		markPagesAdded();
 	}
 
+	@Override
 	public void validateOptions(TemplateOption source) {
 		if (source.isRequired() && source.isEmpty()) {
 			flagMissingRequiredOption(source);
@@ -122,6 +130,7 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 		resetPageState();
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension("org.eclipse.ui.editors", true); //$NON-NLS-1$
@@ -148,6 +157,7 @@ public class MultiPageEditorTemplate extends BaseEditorTemplate {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
index bd06aa6323..d3b19e04c6 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/NewWizardTemplate.java
@@ -37,6 +37,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public String getSectionId() {
 		return "newWizard"; //$NON-NLS-1$
 	}
@@ -44,6 +45,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -60,6 +62,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 		addOption("initialFileName", PDETemplateMessages.NewWizardTemplate_fileName, "new_file.mpe", 0); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -68,6 +71,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 		initializeOption("categoryId", id); //$NON-NLS-1$
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -79,6 +83,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
@@ -90,10 +95,12 @@ public class NewWizardTemplate extends PDETemplateSection {
 		return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_NEW_WIZARD);
 		page.setTitle(PDETemplateMessages.NewWizardTemplate_title);
@@ -102,10 +109,12 @@ public class NewWizardTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.newWizards"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension("org.eclipse.ui.newWizards", true); //$NON-NLS-1$
@@ -151,6 +160,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFoldersToInclude()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
@@ -158,6 +168,7 @@ public class NewWizardTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java
index 8774edd9ae..0f4aefcb3e 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PerspectiveTemplate.java
@@ -48,6 +48,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		// Additional dependencies required
 		if (schemaVersion != null) {
@@ -63,6 +64,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getDirectoryCandidates()
 	 */
+	@Override
 	public String getSectionId() {
 		return "perspective"; //$NON-NLS-1$
 	}
@@ -70,6 +72,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -95,6 +98,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
 	 */
+	@Override
 	public void addPages(Wizard wizard) {
 		int pageIndex = 0;
 
@@ -109,6 +113,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -116,6 +121,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -126,6 +132,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
 	 */
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -136,6 +143,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		// This method creates the extension point structure through the use
 		// of IPluginElement objects. The element attributes are set based on
@@ -160,6 +168,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/"}; //$NON-NLS-1$
 	}
@@ -167,6 +176,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		// Package name addition to create a location for containing
 		// any classes required by the decorator. 
@@ -179,6 +189,7 @@ public class PerspectiveTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.perspectives"; //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java
index ca53208520..f9323abe7e 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuNewWizard.java
@@ -23,6 +23,7 @@ public class PopupMenuNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.PopupMenuNewWizard_wtitle);
@@ -31,6 +32,7 @@ public class PopupMenuNewWizard extends NewPluginTemplateWizard {
 	/**
 	 * @see NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new PopupMenuTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java
index 5f81027374..f39b4a8da1 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PopupMenuTemplate.java
@@ -44,6 +44,7 @@ public class PopupMenuTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_POPUP_MENU);
 		page.setTitle(PDETemplateMessages.PopupMenuTemplate_title);
@@ -67,14 +68,17 @@ public class PopupMenuTemplate extends PDETemplateSection {
 	/**
 	 * @see PDETemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "popupMenus"; //$NON-NLS-1$
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -82,6 +86,7 @@ public class PopupMenuTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -92,6 +97,7 @@ public class PopupMenuTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#updateModel(IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
@@ -138,6 +144,7 @@ public class PopupMenuTemplate extends PDETemplateSection {
 	/**
 	 * @see ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.popupMenus"; //$NON-NLS-1$
 	}
@@ -145,6 +152,7 @@ public class PopupMenuTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
@@ -152,6 +160,7 @@ public class PopupMenuTemplate extends PDETemplateSection {
 		return "popup.actions"; //$NON-NLS-1$
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		IPluginReference[] result = new IPluginReference[2];
 		result[0] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java
index 6537a5fb3d..9ccef9219b 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PreferencePageTemplate.java
@@ -28,6 +28,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public String getSectionId() {
 		return "preferences"; //$NON-NLS-1$
 	}
@@ -35,6 +36,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -47,6 +49,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 		addOption(KEY_PAGE_NAME, PDETemplateMessages.PreferencePageTemplate_pageName, PDETemplateMessages.PreferencePageTemplate_defaultPageName, 0);
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -54,6 +57,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -61,11 +65,13 @@ public class PreferencePageTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
 	}
 
+	@Override
 	protected String getTemplateDirectory() {
 		String schemaVersion = model.getPluginBase().getSchemaVersion();
 		return "templates_" + (schemaVersion == null ? "3.0" : schemaVersion); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -73,6 +79,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		if (schemaVersion == null)
 			return super.getDependencies(schemaVersion);
@@ -82,6 +89,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 		return deps;
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_PREFERENCE_PAGE);
 		page.setTitle(PDETemplateMessages.PreferencePageTemplate_title);
@@ -90,10 +98,12 @@ public class PreferencePageTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.preferencePages"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
@@ -122,6 +132,7 @@ public class PreferencePageTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java
index deeae76c8e..785b6235e0 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageNewWizard.java
@@ -23,6 +23,7 @@ public class PropertyPageNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.PropertyPageNewWizard_wtitle);
@@ -31,6 +32,7 @@ public class PropertyPageNewWizard extends NewPluginTemplateWizard {
 	/**
 	 * @see NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new PropertyPageTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
index dcf1403ddb..75d45863bc 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/PropertyPageTemplate.java
@@ -35,6 +35,7 @@ public class PropertyPageTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_PROPERTY_PAGE);
 		page.setTitle(PDETemplateMessages.PropertyPageTemplate_title);
@@ -57,14 +58,17 @@ public class PropertyPageTemplate extends PDETemplateSection {
 	/**
 	 * @see PDETemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "propertyPages"; //$NON-NLS-1$
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -72,6 +76,7 @@ public class PropertyPageTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -82,6 +87,7 @@ public class PropertyPageTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#updateModel(IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
@@ -115,6 +121,7 @@ public class PropertyPageTemplate extends PDETemplateSection {
 	/**
 	 * @see ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.propertyPages"; //$NON-NLS-1$
 	}
@@ -122,6 +129,7 @@ public class PropertyPageTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
@@ -135,6 +143,7 @@ public class PropertyPageTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java
index ee6f1403d2..1d1efeade0 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/SplashHandlersTemplate.java
@@ -81,6 +81,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
 	 */
+	@Override
 	public void addPages(Wizard wizard) {
 		// Create the page
 		fPage = createPage(0, IHelpContextIds.TEMPLATE_SPLASH_HANDLERS);
@@ -95,6 +96,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getFormattedPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		// Package name addition to create a location for containing
 		// any classes required by the splash handlers. 
@@ -110,6 +112,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		// Note:  This does not even get called for non-project templates
 		// As a result, listed files are not added to the binary build 
@@ -131,6 +134,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -138,6 +142,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	protected void initializeFields(IFieldData data) {
 		String id = data.getId();
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
@@ -146,6 +151,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#initializeFields(org.eclipse.pde.core.plugin.IPluginModelBase)
 	 */
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		String pluginId = model.getPluginBase().getId();
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
@@ -154,6 +160,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -161,6 +168,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
 	 */
+	@Override
 	public void validateOptions(TemplateOption source) {
 		// Update class name
 		if (source == fFieldTemplate) {
@@ -262,6 +270,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		// Ensure schema version was defined
 		if (schemaVersion == null) {
@@ -280,6 +289,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return ISplashHandlerConstants.F_UNQUALIFIED_EXTENSION_ID;
 	}
@@ -287,6 +297,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		// Create the action to update the model with the associated 
 		// splash handler extensions, extension points, elements and attributes
@@ -322,6 +333,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return ISplashHandlerConstants.F_SPLASH_HANDLERS_EXTENSION;
 	}
@@ -329,6 +341,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFile(java.io.File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 		// TODO: MP: SPLASH:  Sync this with org.eclipse.pde.internal.ui.util.TemplateFileGenerator
 		String javaSuffix = ".java"; //$NON-NLS-1$
@@ -345,6 +358,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#copyBrandingDirectory()
 	 */
+	@Override
 	protected boolean copyBrandingDirectory() {
 		return isSplashFieldSelected();
 	}
@@ -352,6 +366,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#isOkToCreateFolder(java.io.File)
 	 */
+	@Override
 	protected boolean isOkToCreateFolder(File sourceFolder) {
 		// TODO: MP: SPLASH:  Sync this with org.eclipse.pde.internal.ui.util.TemplateFileGenerator
 		boolean extensibleTemplateSelected = UpdateSplashHandlerAction.isExtensibleTemplateSelected((String) fFieldTemplate.getValue());
@@ -369,6 +384,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getLabel()
 	 */
+	@Override
 	public String getLabel() {
 		return getPluginResourceString("wizard.name.splash.handler"); //$NON-NLS-1$
 	}
@@ -376,6 +392,7 @@ public class SplashHandlersTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getDescription()
 	 */
+	@Override
 	public String getDescription() {
 		return getPluginResourceString("wizard.description.splash.handler"); //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
index 7cdecae908..59aa8aea01 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/UniversalWelcomeTemplate.java
@@ -58,6 +58,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 		addOption(KEY_LINK_URL, PDETemplateMessages.UniversalWelcomeTemplate_linkUrl, "http://www.eclipse.org", 0); //$NON-NLS-1$
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_UNIVERSAL_WELCOME);
 		page.setTitle(PDETemplateMessages.IntroTemplate_title);
@@ -66,24 +67,29 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	public String getSectionId() {
 		return "universalWelcome"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
 		pluginId = data.getId();
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		pluginId = model.getPluginBase().getId();
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 
@@ -101,6 +107,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 			plugin.add(extension);
 	}
 
+	@Override
 	protected boolean isOkToCreateFolder(File sourceFolder) {
 		return true;
 	}
@@ -108,14 +115,17 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#isOkToCreateFile(File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 		return true;
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.intro.configExtension"; //$NON-NLS-1$
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 
@@ -129,6 +139,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 		return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
 	}
 
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -137,6 +148,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 	 * We are going to compute some values even though we are
 	 * not exposing them as options.
 	 */
+	@Override
 	public String getStringOption(String name) {
 		if (name.equals(KEY_EXTENSION_ID)) {
 			return stripNonAlphanumeric(pluginId) + "-introExtension"; //$NON-NLS-1$
@@ -161,6 +173,7 @@ public class UniversalWelcomeTemplate extends PDETemplateSection {
 		return result.toString();
 	}
 
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {getStringOption(KEY_INTRO_DIR) + "/"}; //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java
index 1014a0f38f..02cca6bdea 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewNewWizard.java
@@ -24,6 +24,7 @@ public class ViewNewWizard extends NewPluginTemplateWizard {
 		super();
 	}
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.ViewNewWizard_wtitle);
@@ -32,6 +33,7 @@ public class ViewNewWizard extends NewPluginTemplateWizard {
 	/*
 	 * @see NewExtensionTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new ViewTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
index 4c77fb34e6..ee0c585e09 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/ViewTemplate.java
@@ -34,6 +34,7 @@ public class ViewTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public String getSectionId() {
 		return "view"; //$NON-NLS-1$
 	}
@@ -41,6 +42,7 @@ public class ViewTemplate extends PDETemplateSection {
 	/*
 	 * @see ITemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -61,6 +63,7 @@ public class ViewTemplate extends PDETemplateSection {
 		contextHelp = (BooleanOption) addOption("contextHelp", PDETemplateMessages.ViewTemplate_contextHelp, true, 0); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -68,6 +71,7 @@ public class ViewTemplate extends PDETemplateSection {
 
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -79,10 +83,12 @@ public class ViewTemplate extends PDETemplateSection {
 		initializeOption("viewCategoryId", id); //$NON-NLS-1$
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page0 = createPage(0, IHelpContextIds.TEMPLATE_VIEW);
 		page0.setTitle(PDETemplateMessages.ViewTemplate_title0);
@@ -95,6 +101,7 @@ public class ViewTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#isOkToCreateFile(File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 		boolean isOk = true;
 		String fileName = sourceFile.getName();
@@ -104,10 +111,12 @@ public class ViewTemplate extends PDETemplateSection {
 		return isOk;
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.views"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		IPluginBase plugin = model.getPluginBase();
 		IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
@@ -186,6 +195,7 @@ public class ViewTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFoldersToInclude()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		if (contextHelp.isSelected())
 			return new String[] {"icons/", "contexts.xml"}; //$NON-NLS-1$ //$NON-NLS-2$
@@ -195,6 +205,7 @@ public class ViewTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 		if (schemaVersion != null)
@@ -206,6 +217,7 @@ public class ViewTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
 	 */
+	@Override
 	protected String getFormattedPackageName(String id) {
 		String packageName = super.getFormattedPackageName(id);
 		if (packageName.length() != 0)
@@ -213,6 +225,7 @@ public class ViewTemplate extends PDETemplateSection {
 		return "views"; //$NON-NLS-1$
 	}
 
+	@Override
 	public Object getValue(String name) {
 		if (name.equals("useEnablement")) //$NON-NLS-1$
 			return new Boolean(getTargetVersion() >= 3.3);
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java
index 0e665e29d4..87431a3984 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiNewWizard.java
@@ -20,6 +20,7 @@ public class HelloOSGiNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelloOSGiNewWizard_title);
@@ -28,10 +29,12 @@ public class HelloOSGiNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloOSGiTemplate()};
 	}
 
+	@Override
 	public String[] getImportPackages() {
 		return new String[] {"org.osgi.framework;version=\"1.3.0\""}; //$NON-NLS-1$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java
index e58d9b8704..adc8b9e0e5 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceNewWizard.java
@@ -20,6 +20,7 @@ public class HelloOSGiServiceNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelloOSGiServiceNewWizard_title);
@@ -28,10 +29,12 @@ public class HelloOSGiServiceNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloOSGiServiceTemplate()};
 	}
 
+	@Override
 	public String[] getImportPackages() {
 		return new String[] {"org.osgi.framework;version=\"1.3.0\"", "org.osgi.util.tracker;version=\"1.3.1\""}; //$NON-NLS-1$ //$NON-NLS-2$
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java
index bc9e9dc37c..3db18295ca 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiServiceTemplate.java
@@ -34,6 +34,7 @@ public class HelloOSGiServiceTemplate extends PDETemplateSection {
 
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.HelloOSGiServiceTemplate_pageTitle);
@@ -47,6 +48,7 @@ public class HelloOSGiServiceTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "helloOSGiService"; //$NON-NLS-1$
 	}
@@ -54,6 +56,7 @@ public class HelloOSGiServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) { // do nothing
 
 	}
@@ -61,6 +64,7 @@ public class HelloOSGiServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -68,6 +72,7 @@ public class HelloOSGiServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -75,10 +80,12 @@ public class HelloOSGiServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java
index f96bcbdd29..7cf22f7de8 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloOSGiTemplate.java
@@ -28,6 +28,7 @@ public class HelloOSGiTemplate extends PDETemplateSection {
 		addOption(KEY_STOP_MESSAGE, PDETemplateMessages.HelloOSGiTemplate_stopMessage, PDETemplateMessages.HelloOSGiTemplate_goodbye, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.HelloOSGiTemplate_pageTitle);
@@ -41,6 +42,7 @@ public class HelloOSGiTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "helloOSGi"; //$NON-NLS-1$
 	}
@@ -48,6 +50,7 @@ public class HelloOSGiTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) { // do nothing
 
 	}
@@ -55,6 +58,7 @@ public class HelloOSGiTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -62,6 +66,7 @@ public class HelloOSGiTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -69,10 +74,12 @@ public class HelloOSGiTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java
index fce17cae7c..54e29e31db 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplate.java
@@ -35,6 +35,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 		addOption(WORD3, PDETemplateMessages.HelloOSGiServiceTemplate_word3, "equinox", 0); //$NON-NLS-1$
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.DSTemplate_pageTitle);
@@ -48,6 +49,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "helloOSGiServiceComponent"; //$NON-NLS-1$
 	}
@@ -55,6 +57,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) { // do nothing
 		setManifestHeader("Service-Component", "OSGI-INF/*.xml"); //$NON-NLS-1$ //$NON-NLS-2$]
 	}
@@ -62,6 +65,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -69,6 +73,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -76,14 +81,17 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -92,6 +100,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 		this.packageName = getFormattedPackageName(data.getId());
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		String id = model.getPluginBase().getId();
 		String packageName = getFormattedPackageName(id);
@@ -99,6 +108,7 @@ public class HelloServiceComponentTemplate extends PDETemplateSection {
 		this.packageName = getFormattedPackageName(id);
 	}
 
+	@Override
 	public String getStringOption(String name) {
 		if (name.equals(KEY_PACKAGE_NAME)) {
 			return packageName;
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java
index 00f11a035b..53cad3d05f 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/HelloServiceComponentTemplateWizard.java
@@ -22,6 +22,7 @@ public class HelloServiceComponentTemplateWizard extends NewPluginTemplateWizard
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.DSTemplateWizard_title);
@@ -30,14 +31,17 @@ public class HelloServiceComponentTemplateWizard extends NewPluginTemplateWizard
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloServiceComponentTemplate()};
 	}
 
+	@Override
 	public String[] getImportPackages() {
 		return new String[] {"org.osgi.framework;version=\"1.3.0\"", "org.osgi.util.tracker;version=\"1.3.1\"", "org.eclipse.osgi.framework.console;version=\"1.0.0\""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java
index da0ea59e98..6cb1405124 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplate.java
@@ -28,6 +28,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 		addOption(EVENT_TOPIC, PDETemplateMessages.OSGiEventAdminTemplate_eventTopicTitle, "org/osgi/framework/BundleEvent/STARTED", 0); //$NON-NLS-1$
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.OSGiEventAdminTemplate_pageTitle);
@@ -41,6 +42,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "OSGiEventAdmin"; //$NON-NLS-1$
 	}
@@ -48,6 +50,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) { // do nothing
 		setManifestHeader("Service-Component", "OSGI-INF/*.xml"); //$NON-NLS-1$ //$NON-NLS-2$]
 	}
@@ -55,6 +58,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -62,6 +66,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -69,14 +74,17 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -85,6 +93,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 		this.packageName = getFormattedPackageName(data.getId());
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		String id = model.getPluginBase().getId();
 		String packageName = getFormattedPackageName(id);
@@ -92,6 +101,7 @@ public class OSGiEventAdminTemplate extends PDETemplateSection {
 		this.packageName = getFormattedPackageName(id);
 	}
 
+	@Override
 	public String getStringOption(String name) {
 		if (name.equals(KEY_PACKAGE_NAME)) {
 			return packageName;
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java
index 10635c73ab..6de39f5eae 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiEventAdminTemplateWizard.java
@@ -21,6 +21,7 @@ public class OSGiEventAdminTemplateWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.OSGiEventAdminTemplateWizard_title);
@@ -29,14 +30,17 @@ public class OSGiEventAdminTemplateWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new OSGiEventAdminTemplate()};
 	}
 
+	@Override
 	public String[] getImportPackages() {
 		return new String[] {"org.osgi.framework;version=\"1.3.0\"", "org.osgi.service.event;version=\"1.2.0\""}; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java
index 89cc9931e8..09601890ff 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceNewWizard.java
@@ -20,6 +20,7 @@ public class OSGiPreferencesServiceNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.OSGiPreferencesServiceNewWizard_title);
@@ -28,10 +29,12 @@ public class OSGiPreferencesServiceNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new OSGiPreferencesServiceTemplate()};
 	}
 
+	@Override
 	public String[] getImportPackages() {
 		return new String[] {"org.osgi.service.prefs;version=\"1.1\"", //$NON-NLS-1$
 				"org.osgi.util.tracker;version=\"1.3.1\""}; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java
index 6572b61075..ae432c0537 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiPreferencesServiceTemplate.java
@@ -25,6 +25,7 @@ public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
 		addOption(COLOR, PDETemplateMessages.OSGiPreferencesServiceTemplate_label, PDETemplateMessages.OSGiPreferencesServiceTemplate_value, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.OSGiPreferencesServiceTemplate_pageTitle);
@@ -38,6 +39,7 @@ public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "OSGiPreferencesService"; //$NON-NLS-1$
 	}
@@ -45,6 +47,7 @@ public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) {
 		// do nothing
 	}
@@ -52,6 +55,7 @@ public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -59,6 +63,7 @@ public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -66,10 +71,12 @@ public class OSGiPreferencesServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java
index f2315c0506..9909513e6d 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceNewWizard.java
@@ -20,6 +20,7 @@ public class OSGiSimpleLogServiceNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.OSGiSimpleLogServiceNewWizard_title);
@@ -28,10 +29,12 @@ public class OSGiSimpleLogServiceNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new OSGiSimpleLogServiceTemplate()};
 	}
 
+	@Override
 	public String[] getImportPackages() {
 		return new String[] {"org.osgi.framework;version=\"1.3.0\"", //$NON-NLS-1$
 				"org.osgi.util.tracker;version=\"1.3.1\"", //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java
index 3c6e810b9f..41005ed5bc 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/osgi/OSGiSimpleLogServiceTemplate.java
@@ -27,6 +27,7 @@ public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
 		addOption(STOP_LOG_MESSAGE, PDETemplateMessages.OSGiSimpleLogServiceTemplate_stopLogMessage, PDETemplateMessages.OSGiSimpleLogServiceTemplate_logMessage, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.OSGiSimpleLogServiceTemplate_pageTitle);
@@ -40,6 +41,7 @@ public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "OSGiSimpleLogService"; //$NON-NLS-1$
 	}
@@ -47,6 +49,7 @@ public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) {
 		// do nothing
 	}
@@ -54,6 +57,7 @@ public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -61,6 +65,7 @@ public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -68,10 +73,12 @@ public class OSGiSimpleLogServiceTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		return new IPluginReference[0];
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java
index 53f2eba35c..82569a504b 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPNewWizard.java
@@ -20,6 +20,7 @@ public class HelloNonUIRCPNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelloNonUIRCPNewWizard_title);
@@ -28,6 +29,7 @@ public class HelloNonUIRCPNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloNonUIRCPTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java
index 0bf7039549..db22218bc9 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloNonUIRCPTemplate.java
@@ -35,6 +35,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.HelloNonUIRCPTemplate_title);
@@ -51,6 +52,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 		addOption(KEY_APPLICATION_MESSAGE, PDETemplateMessages.HelloNonUIRCPTemplate_messageText, PDETemplateMessages.HelloNonUIRCPTemplate_defaultMessage, 0);
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -58,6 +60,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, packageName);
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		String packageName = getFormattedPackageName(model.getPluginBase().getId());
 		initializeOption(KEY_PACKAGE_NAME, packageName);
@@ -68,6 +71,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "helloNonUIRCP"; //$NON-NLS-1$
 	}
@@ -75,6 +79,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		createApplicationExtension();
 	}
@@ -101,6 +106,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -108,6 +114,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -115,6 +122,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -122,6 +130,7 @@ public class HelloNonUIRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		IPluginReference[] dep = new IPluginReference[1];
 		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java
index 144273514c..b3e9bfb440 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPNewWizard.java
@@ -20,6 +20,7 @@ public class HelloRCPNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.HelloRCPNewWizard_title);
@@ -28,6 +29,7 @@ public class HelloRCPNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new HelloRCPTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java
index e0e6e39513..ce1b9416f9 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/HelloRCPTemplate.java
@@ -35,6 +35,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.HelloRCPTemplate_title);
@@ -53,6 +54,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 		createBrandingOptions();
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -60,6 +62,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, packageName);
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		String packageName = getFormattedPackageName(model.getPluginBase().getId());
 		initializeOption(KEY_PACKAGE_NAME, packageName);
@@ -70,6 +73,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "helloRCP"; //$NON-NLS-1$
 	}
@@ -77,6 +81,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		createApplicationExtension();
 		createPerspectiveExtension();
@@ -145,6 +150,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -152,6 +158,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -159,6 +166,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -166,6 +174,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		IPluginReference[] dep = new IPluginReference[2];
 		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
@@ -176,6 +185,7 @@ public class HelloRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		if (copyBrandingDirectory())
 			return new String[] {"icons/", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java
index 6c40d3a044..e575cf5b42 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroNewWizard.java
@@ -18,11 +18,13 @@ import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
 
 public class IntroNewWizard extends NewPluginTemplateWizard {
 
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.IntroNewWizard_wtitle);
 	}
 
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new IntroTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
index 8ee34a0274..b85503b2b0 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java
@@ -56,6 +56,7 @@ public class IntroTemplate extends PDETemplateSection {
 		addOption(KEY_GENERATE_DYNAMIC_CONTENT, PDETemplateMessages.IntroTemplate_generate, new String[][] { {STATIC_SELECTED, PDETemplateMessages.IntroTemplate_generateStaticContent}, {DYNAMIC_SELECTED, PDETemplateMessages.IntroTemplate_generateDynamicContent}}, STATIC_SELECTED, 0);
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_INTRO);
 		page.setTitle(PDETemplateMessages.IntroTemplate_title);
@@ -64,14 +65,17 @@ public class IntroTemplate extends PDETemplateSection {
 		markPagesAdded();
 	}
 
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
 
+	@Override
 	public String getSectionId() {
 		return "intro"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -81,6 +85,7 @@ public class IntroTemplate extends PDETemplateSection {
 		introID = getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -90,6 +95,7 @@ public class IntroTemplate extends PDETemplateSection {
 		introID = getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
 	}
 
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 
 		IPluginBase plugin = model.getPluginBase();
@@ -212,6 +218,7 @@ public class IntroTemplate extends PDETemplateSection {
 			plugin.add(extension);
 	}
 
+	@Override
 	protected boolean isOkToCreateFolder(File sourceFolder) {
 		return true;
 	}
@@ -219,6 +226,7 @@ public class IntroTemplate extends PDETemplateSection {
 	/**
 	 * @see AbstractTemplateSection#isOkToCreateFile(File)
 	 */
+	@Override
 	protected boolean isOkToCreateFile(File sourceFile) {
 
 		if (getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(STATIC_SELECTED) && (sourceFile.getName().equals("DynamicContentProvider.java") || //$NON-NLS-1$
@@ -231,10 +239,12 @@ public class IntroTemplate extends PDETemplateSection {
 		return true;
 	}
 
+	@Override
 	public String getUsedExtensionPoint() {
 		return "org.eclipse.ui.intro"; // need more then one extension point //$NON-NLS-1$
 	}
 
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		ArrayList result = new ArrayList();
 
@@ -250,10 +260,12 @@ public class IntroTemplate extends PDETemplateSection {
 		return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
 	}
 
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
 
+	@Override
 	public Object getValue(String valueName) {
 
 		if (valueName.equals(KEY_PACKAGE_NAME)) {
@@ -263,6 +275,7 @@ public class IntroTemplate extends PDETemplateSection {
 		return super.getValue(valueName);
 	}
 
+	@Override
 	public String getStringOption(String name) {
 
 		if (name.equals(KEY_PACKAGE_NAME)) {
@@ -272,6 +285,7 @@ public class IntroTemplate extends PDETemplateSection {
 		return super.getStringOption(name);
 	}
 
+	@Override
 	public String[] getNewFiles() {
 		if (getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(STATIC_SELECTED)) {
 			return new String[] {"icons/", "content/", "splash.bmp", "introContent.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -282,6 +296,7 @@ public class IntroTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#copyBrandingDirectory()
 	 */
+	@Override
 	protected boolean copyBrandingDirectory() {
 		return true;
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java
index 7685d52123..60a636f67a 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailNewWizard.java
@@ -20,6 +20,7 @@ public class MailNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.MailNewWizard_title);
@@ -28,6 +29,7 @@ public class MailNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new MailTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java
index a279ec4839..3b15b6f315 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/MailTemplate.java
@@ -29,6 +29,7 @@ public class MailTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.MailTemplate_title);
@@ -45,6 +46,7 @@ public class MailTemplate extends PDETemplateSection {
 		addOption(KEY_APPLICATION_CLASS, PDETemplateMessages.MailTemplate_appClass, "Application", 0); //$NON-NLS-1$ 
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -52,6 +54,7 @@ public class MailTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, packageName);
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		String packageName = getFormattedPackageName(model.getPluginBase().getId());
 		initializeOption(KEY_PACKAGE_NAME, packageName);
@@ -62,6 +65,7 @@ public class MailTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "mail"; //$NON-NLS-1$
 	}
@@ -69,6 +73,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		createApplicationExtension();
 		createPerspectiveExtension();
@@ -273,6 +278,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -280,6 +286,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -287,6 +294,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -294,6 +302,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		IPluginReference[] dep = new IPluginReference[2];
 		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
@@ -304,6 +313,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		return new String[] {"icons/", "product_lg.gif", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
@@ -311,6 +321,7 @@ public class MailTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#copyBrandingDirectory()
 	 */
+	@Override
 	protected boolean copyBrandingDirectory() {
 		return true;
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java
index 3a1a5e76bc..d4b394deff 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPNewWizard.java
@@ -20,6 +20,7 @@ public class ViewRCPNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
 	 */
+	@Override
 	public void init(IFieldData data) {
 		super.init(data);
 		setWindowTitle(PDETemplateMessages.ViewRCPNewWizard_title);
@@ -28,6 +29,7 @@ public class ViewRCPNewWizard extends NewPluginTemplateWizard {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
 	 */
+	@Override
 	public ITemplateSection[] createTemplateSections() {
 		return new ITemplateSection[] {new ViewRCPTemplate()};
 	}
diff --git a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java
index 0f35dff0bf..1d1b03bde0 100644
--- a/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java
+++ b/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/ViewRCPTemplate.java
@@ -30,6 +30,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 		createOptions();
 	}
 
+	@Override
 	public void addPages(Wizard wizard) {
 		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
 		page.setTitle(PDETemplateMessages.ViewRCPTemplate_title);
@@ -48,6 +49,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 		createBrandingOptions();
 	}
 
+	@Override
 	protected void initializeFields(IFieldData data) {
 		// In a new project wizard, we don't know this yet - the
 		// model has not been created
@@ -55,6 +57,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
 	}
 
+	@Override
 	public void initializeFields(IPluginModelBase model) {
 		// In the new extension wizard, the model exists so 
 		// we can initialize directly from it
@@ -67,6 +70,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
 	 */
+	@Override
 	public String getSectionId() {
 		return "viewRCP"; //$NON-NLS-1$
 	}
@@ -74,6 +78,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected void updateModel(IProgressMonitor monitor) throws CoreException {
 		createApplicationExtension();
 		createPerspectiveExtension();
@@ -210,6 +215,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	 * 
 	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
 	 */
+	@Override
 	public String getUsedExtensionPoint() {
 		return null;
 	}
@@ -217,6 +223,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
 	 */
+	@Override
 	public boolean isDependentOnParentWizard() {
 		return true;
 	}
@@ -224,6 +231,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
 	 */
+	@Override
 	public int getNumberOfWorkUnits() {
 		return super.getNumberOfWorkUnits() + 1;
 	}
@@ -231,6 +239,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
 	 */
+	@Override
 	public IPluginReference[] getDependencies(String schemaVersion) {
 		IPluginReference[] dep = new IPluginReference[2];
 		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
@@ -241,6 +250,7 @@ public class ViewRCPTemplate extends PDETemplateSection {
 	/* (non-Javadoc)
 	 * @see org.eclipse.pde.internal.ui.templates.PDETemplateSection#getNewFiles()
 	 */
+	@Override
 	public String[] getNewFiles() {
 		if (copyBrandingDirectory())
 			return new String[] {"icons/", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$
author	Lars Vogel	2014-10-08 17:05:56 +0000
committer	Vikas Chandra	2014-11-07 08:55:10 +0000
commit	7190e4a854d543f301f51e616476800f003c7cfe (patch)
tree	7a3003a606ae025a950bd522af3005ae00542491
parent	e07ca90978c9b63bff02237111e190179716a242 (diff)
download	eclipse.pde.ui-7190e4a854d543f301f51e616476800f003c7cfe.tar.gz eclipse.pde.ui-7190e4a854d543f301f51e616476800f003c7cfe.tar.xz eclipse.pde.ui-7190e4a854d543f301f51e616476800f003c7cfe.zip