summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis Windatt2013-06-27 15:47:55 (EDT)
committer Curtis Windatt2013-06-27 15:47:55 (EDT)
commit93a77f420a7471d0df788b415a37a6a372511cff (patch)
treed9e862cf5d09c7fcbfe57cf9142c29913fffdf54
parent2a70e37271c6cc4ce92789d950912eaecf983f39 (diff)
downloadeclipse.pde.ui-93a77f420a7471d0df788b415a37a6a372511cff.zip
eclipse.pde.ui-93a77f420a7471d0df788b415a37a6a372511cff.tar.gz
eclipse.pde.ui-93a77f420a7471d0df788b415a37a6a372511cff.tar.bz2
Bug 407772 - Broken NLS strings in bad manifest header error
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BundleManifestSourceLocationManager.java6
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties2
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BundleManifestSourceLocationManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BundleManifestSourceLocationManager.java
index bca5254..fcdc001 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BundleManifestSourceLocationManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BundleManifestSourceLocationManager.java
@@ -104,7 +104,7 @@ public class BundleManifestSourceLocationManager {
try {
version = new Version(versionEntry);
} catch (IllegalArgumentException e) {
- PDECore.log(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.SourceLocationManager_problemProcessingBundleManifestSourceHeader, e));
+ PDECore.log(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(PDECoreMessages.SourceLocationManager_problemProcessingBundleManifestSourceHeader, pluginName, pluginVersion), e));
}
if (pluginVersion.equals(version)) {
addSourceRoots(currentElement.getDirective("roots"), pluginSourceRoots); //$NON-NLS-1$
@@ -157,7 +157,7 @@ public class BundleManifestSourceLocationManager {
try {
return ManifestElement.parseHeader(ICoreConstants.ECLIPSE_SOURCE_BUNDLE, bundleSourceEntry);
} catch (BundleException e) {
- PDECore.log(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.SourceLocationManager_problemProcessingBundleManifestSourceHeader, e));
+ PDECore.log(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(PDECoreMessages.SourceLocationManager_problemProcessingBundleManifestSourceHeader, pluginName, pluginVersion), e));
}
}
}
@@ -197,7 +197,7 @@ public class BundleManifestSourceLocationManager {
try {
manifestElements = ManifestElement.parseHeader(ICoreConstants.ECLIPSE_SOURCE_BUNDLE, bundleSourceEntry);
} catch (BundleException e) {
- PDECore.log(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.SourceLocationManager_problemProcessingBundleManifestSourceHeader, e));
+ PDECore.log(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(PDECoreMessages.SourceLocationManager_problemProcessingBundleManifestSourceHeader, currentPlugin.getId(), currentPlugin.getVersion()), e));
}
if (manifestElements != null) {
IPath path = new Path(externalModels[i].getInstallLocation());
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 9841a7b..bef1fde 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
@@ -269,7 +269,7 @@ SourceEntryErrorReporter_MissingLibrary=The library ''{0}'' has not been specifi
SourceEntryErrorReporter_MissingOutputEntry=Source folder ''{0}'' does not have the output folder in corresponding output entry ''{1}''.
SourceEntryErrorReporter_MissingOutputLibForClassFolder=The class folder ''{0}'' is not associated to any output library entry.
-SourceLocationManager_problemProcessingBundleManifestSourceHeader=Problem processing bundle manifest source header in plug-in {0} version {1} found at {2}
+SourceLocationManager_problemProcessingBundleManifestSourceHeader=Problem processing bundle manifest source header in plug-in {0} version {1}
UpdateSiteBuilder_0=Cleaning {0}
VMHelper_noJreForExecEnv=No installed JREs satisfy this Execution Environment: "{0}". Launch aborted.