Bug 383001 - Typo in "Key 'mathProcessorName' is not found localization properties file"

4 files changed, 17 insertions, 9 deletions

diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java
index 895d75a319..0815919e31 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 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
@@ -87,6 +87,13 @@ public class PDEManager {
 			urls.add(location);
 	}
 
+	/**
+	 * Returns the bundle localization file specified by the manifest header or the default location.  The
+	 * file may not exist.
+	 * 
+	 * @param model the plug-in to lookup the localization for
+	 * @return the bundle localization file location or the default location
+	 */
 	public static String getBundleLocalization(IPluginModelBase model) {
 		if (model instanceof IBundlePluginModelBase && model.getUnderlyingResource() != null)
 			return ((IBundlePluginModelBase) model).getBundleLocalization();
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
index 2d0791205d..436e6dc28f 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 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
@@ -932,8 +932,9 @@ public class BundleErrorReporter extends JarManifestErrorReporter {
 					report(NLS.bind(PDECoreMessages.Builders_Manifest_non_ext_attribute, header.getName()), getLine(header, value), severity, PDEMarkerFactory.P_UNTRANSLATED_NODE, header.getName(), PDEMarkerFactory.CAT_NLS);
 				} else if (fModel instanceof AbstractNLModel) {
 					NLResourceHelper helper = ((AbstractNLModel) fModel).getNLResourceHelper();
-					if (helper == null || !helper.resourceExists(value))
-						report(NLS.bind(PDECoreMessages.Builders_Manifest_key_not_found, value.substring(1)), getLine(header, value), severity, PDEMarkerFactory.CAT_NLS);
+					if (helper == null || !helper.resourceExists(value)) {
+						report(NLS.bind(PDECoreMessages.Builders_Manifest_key_not_found, value.substring(1), PDEManager.getBundleLocalization(fModel).concat(".properties")), getLine(header, value), severity, PDEMarkerFactory.CAT_NLS); //$NON-NLS-1$
+					}
 				}
 			}
 		}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
index ef00412cfd..fb5597598c 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 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
@@ -430,7 +430,7 @@ public class ExtensionsErrorReporter extends ManifestErrorReporter {
 		} else if (fModel instanceof AbstractNLModel) {
 			NLResourceHelper helper = ((AbstractNLModel) fModel).getNLResourceHelper();
 			if (helper == null || !helper.resourceExists(value)) {
-				report(NLS.bind(PDECoreMessages.Builders_Manifest_key_not_found, value.substring(1)), getLine(element, attr.getName()), severity, PDEMarkerFactory.CAT_NLS);
+				report(NLS.bind(PDECoreMessages.Builders_Manifest_key_not_found, value.substring(1), PDEManager.getBundleLocalization(fModel).concat(".properties")), getLine(element, attr.getName()), severity, PDEMarkerFactory.CAT_NLS); //$NON-NLS-1$
 			}
 		}
 	}
@@ -447,7 +447,7 @@ public class ExtensionsErrorReporter extends ManifestErrorReporter {
 		} else if (fModel instanceof AbstractNLModel) {
 			NLResourceHelper helper = ((AbstractNLModel) fModel).getNLResourceHelper();
 			if (helper == null || !helper.resourceExists(value)) {
-				report(NLS.bind(PDECoreMessages.Builders_Manifest_key_not_found, value.substring(1)), getLine(element), severity, PDEMarkerFactory.CAT_NLS);
+				report(NLS.bind(PDECoreMessages.Builders_Manifest_key_not_found, value.substring(1), PDEManager.getBundleLocalization(fModel).concat(".properties")), getLine(element), severity, PDEMarkerFactory.CAT_NLS); //$NON-NLS-1$
 			}
 		}
 	}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties
index 1f9810200d..8b9d759393 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
+# Copyright (c) 2000, 2012 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
@@ -114,7 +114,7 @@ BuildErrorReporter_cannotFindJar={0} cannot be resolved
 BuildErrorReporter_cannotFindBundle=Bundle {0} cannot be resolved
 BuildErrorReporter_CompilercomplianceLevel=Compiler compliance level
 BuildErrorReporter_DisallowIdentifiers=Disallow identifiers
-Builders_Manifest_key_not_found = Key ''{0}'' is not found localization properties file
+Builders_Manifest_key_not_found = Key ''{0}'' is not found in localization properties file: {1}
 Builders_Manifest_useless_file = A plug-in manifest must contain at least one extension or extension point
 BuildErrorReporter_missingEntry = ''{0}'' build entry is missing