Bug 444340 - Externalize Strings

5 files changed, 155 insertions, 135 deletions

diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
index 5675ca47..ed3c140b 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/Messages.java
@@ -30,6 +30,12 @@ public class Messages extends NLS {
 	public static String AbstractNewClassPage_Package;
 	public static String AbstractNewClassPage_SourceFolder;
 	public static String AbstractNewClassPage_SourceFolderNotEmpty;
+	public static String AbstractNewClassWizard_NewClass;
+	public static String NewAddonClassWizard_NewAddon;
+	public static String NewAddonClassWizard_NewAddonClass;
+	public static String NewDynamicMenuContributionClassWizard_AboutToShowMethod;
+	public static String NewDynamicMenuContributionClassWizard_CreateNewContribution;
+	public static String NewDynamicMenuContributionClassWizard_NewDynamicContribution;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
index f8a00b47..71a6932e 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/messages.properties
@@ -9,3 +9,9 @@ AbstractNewClassPage_NeedToSelectAPackage=You need to select a package
 AbstractNewClassPage_Package=Package
 AbstractNewClassPage_SourceFolder=Source folder
 AbstractNewClassPage_SourceFolderNotEmpty=Source folder must not be empty
+AbstractNewClassWizard_NewClass=New contribution class
+NewAddonClassWizard_NewAddon=New Addon
+NewAddonClassWizard_NewAddonClass=Create a new addon class
+NewDynamicMenuContributionClassWizard_AboutToShowMethod=AboutToShow Method
+NewDynamicMenuContributionClassWizard_CreateNewContribution=Create a new dynamic menu contribution class
+NewDynamicMenuContributionClassWizard_NewDynamicContribution=New Dynamic Menu Contribution
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
index 21371d9a..f38d1a13 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -25,6 +25,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -47,11 +48,15 @@ import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 
 public abstract class AbstractNewClassWizard extends Wizard implements INewWizard {
+	private static final String JAVA = ".java"; //$NON-NLS-1$
 	protected IPackageFragmentRoot root;
 	protected IFile file;
+
 	public AbstractNewClassWizard() {
-		this.setWindowTitle("New contribution class");
+		setWindowTitle(Messages.AbstractNewClassWizard_NewClass);
 	}
+
+	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		root = getFragmentRoot(getInitialJavaElement(selection));
 	}
@@ -59,22 +64,22 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 	protected IJavaElement getInitialJavaElement(IStructuredSelection selection) {
 		IJavaElement jelem = null;
 		if (selection != null && !selection.isEmpty()) {
-			Object selectedElement = selection.getFirstElement();
+			final Object selectedElement = selection.getFirstElement();
 			if (selectedElement instanceof IAdaptable) {
-				IAdaptable adaptable = (IAdaptable) selectedElement;
+				final IAdaptable adaptable = (IAdaptable) selectedElement;
 
 				jelem = (IJavaElement) adaptable.getAdapter(IJavaElement.class);
 				if (jelem == null || !jelem.exists()) {
 					jelem = null;
 					IResource resource = (IResource) adaptable
-							.getAdapter(IResource.class);
+						.getAdapter(IResource.class);
 					if (resource != null
-							&& resource.getType() != IResource.ROOT) {
+						&& resource.getType() != IResource.ROOT) {
 						while (jelem == null
-								&& resource.getType() != IResource.PROJECT) {
+							&& resource.getType() != IResource.PROJECT) {
 							resource = resource.getParent();
 							jelem = (IJavaElement) resource
-									.getAdapter(IJavaElement.class);
+								.getAdapter(IJavaElement.class);
 						}
 						if (jelem == null) {
 							jelem = JavaCore.create(resource); // java project
@@ -91,16 +96,16 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 		IPackageFragmentRoot initRoot = null;
 		if (elem != null) {
 			initRoot = (IPackageFragmentRoot) elem
-					.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
+				.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
 			try {
 				if (initRoot == null
-						|| initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
-					IJavaProject jproject = elem.getJavaProject();
+					|| initRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
+					final IJavaProject jproject = elem.getJavaProject();
 					if (jproject != null) {
 						initRoot = null;
 						if (jproject.exists()) {
-							IPackageFragmentRoot[] roots = jproject
-									.getPackageFragmentRoots();
+							final IPackageFragmentRoot[] roots = jproject
+								.getPackageFragmentRoots();
 							for (int i = 0; i < roots.length; i++) {
 								if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
 									initRoot = roots[i];
@@ -110,11 +115,11 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 						}
 						if (initRoot == null) {
 							initRoot = jproject.getPackageFragmentRoot(jproject
-									.getResource());
+								.getResource());
 						}
 					}
 				}
-			} catch (JavaModelException e) {
+			} catch (final JavaModelException e) {
 				// TODO
 				e.printStackTrace();
 			}
@@ -123,112 +128,112 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 	}
 
 	protected abstract String getContent();
-	
+
 	public JavaClass getDomainClass() {
 		return ((AbstractNewClassPage) getPages()[0]).getClazz();
 	}
-	
+
 	protected void checkRequiredBundles() {
-		IProject project = getDomainClass().getFragmentRoot().getJavaProject().getProject();
-		BundleContext context = FrameworkUtil.getBundle(NewAddonClassWizard.class).getBundleContext();
-		ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
-		IBundleProjectService service = context.getService(ref);
+		final IProject project = getDomainClass().getFragmentRoot().getJavaProject().getProject();
+		final BundleContext context = FrameworkUtil.getBundle(NewAddonClassWizard.class).getBundleContext();
+		final ServiceReference<IBundleProjectService> ref = context.getServiceReference(IBundleProjectService.class);
+		final IBundleProjectService service = context.getService(ref);
 		try {
-			IBundleProjectDescription description = service.getDescription(project);
-			Set<String> requiredBundles = getRequiredBundles();
-			IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
-			List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
-			if( arTmp != null ) {
+			final IBundleProjectDescription description = service.getDescription(project);
+			final Set<String> requiredBundles = getRequiredBundles();
+			final IRequiredBundleDescription[] arTmp = description.getRequiredBundles();
+			final List<IRequiredBundleDescription> descs = new ArrayList<IRequiredBundleDescription>();
+			if (arTmp != null) {
 				descs.addAll(Arrays.asList(arTmp));
 			}
-			for( IRequiredBundleDescription bd : descs ) {
+			for (final IRequiredBundleDescription bd : descs) {
 				requiredBundles.remove(bd.getName());
 			}
-			
-			if( requiredBundles.size() > 0 ) {
-				for( String b : requiredBundles ) {
+
+			if (requiredBundles.size() > 0) {
+				for (final String b : requiredBundles) {
 					descs.add(service.newRequiredBundle(b, null, false, false));
 				}
 				description.setRequiredBundles(descs.toArray(new IRequiredBundleDescription[0]));
 				description.apply(new NullProgressMonitor());
 			}
-		} catch (CoreException e) {
+		} catch (final CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
-	
+
 	protected Set<String> getRequiredBundles() {
-		Set<String> rv = new HashSet<String>();
-		rv.add("javax.inject");
+		final Set<String> rv = new HashSet<String>();
+		rv.add("javax.inject"); //$NON-NLS-1$
 		return rv;
 	}
-	
+
 	@Override
 	public boolean performFinish() {
-		JavaClass clazz = getDomainClass();
-		String content = getContent();
-		
-		if( clazz.getFragmentRoot() == null ) {
+		final JavaClass clazz = getDomainClass();
+		final String content = getContent();
+
+		if (clazz.getFragmentRoot() == null) {
 			return false;
 		}
-		
+
 		checkRequiredBundles();
-		
+
 		IPackageFragment fragment = clazz.getPackageFragment();
 		boolean exists = false;
 		if (fragment != null) {
 			IJavaElement[] children;
 			try {
 				children = clazz.getFragmentRoot().getChildren();
-			
-					for (IJavaElement iJavaElement : children) {
-						IPackageFragment pf = (IPackageFragment) iJavaElement;
-						if (pf.getElementName().equals(fragment.getElementName())){
+
+				for (final IJavaElement iJavaElement : children) {
+					final IPackageFragment pf = (IPackageFragment) iJavaElement;
+					if (pf.getElementName().equals(fragment.getElementName())) {
 						exists = true;
 						break;
-						}
 					}
-			;
-			
-			if (!exists)
-				fragment = clazz.getFragmentRoot().createPackageFragment(fragment.getElementName(), true, null);
-			} catch (JavaModelException e1) {
+				}
+
+				if (!exists) {
+					fragment = clazz.getFragmentRoot().createPackageFragment(fragment.getElementName(), true, null);
+				}
+			} catch (final JavaModelException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-			String cuName = clazz.getName() + ".java";
-			ICompilationUnit unit = fragment.getCompilationUnit(cuName); 
-			IResource resource = unit.getResource();
+			final String cuName = clazz.getName() + JAVA;
+			final ICompilationUnit unit = fragment.getCompilationUnit(cuName);
+			final IResource resource = unit.getResource();
 			file = (IFile) resource;
 			try {
 				if (!file.exists()) {
 					file.create(new ByteArrayInputStream(content.getBytes()),
-							true, null);
+						true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-							IResource.FORCE | IResource.KEEP_HISTORY, null);
+						IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
-//				unit.open(null);
-			} catch (CoreException e) {
+				// unit.open(null);
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		} else {
-			String cuName = clazz.getName() + ".java";
-			IFolder p = (IFolder) clazz.getFragmentRoot().getResource();
+			final String cuName = clazz.getName() + JAVA;
+			final IFolder p = (IFolder) clazz.getFragmentRoot().getResource();
 			file = p.getFile(cuName);
 			try {
 				if (!file.exists()) {
 					file.create(new ByteArrayInputStream(content.getBytes()),
-							true, null);
+						true, null);
 				} else {
 					file.setContents(new ByteArrayInputStream(content.getBytes()),
-							IResource.FORCE | IResource.KEEP_HISTORY, null);
+						IResource.FORCE | IResource.KEEP_HISTORY, null);
 				}
 				IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file);
-			} catch (CoreException e) {
+			} catch (final CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -237,7 +242,7 @@ public abstract class AbstractNewClassWizard extends Wizard implements INewWizar
 		return true;
 
 	}
-	
+
 	public IFile getFile() {
 		return file;
 	}
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
index d5a73559..3c333bd7 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewAddonClassWizard.java
@@ -6,8 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
- *     Sopot Cela <sopotcela@gmail.com>
+ * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Sopot Cela <sopotcela@gmail.com>
  ******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -15,6 +15,7 @@ import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.AddonTemplate;
 import org.eclipse.swt.widgets.Composite;
 
@@ -22,43 +23,43 @@ public class NewAddonClassWizard extends AbstractNewClassWizard {
 	private String initialString;
 
 	public NewAddonClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
-	
+
 	public NewAddonClassWizard() {
-		// Intentially left empty 
+		// Intentially left empty
 	}
 
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation",
-				"New Addon",
-				"Create a new addon class", root, ResourcesPlugin.getWorkspace().getRoot(), initialString) {
+		addPage(new AbstractNewClassPage("Classinformation", //$NON-NLS-1$
+			Messages.NewAddonClassWizard_NewAddon,
+			Messages.NewAddonClassWizard_NewAddonClass, root, ResourcesPlugin.getWorkspace().getRoot(), initialString) {
+
+			@Override
+			protected void createFields(Composite parent,
+				DataBindingContext dbc) {
+			}
 
-					@Override
-					protected void createFields(Composite parent,
-							DataBindingContext dbc) {
-					}
+			@Override
+			protected JavaClass createInstance() {
+				return new JavaClass(root);
+			}
 
-					@Override
-					protected JavaClass createInstance() {
-						return new JavaClass(root);
-					}
-			
 		});
 	}
-	
+
 	@Override
 	protected String getContent() {
-		AddonTemplate template = new AddonTemplate();
+		final AddonTemplate template = new AddonTemplate();
 		return template.generate(getDomainClass());
 	}
-	
+
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> rv = super.getRequiredBundles();
-		rv.add("javax.annotation");
-		rv.add("org.eclipse.e4.core.services");
+		final Set<String> rv = super.getRequiredBundles();
+		rv.add("javax.annotation"); //$NON-NLS-1$
+		rv.add("org.eclipse.e4.core.services"); //$NON-NLS-1$
 		return rv;
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
index 59c8b2bc..5e0fa426 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/NewDynamicMenuContributionClassWizard.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Marco Descher <marco@descher.at> - initial API and implementation
+ * Marco Descher <marco@descher.at> - initial API and implementation
  *******************************************************************************/
 package org.eclipse.e4.internal.tools.wizards.classes;
 
@@ -15,11 +15,9 @@ import java.util.Set;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage;
-import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassWizard;
+import org.eclipse.e4.internal.tools.Messages;
 import org.eclipse.e4.internal.tools.wizards.classes.AbstractNewClassPage.JavaClass;
 import org.eclipse.e4.internal.tools.wizards.classes.templates.DynamicMenuContributionTemplate;
-
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
@@ -31,25 +29,29 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 public class NewDynamicMenuContributionClassWizard extends
-		AbstractNewClassWizard {
+AbstractNewClassWizard {
+
+	private static final String ABOUT_TO_SHOW_METHOD_NAME = "aboutToShowMethodName"; //$NON-NLS-1$
+	private static final String ABOUT_TO_HIDE_METHOD_NAME = "aboutToHideMethodName"; //$NON-NLS-1$
+	private static final String USE_ABOUT_TO_HIDE = "useAboutToHide"; //$NON-NLS-1$
+	private final String initialString;
 
-	private String initialString;
-	
 	public NewDynamicMenuContributionClassWizard(String contributionURI) {
-		this.initialString = contributionURI;
+		initialString = contributionURI;
 	}
 
 	@Override
 	protected String getContent() {
-		DynamicMenuContributionTemplate template = new DynamicMenuContributionTemplate();
+		final DynamicMenuContributionTemplate template = new DynamicMenuContributionTemplate();
 		return template.generate(getDomainClass());
 	}
-	
+
 	@Override
 	public void addPages() {
-		addPage(new AbstractNewClassPage("Classinformation",
-				"New Dynamic Menu Contribution",
-				"Create a new dynamic menu contribution class", root, ResourcesPlugin.getWorkspace().getRoot(),initialString) {
+		addPage(new AbstractNewClassPage("Classinformation", //$NON-NLS-1$
+			Messages.NewDynamicMenuContributionClassWizard_NewDynamicContribution,
+			Messages.NewDynamicMenuContributionClassWizard_CreateNewContribution, root, ResourcesPlugin.getWorkspace().getRoot(),
+			initialString) {
 
 			@Override
 			protected JavaClass createInstance() {
@@ -58,58 +60,58 @@ public class NewDynamicMenuContributionClassWizard extends
 
 			@Override
 			protected void createFields(Composite parent, DataBindingContext dbc) {
-				IWidgetValueProperty textProp = WidgetProperties
-						.text(SWT.Modify);
+				final IWidgetValueProperty textProp = WidgetProperties
+					.text(SWT.Modify);
 
 				{
 					Label l = new Label(parent, SWT.NONE);
-					l.setText("AboutToShow Method");
+					l.setText(Messages.NewDynamicMenuContributionClassWizard_AboutToShowMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(
-							textProp.observe(t),
-							BeanProperties.value("aboutToShowMethodName").observe(
-									getClazz()));
+						textProp.observe(t),
+						BeanProperties.value(ABOUT_TO_SHOW_METHOD_NAME).observe(
+							getClazz()));
 
 					l = new Label(parent, SWT.NONE);
 				}
 
 				{
-					Label l = new Label(parent, SWT.NONE);
-					l.setText("AboutToShow Method");
+					final Label l = new Label(parent, SWT.NONE);
+					l.setText(Messages.NewDynamicMenuContributionClassWizard_AboutToShowMethod);
 
-					Text t = new Text(parent, SWT.BORDER);
+					final Text t = new Text(parent, SWT.BORDER);
 					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 					dbc.bindValue(textProp.observe(t),
-							BeanProperties.value("aboutToHideMethodName")
-									.observe(getClazz()));
+						BeanProperties.value(ABOUT_TO_HIDE_METHOD_NAME)
+						.observe(getClazz()));
 					dbc.bindValue(
-							WidgetProperties.enabled().observe(t),
-							BeanProperties.value("useAboutToHide").observe(
-									getClazz()));
+						WidgetProperties.enabled().observe(t),
+						BeanProperties.value(USE_ABOUT_TO_HIDE).observe(
+							getClazz()));
 
-					Button b = new Button(parent, SWT.CHECK);
+					final Button b = new Button(parent, SWT.CHECK);
 					dbc.bindValue(
-							WidgetProperties.selection().observe(b),
-							BeanProperties.value("useAboutToHide").observe(
-									getClazz()));
+						WidgetProperties.selection().observe(b),
+						BeanProperties.value(USE_ABOUT_TO_HIDE).observe(
+							getClazz()));
 				}
 			}
 		});
 	}
-	
+
 	@Override
 	protected Set<String> getRequiredBundles() {
-		Set<String> set = super.getRequiredBundles();
-		set.add("org.eclipse.e4.ui.di");
-		set.add("org.eclipse.e4.ui.model.workbench");
+		final Set<String> set = super.getRequiredBundles();
+		set.add("org.eclipse.e4.ui.di"); //$NON-NLS-1$
+		set.add("org.eclipse.e4.ui.model.workbench"); //$NON-NLS-1$
 		return set;
 	}
-	
+
 	public static class DynamicMenuContributionClass extends JavaClass {
-		private String aboutToShowMethodName = "aboutToShow";
-		private String aboutToHideMethodName = "aboutToHide";
+		private String aboutToShowMethodName = "aboutToShow"; //$NON-NLS-1$
+		private String aboutToHideMethodName = "aboutToHide"; //$NON-NLS-1$
 		private boolean useAboutToHide = false;
 
 		public DynamicMenuContributionClass(IPackageFragmentRoot root) {
@@ -121,9 +123,9 @@ public class NewDynamicMenuContributionClassWizard extends
 		}
 
 		public void setAboutToShowMethodName(String executeMethodName) {
-			support.firePropertyChange("aboutToShowMethodName",
-					this.aboutToShowMethodName,
-					this.aboutToShowMethodName = executeMethodName);
+			support.firePropertyChange(ABOUT_TO_SHOW_METHOD_NAME,
+				aboutToShowMethodName,
+				aboutToShowMethodName = executeMethodName);
 		}
 
 		public String getAboutToHideMethodName() {
@@ -131,9 +133,9 @@ public class NewDynamicMenuContributionClassWizard extends
 		}
 
 		public void setAboutToHideMethodName(String canExecuteMethodName) {
-			support.firePropertyChange("aboutToHideMethodName",
-					this.aboutToHideMethodName,
-					this.aboutToHideMethodName = canExecuteMethodName);
+			support.firePropertyChange(ABOUT_TO_HIDE_METHOD_NAME,
+				aboutToHideMethodName,
+				aboutToHideMethodName = canExecuteMethodName);
 		}
 
 		public boolean isUseAboutToHide() {
@@ -141,8 +143,8 @@ public class NewDynamicMenuContributionClassWizard extends
 		}
 
 		public void setUseAboutToHide(boolean useAboutToHide) {
-			support.firePropertyChange("useAboutToHide", this.useAboutToHide,
-					this.useAboutToHide = useAboutToHide);
+			support.firePropertyChange(USE_ABOUT_TO_HIDE, this.useAboutToHide,
+				this.useAboutToHide = useAboutToHide);
 		}
 	}