Attachment 225268 Details for Bug 397455 – The fix

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

[patch] The fix

eclipse.jdt.ui.20130107.patch (text/plain), 1.80 KB, created by Martin Mathew

on 2013-01-07 04:55:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Mathew

Created: 2013-01-07 04:55:51 EST

Size: 1.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>diff --git ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java
>index 3f00b26..a0602fd 100644
>--- ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java
>+++ ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java
>@@ -30,6 +30,7 @@
> import java.util.zip.ZipEntry;
> import java.util.zip.ZipFile;
> 
>+import org.eclipse.core.runtime.Assert;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IStatus;
>@@ -456,6 +457,7 @@
> 	private HashMap<String, StringBuffer> fExceptionDescriptions;
> 
> 	private JavadocContentAccess2(IMethod method, Javadoc javadoc, String source, JavadocLookup lookup) {
>+		Assert.isNotNull(method);
> 		fMember= method;
> 		fMethod= method;
> 		fJavadoc= javadoc;
>@@ -464,6 +466,7 @@
> 	}
> 
> 	private JavadocContentAccess2(IMember member, Javadoc javadoc, String source) {
>+		Assert.isNotNull(member);
> 		fMember= member;
> 		fMethod= null;
> 		fJavadoc= javadoc;
>@@ -1723,7 +1726,14 @@
> 			for (int i= commentList.size() - 1; i >= 0; i--) {
> 				Comment comment= commentList.get(i);
> 				if (comment instanceof Javadoc) {
>-					JavadocContentAccess2 docacc= new JavadocContentAccess2(null, (Javadoc) comment, source);
>+					IType type= null;
>+					IJavaElement javaElement= ast.getJavaElement();
>+					if (javaElement instanceof ICompilationUnit) {
>+						type= ((ICompilationUnit) javaElement).getType(JavaModelUtil.PACKAGE_INFO_JAVA);
>+					} else if (javaElement instanceof IClassFile) {
>+						type= ((IClassFile) javaElement).getType();
>+					}
>+					JavadocContentAccess2 docacc= new JavadocContentAccess2(type, (Javadoc) comment, source);
> 					return docacc.toHTML();
> 				}
> 			}

Flags:

daniel_megert: review-

Actions: View | Diff

Attachments on bug 397455: 225268 | 225270 | 225271