Attachment 211131 Details for Bug 361660 – Proposed fix

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

[patch] Proposed fix

patch_361660.txt (text/plain), 3.01 KB, created by Olivier Thomann

on 2012-02-16 12:14:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2012-02-16 12:14:22 EST

Size: 3.01 KB

patch

obsolete

>diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Reference.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Reference.java
>index 8ad1fb6..dcd1238 100644
>--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Reference.java
>+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Reference.java
>@@ -16,6 +16,7 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jdt.core.Flags;
> import org.eclipse.pde.api.tools.internal.model.StubApiComponent;
>+import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
> import org.eclipse.pde.api.tools.internal.provisional.Factory;
> import org.eclipse.pde.api.tools.internal.provisional.IApiAccess;
> import org.eclipse.pde.api.tools.internal.provisional.IApiAnnotations;
>@@ -431,6 +432,10 @@
> 						IApiTypeRoot classFile = Util.getClassFile(
> 								new IApiComponent[] { sourceComponent },
> 								interfacesNames[i]);
>+						if (classFile == null) {
>+							ApiPlugin.logErrorMessage("Class file for " + interfacesNames[i] + " was not found for " + sourceComponent.getName()); //$NON-NLS-1$ //$NON-NLS-2$
>+							return false;
>+						}
> 						IApiType superinterface = classFile.getStructure();
> 						if (superinterface != null && resolveMethod(sourceComponent, superinterface, methodName, methodSignature)) {
> 							return true;
>@@ -444,6 +449,10 @@
> 					IApiTypeRoot classFile = Util.getClassFile(
> 							new IApiComponent[] { sourceComponent },
> 							superclassName);
>+					if (classFile == null) {
>+						ApiPlugin.logErrorMessage("Class file for " + superclassName + " was not found for " + sourceComponent.getName()); //$NON-NLS-1$ //$NON-NLS-2$
>+						return false;
>+					}
> 					IApiType superclass = classFile.getStructure();
> 					boolean resolved = resolveMethod(sourceComponent, superclass, methodName, methodSignature);
> 					if (resolved) {
>@@ -465,6 +474,10 @@
> 					IApiTypeRoot classFile = Util.getClassFile(
> 							new IApiComponent[] { sourceComponent },
> 							superclassName);
>+					if (classFile == null) {
>+						ApiPlugin.logErrorMessage("Class file for " + superclassName + " was not found for " + sourceComponent.getName()); //$NON-NLS-1$ //$NON-NLS-2$
>+						return false;
>+					}
> 					IApiType superclass = classFile.getStructure();
> 					boolean resolved = resolveMethod(sourceComponent, superclass, methodName, methodSignature);
> 					if (resolved) {
>@@ -478,6 +491,10 @@
> 							IApiTypeRoot classFile = Util.getClassFile(
> 									new IApiComponent[] { sourceComponent },
> 									interfacesNames[i]);
>+							if (classFile == null) {
>+								ApiPlugin.logErrorMessage("Class file for " + interfacesNames[i] + " was not found for " + sourceComponent.getName()); //$NON-NLS-1$ //$NON-NLS-2$
>+								return false;
>+							}
> 							IApiType superinterface = classFile.getStructure();
> 							if (superinterface != null && resolveMethod(sourceComponent, superinterface, methodName, methodSignature)) {
> 								return true;

Actions: View | Diff

Attachments on bug 361660: 211125 | 211131