Attachment 231122 Details for Bug 408152 – continued work

[patch] continued work

pom-checker-2.patch (text/plain), 25.04 KB, created by Michael Rennie

on 2013-05-16 17:21:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2013-05-16 17:21:39 EDT

Size: 25.04 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.releng.tools/plugin.xml b/bundles/org.eclipse.releng.tools/plugin.xml
>index a212745..53dbe4f 100644
>--- a/bundles/org.eclipse.releng.tools/plugin.xml
>+++ b/bundles/org.eclipse.releng.tools/plugin.xml
>@@ -179,15 +179,5 @@
>           markerType="org.eclipse.releng.tools.pomVersionProblem">
>     </markerResolutionGenerator>
>  </extension>
>- <extension
>-       id="PomVersionBuilder"
>-       name="Pom Version Tool"
>-       point="org.eclipse.core.resources.builders">
>-    <builder>
>-       <run
>-             class="org.eclipse.releng.tools.pomversion.PomVersionBuilder">
>-       </run>
>-    </builder>
>- </extension>
> 
> </plugin>
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java
>index de43964..27077ea 100644
>--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RelEngPlugin.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2012 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -20,8 +20,13 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.eclipse.releng.tools.pomversion.IPomVersionConstants;
>+import org.eclipse.releng.tools.pomversion.PomVersionErrorReporter;
> import org.eclipse.team.core.RepositoryProvider;
> import org.eclipse.ui.plugin.AbstractUIPlugin;
>+import org.osgi.framework.BundleContext;
> 
> 
> /**
>@@ -39,6 +44,7 @@
> 	public static final String MAP_FOLDER = Messages.getString("RelEngPlugin.2"); //$NON-NLS-1$
> 	private static final String BINARY_REPOSITORY_PROVIDER_CLASS_NAME= "org.eclipse.pde.internal.core.BinaryRepositoryProvider"; //$NON-NLS-1$
> 
>+	PomVersionErrorReporter fPomReporter = new PomVersionErrorReporter();
> 	
> 	//The shared instance.
> 	private static RelEngPlugin plugin;
>@@ -57,6 +63,33 @@
> 		}
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
>+	 */
>+	public void start(BundleContext context) throws Exception {
>+		super.start(context);
>+		IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ID);
>+		if(node != null) {
>+			node.addPreferenceChangeListener(fPomReporter);
>+			String severity = getPreferenceStore().getString(IPomVersionConstants.POM_VERSION_ERROR_LEVEL);
>+			if(!IPomVersionConstants.VALUE_IGNORE.equals(severity)) {
>+				ResourcesPlugin.getWorkspace().addResourceChangeListener(fPomReporter);
>+			}
>+		}
>+	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
>+	 */
>+	public void stop(BundleContext context) throws Exception {
>+		IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ID);
>+		if(node != null) {
>+			node.removePreferenceChangeListener(fPomReporter);
>+			ResourcesPlugin.getWorkspace().removeResourceChangeListener(fPomReporter);
>+		}
>+		super.stop(context);
>+	}
>+	
> 	/**
> 	 * Returns the shared instance.
> 	 */
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/Messages.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/Messages.java
>new file mode 100644
>index 0000000..c10ffe8
>--- /dev/null
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/Messages.java
>@@ -0,0 +1,28 @@
>+/*******************************************************************************
>+ * Copyright (c) 2013 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.releng.tools.pomversion;
>+
>+import org.eclipse.osgi.util.NLS;
>+
>+/**
>+ * 
>+ */
>+public class Messages extends NLS {
>+	private static final String BUNDLE_NAME = "org.eclipse.releng.tools.pomversion.messages"; //$NON-NLS-1$
>+	public static String PomVersionErrorReporter_pom_version_error_marker_message;
>+	static {
>+		// initialize resource bundle
>+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
>+	}
>+
>+	private Messages() {
>+	}
>+}
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionBuilder.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionBuilder.java
>deleted file mode 100644
>index b0b050c..0000000
>--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionBuilder.java
>+++ /dev/null
>@@ -1,139 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2013 IBM Corporation and others.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- * 
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.releng.tools.pomversion;
>-
>-import java.util.Map;
>-import java.util.jar.JarFile;
>-
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.IResourceDelta;
>-import org.eclipse.core.resources.IResourceDeltaVisitor;
>-import org.eclipse.core.resources.IncrementalProjectBuilder;
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.core.runtime.Path;
>-import org.eclipse.core.runtime.SubMonitor;
>-import org.eclipse.osgi.util.NLS;
>-import org.eclipse.releng.tools.RelEngPlugin;
>-
>-/**
>- * Builder for creating POM version problems
>- */
>-public class PomVersionBuilder extends IncrementalProjectBuilder {
>-	
>-	/**
>-	 * Project relative path to the pom.xml file
>-	 */
>-	public static final IPath POM_PATH = new Path("pom.xml"); //$NON-NLS-1$
>-
>-	/**
>-	 * Project relative path to the manifest file.
>-	 */
>-	public static final IPath MANIFEST_PATH = new Path(JarFile.MANIFEST_NAME);
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
>-	 */
>-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
>-		if (!getProject().isAccessible()) {
>-			return null;
>-		}
>-		
>-		if (kind == FULL_BUILD) {
>-			fullBuild(monitor);
>-		} else {
>-			IResourceDelta delta = getDelta(getProject());
>-			if (delta == null) {
>-				fullBuild(monitor);
>-			} else {
>-				incrementalBuild(delta, monitor);
>-			}
>-		}
>-		return null;
>-	}	
>-	
>-	private void incrementalBuild(IResourceDelta delta, IProgressMonitor monitor) {
>-		PomResourceDeltaVisitor visitor = new PomResourceDeltaVisitor();
>-		try {
>-			delta.accept(visitor);
>-		} catch (CoreException e) {
>-			RelEngPlugin.log(e);
>-		}
>-		if (visitor.doBuild()){
>-			fullBuild(monitor);
>-		}
>-	}
>-
>-	private void fullBuild(IProgressMonitor monitor) {
>-		IProject project = getProject();
>-		SubMonitor localMonitor = SubMonitor.convert(monitor, NLS.bind("Comparing POM and plug-in version in {0}", project.getName()), 10);
>-		IFile pomFile = project.getFile(POM_PATH);
>-		IFile manifestFile = project.getFile(MANIFEST_PATH);
>-		if (pomFile.exists() && manifestFile.exists()){
>-			PomVersionErrorReporter reporter = new PomVersionErrorReporter(manifestFile, pomFile);
>-			reporter.validate(localMonitor);
>-		}
>-		localMonitor.done();
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#clean(org.eclipse.core.runtime.IProgressMonitor)
>-	 */
>-	protected void clean(IProgressMonitor monitor) throws CoreException {
>-		getProject().deleteMarkers(IPomVersionConstants.PROBLEM_MARKER_TYPE, false, IResource.DEPTH_INFINITE);
>-	}
>-	
>-	private class PomResourceDeltaVisitor implements IResourceDeltaVisitor {
>-		private boolean build;
>-
>-		public boolean visit(IResourceDelta delta) {
>-			build = false;
>-			if (delta != null) {
>-				int kind = delta.getKind();
>-				// A file being removed doesn't affect the pom version check (markers are already cleaned)
>-				if (kind == IResourceDelta.REMOVED) {
>-					return false;
>-				}
>-				
>-				IResource resource = delta.getResource();
>-				// by ignoring derived resources we should scale a bit better.
>-				if (resource.isDerived())
>-					return false;
>-				if (resource.getType() == IResource.FILE) {
>-					IFile file = (IFile) resource;
>-					IFile pomFile = file.getProject().getFile(POM_PATH);
>-					if (file.equals(pomFile)){
>-						build = true;
>-						return false;
>-					}
>-					IFile manifestFile = file.getProject().getFile(MANIFEST_PATH);
>-					if (file.equals(manifestFile)){
>-						build = true;
>-						return false;
>-					}
>-					return false;
>-				}
>-			}
>-			return true;
>-		}
>-
>-		/**
>-		 * @return whether the delta contained a file requiring a build
>-		 */
>-		public boolean doBuild() {
>-			return build;
>-		}
>-	}
>-
>-}
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionErrorReporter.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionErrorReporter.java
>index c24bdff..584f8b1 100644
>--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionErrorReporter.java
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/PomVersionErrorReporter.java
>@@ -11,6 +11,7 @@
> package org.eclipse.releng.tools.pomversion;
> 
> import java.util.Stack;
>+import java.util.jar.JarFile;
> 
> import javax.xml.parsers.SAXParser;
> import javax.xml.parsers.SAXParserFactory;
>@@ -21,13 +22,22 @@
> import org.eclipse.core.filebuffers.LocationKind;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IMarker;
>-import org.eclipse.core.resources.ProjectScope;
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IResourceChangeEvent;
>+import org.eclipse.core.resources.IResourceChangeListener;
>+import org.eclipse.core.resources.IResourceDelta;
>+import org.eclipse.core.resources.IResourceDeltaVisitor;
>+import org.eclipse.core.resources.IWorkspaceRoot;
>+import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.core.runtime.Platform;
>+import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.SubMonitor;
>-import org.eclipse.core.runtime.preferences.IPreferencesService;
>-import org.eclipse.core.runtime.preferences.IScopeContext;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
> import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.osgi.util.NLS;
>@@ -43,36 +53,87 @@
>  * version specified in pom.xml matches the bundle version.
>  *
>  */
>-public class PomVersionErrorReporter {
>+public class PomVersionErrorReporter implements IResourceChangeListener, IEclipsePreferences.IPreferenceChangeListener {
> 
>+	class PomResourceDeltaVisitor implements IResourceDeltaVisitor {
>+
>+		IResource fResource = null;
>+		public boolean visit(IResourceDelta delta) {
>+			if (delta != null) {
>+				int kind = delta.getKind();
>+				// A file being removed doesn't affect the pom version check (markers are already cleaned)
>+				if (kind == IResourceDelta.REMOVED) {
>+					return false;
>+				}
>+				
>+				IResource resource = delta.getResource();
>+				// by ignoring derived resources we should scale a bit better.
>+				if (resource.isDerived())
>+					return false;
>+				if (resource.getType() == IResource.FILE) {
>+					IFile file = (IFile) resource;
>+					IFile pomFile = file.getProject().getFile(POM_PATH);
>+					if (file.equals(pomFile)){
>+						fResource = pomFile;
>+						return false;
>+					}
>+					IFile manifestFile = file.getProject().getFile(MANIFEST_PATH);
>+					if (file.equals(manifestFile)){
>+						fResource = manifestFile;
>+						return false;
>+					}
>+					return false;
>+				}
>+			}
>+			return true;
>+		}
>+	}
>+	
>+	/**
>+	 * Project relative path to the pom.xml file
>+	 */
>+	public static final IPath POM_PATH = new Path("pom.xml"); //$NON-NLS-1$
>+
>+	/**
>+	 * Project relative path to the manifest file.
>+	 */
>+	public static final IPath MANIFEST_PATH = new Path(JarFile.MANIFEST_NAME);
> 	private static final String ELEMENT_PROJECT = "project"; //$NON-NLS-1$
> 	private static final String ELEMENT_VERSION = "version"; //$NON-NLS-1$
> 	private static final String SNAPSHOT_SUFFIX = "-SNAPSHOT"; //$NON-NLS-1$
> 
>-	private SAXParserFactory parserFactory = SAXParserFactory.newInstance();
>-	private String pomVersionSeverity;
>-	
>-	private IFile manifestFile;
>-	private IFile pomFile;
>-
>-	public PomVersionErrorReporter(IFile manifest, IFile pom) {
>-		manifestFile = manifest;
>-		pomFile = pom;
>-	}
>-
>-	protected void validate(IProgressMonitor monitor) {
>+	/**
>+	 * Validates the version in the Manifest.MF file against the version in the pom.xml file
>+	 * 
>+	 * @param project
>+	 * @param severity
>+	 * @param monitor
>+	 */
>+	public void validate(IProject project, String severity, IProgressMonitor monitor) {
> 		SubMonitor subMon = SubMonitor.convert(monitor, 10);
>+		if(!project.isAccessible()) {
>+			return;
>+		}
>+		//clean up existing markers
>+		try {
>+			project.deleteMarkers(IPomVersionConstants.PROBLEM_MARKER_TYPE, false, IResource.DEPTH_INFINITE);
>+		}
>+		catch(CoreException e) {
>+			RelEngPlugin.log(e);
>+		}
>+		if (IPomVersionConstants.VALUE_IGNORE.equals(severity)) {
>+			return;
>+		}
>+		IFile manifest = project.getFile(MANIFEST_PATH);
>+		if(!manifest.exists()) {
>+			return;
>+		}
>+		IFile pom = project.getFile(POM_PATH);
>+		if(!pom.exists()) {
>+			return;
>+		}
> 		try {
> 			if (subMon.isCanceled()) {
>-				return;
>-			}
>-			if (!manifestFile.exists() || !pomFile.exists()){
>-				return;
>-			}
>-			
>-			IPreferencesService service = Platform.getPreferencesService();
>-			pomVersionSeverity = service.getString(RelEngPlugin.ID, IPomVersionConstants.POM_VERSION_ERROR_LEVEL, IPomVersionConstants.VALUE_IGNORE, new IScopeContext[] {new ProjectScope(manifestFile.getProject())});
>-			if (pomVersionSeverity == IPomVersionConstants.VALUE_IGNORE) {
> 				return;
> 			}
> 			
>@@ -81,9 +142,10 @@
> 
> 			// Compare it to the pom file version
> 			try {
>+				SAXParserFactory parserFactory = SAXParserFactory.newInstance();
> 				SAXParser parser = parserFactory.newSAXParser();
>-				PomVersionHandler handler = new PomVersionHandler(pomFile, bundleVersion);
>-				parser.parse(pomFile.getContents(), handler);
>+				PomVersionHandler handler = new PomVersionHandler(pom, bundleVersion, severity);
>+				parser.parse(pom.getContents(), handler);
> 			} catch (Exception e1) {
> 				// Ignored, if there is a problem with the pom file don't create a marker
> 			}
>@@ -97,11 +159,11 @@
> 
> 	}
> 
>-	private void reportMarker(String message, int lineNumber, int charStart, int charEnd, String correctedVersion) {
>+	void reportMarker(String message, int lineNumber, int charStart, int charEnd, String correctedVersion, IFile pom, String severity) {
> 		try {
>-			IMarker marker = pomFile.createMarker(IPomVersionConstants.PROBLEM_MARKER_TYPE);
>+			IMarker marker = pom.createMarker(IPomVersionConstants.PROBLEM_MARKER_TYPE);
> 			marker.setAttribute(IMarker.MESSAGE, message);
>-			if (pomVersionSeverity != null && pomVersionSeverity.equals(IPomVersionConstants.VALUE_WARNING)){
>+			if (severity.equals(IPomVersionConstants.VALUE_WARNING)){
> 				marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
> 			} else {
> 				marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>@@ -122,8 +184,12 @@
> 		private Stack elements = new Stack();
> 		private boolean checkVersion = false;
> 		private Locator locator;
>+		IFile pom = null;
>+		String severity = null;
> 
>-		public PomVersionHandler(IFile file, Version bundleVersion) {
>+		public PomVersionHandler(IFile file, Version bundleVersion, String pref) {
>+			pom = file;
>+			severity = pref;
> 			this.bundleVersion = bundleVersion;
> 		}
> 
>@@ -168,11 +234,17 @@
> 
> 						try {
> 							// Need to create a document to calculate the markers charstart and charend
>-							IDocument doc = createDocument(pomFile);
>+							IDocument doc = createDocument(pom);
> 							int offset = doc.getLineOffset(locator.getLineNumber() - 1); // locator lines start at 1
> 							int charEnd = offset + locator.getColumnNumber() - 1; // returns column at end of character string, columns start at 1
> 							int charStart = charEnd - length;
>-							reportMarker(NLS.bind("POM artifact version {0} does not match bundle version {1}", pomVersion2.toString(), bundleVersion2.toString()), locator.getLineNumber(), charStart, charEnd, correctedVersion);
>+							reportMarker(NLS.bind(Messages.PomVersionErrorReporter_pom_version_error_marker_message, pomVersion2.toString(), bundleVersion2.toString()), 
>+									locator.getLineNumber(), 
>+									charStart, 
>+									charEnd, 
>+									correctedVersion,
>+									pom,
>+									severity);
> 						} catch (BadLocationException e) {
> 							RelEngPlugin.log(e);
> 						}
>@@ -203,4 +275,64 @@
> 		}
> 		return null;
> 	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
>+	 */
>+	public void resourceChanged(IResourceChangeEvent event) {
>+		IResourceDelta delta = event.getDelta();
>+		if(delta != null) {
>+			final PomResourceDeltaVisitor visitor = new PomResourceDeltaVisitor();
>+			try {
>+				delta.accept(visitor);
>+				if(visitor.fResource != null) {
>+					if(MANIFEST_PATH.equals(visitor.fResource.getProjectRelativePath())) {
>+						/*IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
>+							public void run(IProgressMonitor monitor) throws CoreException {*/
>+								validate(visitor.fResource.getProject(), 
>+										RelEngPlugin.getPlugin().getPreferenceStore().getString(IPomVersionConstants.POM_VERSION_ERROR_LEVEL), 
>+										new NullProgressMonitor());
>+							/*}
>+						};
>+						ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());*/
>+					}
>+				}
>+			} catch (CoreException e) {
>+				RelEngPlugin.log(e);
>+			}
>+		}
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
>+	 */
>+	public void preferenceChange(PreferenceChangeEvent event) {
>+		if(IPomVersionConstants.POM_VERSION_ERROR_LEVEL.equals(event.getKey())) {
>+			final String severity = (String) event.getNewValue();
>+			if(severity != null) {
>+				if(IPomVersionConstants.VALUE_IGNORE.equals(severity)) {
>+					//we turned it off
>+					ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
>+				}
>+				else if(IPomVersionConstants.VALUE_IGNORE.equals(event.getOldValue())) {
>+					// we turned it on
>+					ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
>+				}
>+				/*IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
>+					public void run(IProgressMonitor monitor) throws CoreException {*/
>+						IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
>+						IProject[] projects = root.getProjects();
>+						for (int i = 0; i < projects.length; i++) {
>+							validate(projects[i], severity, new NullProgressMonitor());
>+						}
>+					/*}
>+				};
>+				try {
>+					ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
>+				} catch (CoreException e) {
>+					RelEngPlugin.log(e);
>+				}*/
>+			}
>+		}
>+	}
> }
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/messages.properties b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/messages.properties
>new file mode 100644
>index 0000000..9d40048
>--- /dev/null
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/pomversion/messages.properties
>@@ -0,0 +1 @@
>+PomVersionErrorReporter_pom_version_error_marker_message=POM artifact version {0} does not match bundle version {1}
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/Messages.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/Messages.java
>new file mode 100644
>index 0000000..ccae890
>--- /dev/null
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/Messages.java
>@@ -0,0 +1,29 @@
>+/*******************************************************************************
>+ * Copyright (c) 2013 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.releng.tools.preferences;
>+
>+import org.eclipse.osgi.util.NLS;
>+
>+/**
>+ * 
>+ */
>+public class Messages extends NLS {
>+	private static final String BUNDLE_NAME = "org.eclipse.releng.tools.preferences.messages"; //$NON-NLS-1$
>+	public static String PomErrorLevelBlock_mismatched_pom_versions_pref;
>+	public static String PomVersionPreferencePage_pom_pref_message;
>+	static {
>+		// initialize resource bundle
>+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
>+	}
>+
>+	private Messages() {
>+	}
>+}
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java
>index ce2190e..3059194 100644
>--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomErrorLevelBlock.java
>@@ -185,9 +185,9 @@
> 	 * Constant representing the severity values presented in the combo boxes for each option
> 	 */
> 	private static final String[] SEVERITIES_LABELS = {
>-		"Error",
>-		"Warning",
>-		"Ignore"
>+		"Error", //$NON-NLS-1$
>+		"Warning", //$NON-NLS-1$
>+		"Ignore" //$NON-NLS-1$
> 	};
> 	
> 	/**
>@@ -275,7 +275,7 @@
> 		fMainComp.setLayout(gl);
> 		fMainComp.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
> 		fMainComp.setFont(parent.getFont());
>-		this.fCombo = createComboControl(fMainComp, "Mismatched plug-in and pom.xml version numbers", KEY_POM_VERSION_ERROR_LEVEL);
>+		this.fCombo = createComboControl(fMainComp, Messages.PomErrorLevelBlock_mismatched_pom_versions_pref, KEY_POM_VERSION_ERROR_LEVEL);
> 		Dialog.applyDialogFont(fMainComp);
> 		return fMainComp;
> 	}
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java
>index d97616a..7231d8e 100644
>--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/PomVersionPreferencePage.java
>@@ -51,7 +51,7 @@
> 		GridData gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
> 		gd.widthHint = 400;
> 		label.setLayoutData(gd);
>-		label.setText("The POM Version tool will compare the artifact version in a pom.xml file at the root of the project to the plug-in version in the manifest. If the two versions do not match a problem marker will be created. The severity of this problem can be configured on this page.");
>+		label.setText(Messages.PomVersionPreferencePage_pom_pref_message);
> 		label.setFont(comp.getFont());
> 		
> 		block = new PomErrorLevelBlock((IWorkbenchPreferenceContainer)getContainer());
>diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/messages.properties b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/messages.properties
>new file mode 100644
>index 0000000..de1c383
>--- /dev/null
>+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/messages.properties
>@@ -0,0 +1,2 @@
>+PomErrorLevelBlock_mismatched_pom_versions_pref=&Mismatched plug-in and pom.xml version numbers
>+PomVersionPreferencePage_pom_pref_message=The POM Version tool will compare the artifact version in a pom.xml file at the root of the project to the plug-in version in the manifest. If the two versions do not match a problem marker will be created. The severity of this problem can be configured on this page.

Actions: View | Diff

Attachments on bug 408152: 231051 | 231122 | 231273 | 231276