Attachment 227727 Details for Bug 402005 – Fix to support refactored Equinox

[patch] Fix to support refactored Equinox

eclipse.pde.ui.patch (text/plain), 3.10 KB, created by Thomas Watson

on 2013-02-28 09:20:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2013-02-28 09:20:04 EST

Size: 3.10 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.launching
>diff --git src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java
>index 7447d12..768465e 100644
>--- src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java
>+++ src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java
>@@ -27,6 +27,7 @@
> public class PDESourceLookupQuery implements ISafeRunnable {
> 
> 	protected static String OSGI_CLASSLOADER = "org.eclipse.osgi.internal.baseadaptor.DefaultClassLoader"; //$NON-NLS-1$
>+	protected static String OSGI_CLASSLOADER2 = "org.eclipse.osgi.internal.loader.ModuleClassLoader"; //$NON-NLS-1$
> 	private static String LEGACY_ECLIPSE_CLASSLOADER = "org.eclipse.core.runtime.adaptor.EclipseClassLoader"; //$NON-NLS-1$
> 	private static String MAIN_CLASS = "org.eclipse.core.launcher.Main"; //$NON-NLS-1$
> 	private static String MAIN_PLUGIN = "org.eclipse.platform"; //$NON-NLS-1$
>@@ -80,6 +81,8 @@
> 					} else {
> 						fResult = findSourceElement(classLoaderObject, sourcePath);
> 					}
>+				} else if (OSGI_CLASSLOADER2.equals(type.getName())) {
>+					fResult = findSourceElement(classLoaderObject, sourcePath);
> 				} else if (LEGACY_ECLIPSE_CLASSLOADER.equals(type.getName())) {
> 					fResult = findSourceElement_legacy(classLoaderObject, sourcePath);
> 				} else if (MAIN_CLASS.equals(declaringTypeName)) {
>@@ -133,28 +136,25 @@
> 	protected Object findSourceElement(IJavaObject object, String typeName) throws CoreException {
> 		IJavaObject manager = getObject(object, "manager", false); //$NON-NLS-1$
> 		if (manager != null) {
>-			IJavaObject data = getObject(manager, "data", false); //$NON-NLS-1$
>-			if (data != null) {
>-				// search manager's class path for location
>-				Object result = searchClasspathEntries(manager, typeName);
>-				if (result != null) {
>-					return result;
>-				}
>-				// then check its fragments
>-				IJavaObject frgArray = getObject(manager, "fragments", false); //$NON-NLS-1$
>-				if (frgArray instanceof IJavaArray) {
>-					IJavaArray fragments = (IJavaArray) frgArray;
>-					for (int i = 0; i < fragments.getLength(); i++) {
>-						IJavaObject fragment = (IJavaObject) fragments.getValue(i);
>-						if (!fragment.isNull()) {
>-							// search fragment class path
>-							result = searchClasspathEntries(fragment, typeName);
>-							if (result != null) {
>-								return result;
>-							}
>+			// search manager's class path for location
>+			Object result = searchClasspathEntries(manager, typeName);
>+			if (result != null) {
>+				return result;
>+			}
>+			// then check its fragments
>+			IJavaObject frgArray = getObject(manager, "fragments", false); //$NON-NLS-1$
>+			if (frgArray instanceof IJavaArray) {
>+				IJavaArray fragments = (IJavaArray) frgArray;
>+				for (int i = 0; i < fragments.getLength(); i++) {
>+					IJavaObject fragment = (IJavaObject) fragments.getValue(i);
>+					if (!fragment.isNull()) {
>+						// search fragment class path
>+						result = searchClasspathEntries(fragment, typeName);
>+						if (result != null) {
>+							return result;
> 						}
>-
> 					}
>+
> 				}
> 			}
> 		}

Actions: View | Diff

Attachments on bug 402005: 227727