Attachment #91494 for bug #221130

Lines 320-325 Link Here

(-)ui/org/eclipse/jdt/internal/ui/search/SearchMessages.java (+2 lines)
320	public static String MatchLocations_type_parameter_bounds_label;	320	public static String MatchLocations_type_parameter_bounds_label;
321	public static String MatchLocations_wildcard_bounds_description;	321	public static String MatchLocations_wildcard_bounds_description;
322	public static String MatchLocations_wildcard_bounds_label;	322	public static String MatchLocations_wildcard_bounds_label;
		323	public static String MatchLocations_instanceof_description;
		324	public static String MatchLocations_instanceof_label;
323	public static String MatchLocations_match_locations_description;	325	public static String MatchLocations_match_locations_description;
324		326
325	}	327	}

Lines 359-364 Link Here

(-)ui/org/eclipse/jdt/internal/ui/search/SearchMessages.properties (+2 lines)
359	MatchLocations_type_parameter_bounds_label=Type parameter &bounds	359	MatchLocations_type_parameter_bounds_label=Type parameter &bounds
360	MatchLocations_wildcard_bounds_description=wild card bounds	360	MatchLocations_wildcard_bounds_description=wild card bounds
361	MatchLocations_wildcard_bounds_label=&Wildcard bounds	361	MatchLocations_wildcard_bounds_label=&Wildcard bounds
		362	MatchLocations_instanceof_description=instanceof
		363	MatchLocations_instanceof_label=Instance &of
362		364
363	MethodExitsFinder_job_label=Search for Method Exit Occurrences	365	MethodExitsFinder_job_label=Search for Method Exit Occurrences
364	MethodExitsFinder_label_plural=''{0}(...)'' - {1} method exit occurrence in ''{2}''	366	MethodExitsFinder_label_plural=''{0}(...)'' - {1} method exit occurrence in ''{2}''

Lines 151-156 Link Here

(-)ui/org/eclipse/jdt/internal/ui/search/MatchLocations.java (-1 / +8 lines)
151		151
152	createButton(ptGroup, SearchMessages.MatchLocations_type_parameter_bounds_label, IJavaSearchConstants.TYPE_VARIABLE_BOUND_TYPE_REFERENCE);	152	createButton(ptGroup, SearchMessages.MatchLocations_type_parameter_bounds_label, IJavaSearchConstants.TYPE_VARIABLE_BOUND_TYPE_REFERENCE);
153	createButton(ptGroup, SearchMessages.MatchLocations_wildcard_bounds_label, IJavaSearchConstants.WILDCARD_BOUND_TYPE_REFERENCE);	153	createButton(ptGroup, SearchMessages.MatchLocations_wildcard_bounds_label, IJavaSearchConstants.WILDCARD_BOUND_TYPE_REFERENCE);
		154	createButton(ptGroup, SearchMessages.MatchLocations_instanceof_label, IJavaSearchConstants.INSTANCEOF_TYPE_REFERENCE);
154		155
155	createButton(ptGroup, SearchMessages.MatchLocations_type_arguments_label, IJavaSearchConstants.TYPE_ARGUMENT_TYPE_REFERENCE);	156	createButton(ptGroup, SearchMessages.MatchLocations_type_arguments_label, IJavaSearchConstants.TYPE_ARGUMENT_TYPE_REFERENCE);
156		157
Lines 267-272 Link Here
267	if (isSet(locations, IJavaSearchConstants.WILDCARD_BOUND_TYPE_REFERENCE)) {	268	if (isSet(locations, IJavaSearchConstants.WILDCARD_BOUND_TYPE_REFERENCE)) {
268	args.add(SearchMessages.MatchLocations_wildcard_bounds_description);	269	args.add(SearchMessages.MatchLocations_wildcard_bounds_description);
269	}	270	}
		271	if (isSet(locations, IJavaSearchConstants.INSTANCEOF_TYPE_REFERENCE)) {
		272	args.add(SearchMessages.MatchLocations_instanceof_description);
		273	}
270	if (isSet(locations, IJavaSearchConstants.TYPE_ARGUMENT_TYPE_REFERENCE)) {	274	if (isSet(locations, IJavaSearchConstants.TYPE_ARGUMENT_TYPE_REFERENCE)) {
271	args.add(SearchMessages.MatchLocations_type_arguments_description);	275	args.add(SearchMessages.MatchLocations_type_arguments_description);
272	}	276	}
Lines 310-316 Link Here
310		314
311	public static int getTotalNumberOfSettings(int searchFor) {	315	public static int getTotalNumberOfSettings(int searchFor) {
312	if (searchFor == IJavaSearchConstants.TYPE) {	316	if (searchFor == IJavaSearchConstants.TYPE) {
313	return 13;	317	return 14;
314	} else if (searchFor == IJavaSearchConstants.METHOD \|\| searchFor == IJavaSearchConstants.FIELD) {	318	} else if (searchFor == IJavaSearchConstants.METHOD \|\| searchFor == IJavaSearchConstants.FIELD) {
315	return 4;	319	return 4;
316	}	320	}
Lines 348-353 Link Here
348	if (isSet(locations, IJavaSearchConstants.WILDCARD_BOUND_TYPE_REFERENCE)) {	352	if (isSet(locations, IJavaSearchConstants.WILDCARD_BOUND_TYPE_REFERENCE)) {
349	count++;	353	count++;
350	}	354	}
		355	if (isSet(locations, IJavaSearchConstants.INSTANCEOF_TYPE_REFERENCE)) {
		356	count++;
		357	}
351	if (isSet(locations, IJavaSearchConstants.TYPE_ARGUMENT_TYPE_REFERENCE)) {	358	if (isSet(locations, IJavaSearchConstants.TYPE_ARGUMENT_TYPE_REFERENCE)) {
352	count++;	359	count++;
353	}	360	}

Return to bug 221130