View | Details | Raw Unified | Return to bug 334119 | Differences between
and this patch

Collapse All | Expand All

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java (-1 / +7 lines)
Lines 639-645 Link Here
639 
		start = CharOperation.lastIndexOf('/', uniqueKey) + 1;
 639 
		start = CharOperation.lastIndexOf('/', uniqueKey) + 1;
640 
		if (start == 0)
 640 
		if (start == 0)
641 
			start = 1; // start after L
 641 
			start = 1; // start after L
642 
		end = CharOperation.indexOf('$', uniqueKey, start);
 642 
		if (this.isMemberType()) {
643 
			end = CharOperation.indexOf('$', uniqueKey, start);
644 
		} else {
645 
			// '$' is part of the type name
646 
			end = -1;
647 
		}
648 
		//if (CharOperation.indexOf(';', uniqueKey, start) == end2 + 1)
643 
		if (end == -1)
 649 
		if (end == -1)
644 
			end = CharOperation.indexOf('<', uniqueKey, start);
 650 
			end = CharOperation.indexOf('<', uniqueKey, start);
645 
		if (end == -1)
 651 
		if (end == -1)
(-)model/org/eclipse/jdt/internal/core/util/BindingKeyParser.java (-1 / +4 lines)
Lines 1-5 Link Here
1 
/*******************************************************************************
 1 
/*******************************************************************************
2 
 * Copyright (c) 2005, 2010 IBM Corporation and others.
 2 
 * Copyright (c) 2005, 2011 IBM Corporation and others.
3 
 * All rights reserved. This program and the accompanying materials
 3 
 * All rights reserved. This program and the accompanying materials
4 
 * are made available under the terms of the Eclipse Public License v1.0
 4 
 * are made available under the terms of the Eclipse Public License v1.0
5 
 * which accompanies this distribution, and is available at
 5 
 * which accompanies this distribution, and is available at
Lines 731-736 Link Here
731 
		if (!this.scanner.isAtMemberTypeStart() || this.scanner.nextToken() != Scanner.TYPE)
 731 
		if (!this.scanner.isAtMemberTypeStart() || this.scanner.nextToken() != Scanner.TYPE)
732 
			return;
 732 
			return;
733 
		char[] typeName = this.scanner.getTokenSource();
 733 
		char[] typeName = this.scanner.getTokenSource();
734 
		// Might not actually be an inner type but came here as a consequence of '$' being present in type name
735 
		if (typeName.length == 0)
736 
			return;
734 
		if (Character.isDigit(typeName[0])) {
 737 
		if (Character.isDigit(typeName[0])) {
735 
			// anonymous or local type
 738 
			// anonymous or local type
736 
			int nextToken = Scanner.TYPE;
 739 
			int nextToken = Scanner.TYPE;

Return to bug 334119