Attachment #34774 for bug #128033

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

Lines 35-41 Link Here

(-)search/org/eclipse/jdt/internal/core/index/DiskIndex.java (-1 / +1 lines)
35	private HashtableOfObject categoryTables; // category name -> HashtableOfObject(words -> int[] of document #'s) or offset if not read yet	35	private HashtableOfObject categoryTables; // category name -> HashtableOfObject(words -> int[] of document #'s) or offset if not read yet
36	private char[] cachedCategoryName;	36	private char[] cachedCategoryName;
37		37
38	public static final String SIGNATURE= "INDEX VERSION 1.109"; //$NON-NLS-1$	38	public static final String SIGNATURE= "INDEX VERSION 1.112"; //$NON-NLS-1$
39	public static boolean DEBUG = false;	39	public static boolean DEBUG = false;
40		40
41	private static final int RE_INDEXED = -1;	41	private static final int RE_INDEXED = -1;




		super(document);
	}
	private void addBinaryStandardAnnotations(long annotationTagBits) {
		char[][] compoundName = null;
		if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;
			addTypeReference(compoundName[compoundName.length-1]);
			addBinaryTargetAnnotation(annotationTagBits);
		}
		if ((annotationTagBits & TagBits.AnnotationRetentionMASK) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_RETENTION;
			addTypeReference(compoundName[compoundName.length-1]);
			addBinaryRetentionAnnotation(annotationTagBits);
		}
		if ((annotationTagBits & TagBits.AnnotationDeprecated) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_DEPRECATED;
			addTypeReference(compoundName[compoundName.length-1]);
		}
		if ((annotationTagBits & TagBits.AnnotationDocumented) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_DOCUMENTED;
			addTypeReference(compoundName[compoundName.length-1]);
		}
		if ((annotationTagBits & TagBits.AnnotationInherited) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_INHERITED;
			addTypeReference(compoundName[compoundName.length-1]);
		}
		if ((annotationTagBits & TagBits.AnnotationOverride) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_OVERRIDE;
			addTypeReference(compoundName[compoundName.length-1]);
		}
		if ((annotationTagBits & TagBits.AnnotationSuppressWarnings) != 0) {
			char[][] compoundName = TypeConstants.JAVA_LANG_SUPPRESSWARNINGS;
			addTypeReference(compoundName[compoundName.length-1]);
		}
		if (compoundName == null) return;
		addTypeReference(compoundName[compoundName.length-1]);
	}
	private void addBinaryTargetAnnotation(long bits) {
		char[][] compoundName = null;
		char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		addTypeReference(compoundName[compoundName.length-1]);
		if ((bits & TagBits.AnnotationForAnnotationType) != 0) {
			compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
			addTypeReference(compoundName[compoundName.length-1]);
			addFieldReference(TypeConstants.UPPER_ANNOTATION_TYPE);
		}
		if ((bits & TagBits.AnnotationForConstructor) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.UPPER_CONSTRUCTOR);
		}
		if ((bits & TagBits.AnnotationForField) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.UPPER_FIELD);
		}
		if ((bits & TagBits.AnnotationForLocalVariable) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.UPPER_LOCAL_VARIABLE);
		}
		if ((bits & TagBits.AnnotationForMethod) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.UPPER_METHOD);
		}
		if ((bits & TagBits.AnnotationForPackage) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.UPPER_PACKAGE);
		}
		if ((bits & TagBits.AnnotationForParameter) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.UPPER_PARAMETER);
		}
		if ((bits & TagBits.AnnotationForType) != 0) {
			if (compoundName == null) {
				compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
				addTypeReference(compoundName[compoundName.length-1]);
			}
			addFieldReference(TypeConstants.TYPE);
		}
	}

Return to bug 128033

Lines 43-101 Link Here

(-)search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java (-13 / +45 lines)
43	super(document);	43	super(document);
44	}	44	}
45	private void addBinaryStandardAnnotations(long annotationTagBits) {	45	private void addBinaryStandardAnnotations(long annotationTagBits) {
46	char[][] compoundName = null;
47	if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {	46	if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {
48	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;	47	char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;
		48	addTypeReference(compoundName[compoundName.length-1]);
49	addBinaryTargetAnnotation(annotationTagBits);	49	addBinaryTargetAnnotation(annotationTagBits);
50	}	50	}
51	if ((annotationTagBits & TagBits.AnnotationRetentionMASK) != 0) {	51	if ((annotationTagBits & TagBits.AnnotationRetentionMASK) != 0) {
52	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_RETENTION;	52	char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_RETENTION;
		53	addTypeReference(compoundName[compoundName.length-1]);
53	addBinaryRetentionAnnotation(annotationTagBits);	54	addBinaryRetentionAnnotation(annotationTagBits);
54	}	55	}
55	if ((annotationTagBits & TagBits.AnnotationDeprecated) != 0) {	56	if ((annotationTagBits & TagBits.AnnotationDeprecated) != 0) {
56	compoundName = TypeConstants.JAVA_LANG_DEPRECATED;	57	char[][] compoundName = TypeConstants.JAVA_LANG_DEPRECATED;
		58	addTypeReference(compoundName[compoundName.length-1]);
57	}	59	}
58	if ((annotationTagBits & TagBits.AnnotationDocumented) != 0) {	60	if ((annotationTagBits & TagBits.AnnotationDocumented) != 0) {
59	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_DOCUMENTED;	61	char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_DOCUMENTED;
		62	addTypeReference(compoundName[compoundName.length-1]);
60	}	63	}
61	if ((annotationTagBits & TagBits.AnnotationInherited) != 0) {	64	if ((annotationTagBits & TagBits.AnnotationInherited) != 0) {
62	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_INHERITED;	65	char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_INHERITED;
		66	addTypeReference(compoundName[compoundName.length-1]);
63	}	67	}
64	if ((annotationTagBits & TagBits.AnnotationOverride) != 0) {	68	if ((annotationTagBits & TagBits.AnnotationOverride) != 0) {
65	compoundName = TypeConstants.JAVA_LANG_OVERRIDE;	69	char[][] compoundName = TypeConstants.JAVA_LANG_OVERRIDE;
		70	addTypeReference(compoundName[compoundName.length-1]);
66	}	71	}
67	if ((annotationTagBits & TagBits.AnnotationSuppressWarnings) != 0) {	72	if ((annotationTagBits & TagBits.AnnotationSuppressWarnings) != 0) {
68	compoundName = TypeConstants.JAVA_LANG_SUPPRESSWARNINGS;	73	char[][] compoundName = TypeConstants.JAVA_LANG_SUPPRESSWARNINGS;
		74	addTypeReference(compoundName[compoundName.length-1]);
69	}	75	}
70	if (compoundName == null) return;
71	addTypeReference(compoundName[compoundName.length-1]);
72	}	76	}
73	private void addBinaryTargetAnnotation(long bits) {	77	private void addBinaryTargetAnnotation(long bits) {
74	if ((bits & TagBits.AnnotationTarget) != 0) return;	78	char[][] compoundName = null;
75	char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
76	addTypeReference(compoundName[compoundName.length-1]);
77	if ((bits & TagBits.AnnotationForAnnotationType) != 0) {	79	if ((bits & TagBits.AnnotationForAnnotationType) != 0) {
		80	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		81	addTypeReference(compoundName[compoundName.length-1]);
78	addFieldReference(TypeConstants.UPPER_ANNOTATION_TYPE);	82	addFieldReference(TypeConstants.UPPER_ANNOTATION_TYPE);
79	}	83	}
80	if ((bits & TagBits.AnnotationForConstructor) != 0) {	84	if ((bits & TagBits.AnnotationForConstructor) != 0) {
		85	if (compoundName == null) {
		86	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		87	addTypeReference(compoundName[compoundName.length-1]);
		88	}
81	addFieldReference(TypeConstants.UPPER_CONSTRUCTOR);	89	addFieldReference(TypeConstants.UPPER_CONSTRUCTOR);
82	}	90	}
83	if ((bits & TagBits.AnnotationForField) != 0) {	91	if ((bits & TagBits.AnnotationForField) != 0) {
		92	if (compoundName == null) {
		93	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		94	addTypeReference(compoundName[compoundName.length-1]);
		95	}
84	addFieldReference(TypeConstants.UPPER_FIELD);	96	addFieldReference(TypeConstants.UPPER_FIELD);
85	}	97	}
86	if ((bits & TagBits.AnnotationForLocalVariable) != 0) {	98	if ((bits & TagBits.AnnotationForLocalVariable) != 0) {
		99	if (compoundName == null) {
		100	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		101	addTypeReference(compoundName[compoundName.length-1]);
		102	}
87	addFieldReference(TypeConstants.UPPER_LOCAL_VARIABLE);	103	addFieldReference(TypeConstants.UPPER_LOCAL_VARIABLE);
88	}	104	}
89	if ((bits & TagBits.AnnotationForMethod) != 0) {	105	if ((bits & TagBits.AnnotationForMethod) != 0) {
		106	if (compoundName == null) {
		107	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		108	addTypeReference(compoundName[compoundName.length-1]);
		109	}
90	addFieldReference(TypeConstants.UPPER_METHOD);	110	addFieldReference(TypeConstants.UPPER_METHOD);
91	}	111	}
92	if ((bits & TagBits.AnnotationForPackage) != 0) {	112	if ((bits & TagBits.AnnotationForPackage) != 0) {
		113	if (compoundName == null) {
		114	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		115	addTypeReference(compoundName[compoundName.length-1]);
		116	}
93	addFieldReference(TypeConstants.UPPER_PACKAGE);	117	addFieldReference(TypeConstants.UPPER_PACKAGE);
94	}	118	}
95	if ((bits & TagBits.AnnotationForParameter) != 0) {	119	if ((bits & TagBits.AnnotationForParameter) != 0) {
		120	if (compoundName == null) {
		121	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		122	addTypeReference(compoundName[compoundName.length-1]);
		123	}
96	addFieldReference(TypeConstants.UPPER_PARAMETER);	124	addFieldReference(TypeConstants.UPPER_PARAMETER);
97	}	125	}
98	if ((bits & TagBits.AnnotationForType) != 0) {	126	if ((bits & TagBits.AnnotationForType) != 0) {
		127	if (compoundName == null) {
		128	compoundName = TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE;
		129	addTypeReference(compoundName[compoundName.length-1]);
		130	}
99	addFieldReference(TypeConstants.TYPE);	131	addFieldReference(TypeConstants.TYPE);
100	}	132	}
101	}	133	}