Attachment 127225 Details for Bug 266406 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

patch nonsingleton.txt (text/plain), 4.18 KB, created by Oleg Besedin

on 2009-03-02 15:59:33 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Besedin

Created: 2009-03-02 15:59:33 EST

Size: 4.18 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.registry
>Index: src/org/eclipse/core/internal/registry/messages.properties
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties,v
>retrieving revision 1.10
>diff -u -r1.10 messages.properties
>--- src/org/eclipse/core/internal/registry/messages.properties	10 Jan 2008 20:55:53 -0000	1.10
>+++ src/org/eclipse/core/internal/registry/messages.properties	2 Mar 2009 20:57:11 -0000
>@@ -39,6 +39,7 @@
> parse_process = Processing XML extension registry contribution
> parse_failedParsingManifest = Could not parse XML contribution for \"{0}\". Any contributed extensions and extension points will be ignored.
> parse_nonSingleton = The extensions and extension-points from the bundle \"{0}\" are ignored. The bundle is not marked as singleton. 
>+parse_nonSingletonFragment = The extensions and extension-points from the bundle \"{0}\" are ignored. The host bundle \"{1}\" is not marked as singleton. 
> parse_problems = Problems parsing plug-in manifest for: \"{0}\".
> parse_duplicateExtension = Extensions supplied by \"{0}\" and \"{1}\" have the same Id: \"{2}\".
> parse_duplicateExtensionPoint = Ignored duplicate extension point \"{0}\" supplied by \"{1}\".
>Index: src/org/eclipse/core/internal/registry/RegistryMessages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java,v
>retrieving revision 1.8
>diff -u -r1.8 RegistryMessages.java
>--- src/org/eclipse/core/internal/registry/RegistryMessages.java	10 Jan 2008 20:55:53 -0000	1.8
>+++ src/org/eclipse/core/internal/registry/RegistryMessages.java	2 Mar 2009 20:57:11 -0000
>@@ -50,6 +50,7 @@
> 	public static String parse_process;
> 	public static String parse_failedParsingManifest;
> 	public static String parse_nonSingleton;
>+	public static String parse_nonSingletonFragment;
> 	public static String parse_problems;
> 	public static String parse_duplicateExtension;
> 	public static String parse_duplicateExtensionPoint;
>Index: src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java,v
>retrieving revision 1.11
>diff -u -r1.11 EclipseBundleListener.java
>--- src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java	16 May 2008 13:51:09 -0000	1.11
>+++ src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java	2 Mar 2009 20:57:11 -0000
>@@ -124,8 +124,8 @@
> 		// If the bundle is not a singleton, then it is not added
> 		if (!isSingleton(bundle)) {
> 			if (report) {
>-				String message = NLS.bind(RegistryMessages.parse_nonSingleton, bundle.getLocation());
>-				RuntimeLog.log(new Status(IStatus.INFO, RegistryMessages.OWNER_NAME, 0, message, null));
>+				String message = NLS.bind(RegistryMessages.parse_nonSingleton, bundle.getSymbolicName());
>+				RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
> 			}
> 			return null;
> 		}
>@@ -141,8 +141,8 @@
> 			return extensionURL;
> 
> 		if (report) {
>-			String message = NLS.bind(RegistryMessages.parse_nonSingleton, hosts[0].getLocation());
>-			RuntimeLog.log(new Status(IStatus.INFO, RegistryMessages.OWNER_NAME, 0, message, null));
>+			String message = NLS.bind(RegistryMessages.parse_nonSingletonFragment, bundle.getSymbolicName(), hosts[0].getSymbolicName());
>+			RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
> 		}
> 		return null;
> 	}
>@@ -155,7 +155,7 @@
> 		IContributor contributor = ContributorFactoryOSGi.createContributor(bundle);
> 		if (registry.hasContributor(contributor))
> 			return;
>-		URL pluginManifest = getExtensionURL(bundle, registry.debug());
>+		URL pluginManifest = getExtensionURL(bundle, true);
> 		if (pluginManifest == null)
> 			return;
> 		InputStream is;

Actions: View | Diff

Attachments on bug 266406: 127225