Attachment #127225 for bug #266406

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

View | Details | Raw Unified | Return to bug 266406
Collapse All | Expand All

Lines 39-44 Link Here

(-)src/org/eclipse/core/internal/registry/messages.properties (+1 lines)
39	parse_process = Processing XML extension registry contribution	39	parse_process = Processing XML extension registry contribution
40	parse_failedParsingManifest = Could not parse XML contribution for \"{0}\". Any contributed extensions and extension points will be ignored.	40	parse_failedParsingManifest = Could not parse XML contribution for \"{0}\". Any contributed extensions and extension points will be ignored.
41	parse_nonSingleton = The extensions and extension-points from the bundle \"{0}\" are ignored. The bundle is not marked as singleton.	41	parse_nonSingleton = The extensions and extension-points from the bundle \"{0}\" are ignored. The bundle is not marked as singleton.
		42	parse_nonSingletonFragment = The extensions and extension-points from the bundle \"{0}\" are ignored. The host bundle \"{1}\" is not marked as singleton.
42	parse_problems = Problems parsing plug-in manifest for: \"{0}\".	43	parse_problems = Problems parsing plug-in manifest for: \"{0}\".
43	parse_duplicateExtension = Extensions supplied by \"{0}\" and \"{1}\" have the same Id: \"{2}\".	44	parse_duplicateExtension = Extensions supplied by \"{0}\" and \"{1}\" have the same Id: \"{2}\".
44	parse_duplicateExtensionPoint = Ignored duplicate extension point \"{0}\" supplied by \"{1}\".	45	parse_duplicateExtensionPoint = Ignored duplicate extension point \"{0}\" supplied by \"{1}\".

Lines 50-55 Link Here

(-)src/org/eclipse/core/internal/registry/RegistryMessages.java (+1 lines)
50	public static String parse_process;	50	public static String parse_process;
51	public static String parse_failedParsingManifest;	51	public static String parse_failedParsingManifest;
52	public static String parse_nonSingleton;	52	public static String parse_nonSingleton;
		53	public static String parse_nonSingletonFragment;
53	public static String parse_problems;	54	public static String parse_problems;
54	public static String parse_duplicateExtension;	55	public static String parse_duplicateExtension;
55	public static String parse_duplicateExtensionPoint;	56	public static String parse_duplicateExtensionPoint;




		// 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.getSymbolicName());
				RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
			}
			return null;
		}

			return extensionURL;

		if (report) {
			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;
	}

		IContributor contributor = ContributorFactoryOSGi.createContributor(bundle);
		if (registry.hasContributor(contributor))
			return;
		URL pluginManifest = getExtensionURL(bundle, true);
		if (pluginManifest == null)
			return;
		InputStream is;

Return to bug 266406

Lines 124-131 Link Here

(-)src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java (-5 / +5 lines)
124	// If the bundle is not a singleton, then it is not added	124	// If the bundle is not a singleton, then it is not added
125	if (!isSingleton(bundle)) {	125	if (!isSingleton(bundle)) {
126	if (report) {	126	if (report) {
127	String message = NLS.bind(RegistryMessages.parse_nonSingleton, bundle.getLocation());	127	String message = NLS.bind(RegistryMessages.parse_nonSingleton, bundle.getSymbolicName());
128	RuntimeLog.log(new Status(IStatus.INFO, RegistryMessages.OWNER_NAME, 0, message, null));	128	RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
129	}	129	}
130	return null;	130	return null;
131	}	131	}
Lines 141-148 Link Here
141	return extensionURL;	141	return extensionURL;
142		142
143	if (report) {	143	if (report) {
144	String message = NLS.bind(RegistryMessages.parse_nonSingleton, hosts[0].getLocation());	144	String message = NLS.bind(RegistryMessages.parse_nonSingletonFragment, bundle.getSymbolicName(), hosts[0].getSymbolicName());
145	RuntimeLog.log(new Status(IStatus.INFO, RegistryMessages.OWNER_NAME, 0, message, null));	145	RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
146	}	146	}
147	return null;	147	return null;
148	}	148	}
Lines 155-161 Link Here
155	IContributor contributor = ContributorFactoryOSGi.createContributor(bundle);	155	IContributor contributor = ContributorFactoryOSGi.createContributor(bundle);
156	if (registry.hasContributor(contributor))	156	if (registry.hasContributor(contributor))
157	return;	157	return;
158	URL pluginManifest = getExtensionURL(bundle, registry.debug());	158	URL pluginManifest = getExtensionURL(bundle, true);
159	if (pluginManifest == null)	159	if (pluginManifest == null)
160	return;	160	return;
161	InputStream is;	161	InputStream is;