Attachment 56643 Details for Bug 169419 – Proposed fix

[patch] Proposed fix

patch_169419.txt (text/plain), 2.25 KB, created by Olivier Thomann

on 2007-01-09 13:05:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-01-09 13:05:05 EST

Size: 2.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java,v
>retrieving revision 1.58
>diff -u -r1.58 BinaryIndexer.java
>--- search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java	16 Oct 2006 15:58:38 -0000	1.58
>+++ search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java	9 Jan 2007 17:51:57 -0000
>@@ -10,6 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core.search.indexing;
> 
>+import org.eclipse.jdt.core.JavaConventions;
> import org.eclipse.jdt.core.Signature;
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.core.search.SearchDocument;
>@@ -23,6 +24,7 @@
> import org.eclipse.jdt.internal.compiler.env.EnumConstantSignature;
> import org.eclipse.jdt.internal.compiler.env.IBinaryAnnotation;
> import org.eclipse.jdt.internal.compiler.env.IBinaryElementValuePair;
>+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.compiler.lookup.TagBits;
> import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
> import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
>@@ -603,6 +605,19 @@
> 						addNameReference(qualification[j]);
> 					}
> 					break;
>+				case ClassFileConstants.StringTag :
>+					name = extractClassReference(constantPoolOffsets, reader, i);
>+					long readerVersion = reader.getVersion();
>+					String version = CompilerOptions.versionFromJdkLevel(readerVersion);
>+					if (readerVersion < ClassFileConstants.JDK1_5 && JavaConventions.validateJavaTypeName(new String(name), version, version).isOK()) {
>+						addTypeReference(name);
>+						// also add a simple reference on each segment of the qualification (see http://bugs.eclipse.org/bugs/show_bug.cgi?id=24741)
>+						qualification = CharOperation.splitOn('.', name);
>+						for (int j = 0, length = qualification.length; j < length; j++) {
>+							addNameReference(qualification[j]);
>+						}
>+					}
>+					break;
> 			}
> 		}
> 	}

Actions: View | Diff

Attachments on bug 169419: 56636 | 56641 | 56642 | 56643