Attachment 174440 Details for Bug 307523 – Proposed fix

[patch] Proposed fix

patch_307523.txt (text/plain), 4.42 KB, created by Olivier Thomann

on 2010-07-15 15:46:21 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-07-15 15:46:21 EDT

Size: 4.42 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java,v
>retrieving revision 1.178
>diff -u -r1.178 ClassScope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	7 Jul 2010 05:56:10 -0000	1.178
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	15 Jul 2010 19:45:41 -0000
>@@ -41,7 +41,7 @@
> 	}
> 
> 	void buildAnonymousTypeBinding(SourceTypeBinding enclosingType, ReferenceBinding supertype) {
>-		LocalTypeBinding anonymousType = buildLocalType(enclosingType, supertype, enclosingType.fPackage);
>+		LocalTypeBinding anonymousType = buildLocalType(enclosingType, enclosingType.fPackage);
> 		anonymousType.modifiers |= ExtraCompilerModifiers.AccLocallyUsed; // tag all anonymous types as used locally
> 		if (supertype.isInterface()) {
> 			anonymousType.superclass = getJavaLangObject();
>@@ -155,14 +155,14 @@
> 			 ((SourceTypeBinding) memberTypes[i]).scope.buildFieldsAndMethods();
> 	}
> 
>-	private LocalTypeBinding buildLocalType(SourceTypeBinding enclosingType, ReferenceBinding anonymousOriginalSuperType, PackageBinding packageBinding) {
>+	private LocalTypeBinding buildLocalType(SourceTypeBinding enclosingType, PackageBinding packageBinding) {
> 
> 		this.referenceContext.scope = this;
> 		this.referenceContext.staticInitializerScope = new MethodScope(this, this.referenceContext, true);
> 		this.referenceContext.initializerScope = new MethodScope(this, this.referenceContext, false);
> 
> 		// build the binding or the local type
>-		LocalTypeBinding localType = new LocalTypeBinding(this, enclosingType, innermostSwitchCase(), anonymousOriginalSuperType);
>+		LocalTypeBinding localType = new LocalTypeBinding(this, enclosingType, innermostSwitchCase());
> 		this.referenceContext.binding = localType;
> 		checkAndSetModifiers();
> 		buildTypeVariables();
>@@ -198,7 +198,7 @@
> 					}
> 				}
> 				ClassScope memberScope = new ClassScope(this, this.referenceContext.memberTypes[i]);
>-				LocalTypeBinding memberBinding = memberScope.buildLocalType(localType, null /* anonymous super type*/, packageBinding);
>+				LocalTypeBinding memberBinding = memberScope.buildLocalType(localType, packageBinding);
> 				memberBinding.setAsMemberType();
> 				memberTypeBindings[count++] = memberBinding;
> 			}
>@@ -211,7 +211,7 @@
> 
> 	void buildLocalTypeBinding(SourceTypeBinding enclosingType) {
> 
>-		LocalTypeBinding localType = buildLocalType(enclosingType, null /* anonymous super type*/, enclosingType.fPackage);
>+		LocalTypeBinding localType = buildLocalType(enclosingType, enclosingType.fPackage);
> 		connectTypeHierarchy();
> 		if (compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5) {
> 			checkParameterizedTypeBounds();
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java,v
>retrieving revision 1.48
>diff -u -r1.48 LocalTypeBinding.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java	7 Mar 2009 01:08:09 -0000	1.48
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java	15 Jul 2010 19:45:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -26,9 +26,7 @@
> 	public int sourceStart; // used by computeUniqueKey to uniquely identify this binding
> 	public MethodBinding enclosingMethod;
> 
>-//	public ReferenceBinding anonymousOriginalSuperType;
>-
>-public LocalTypeBinding(ClassScope scope, SourceTypeBinding enclosingType, CaseStatement switchCase, ReferenceBinding anonymousOriginalSuperType) {
>+public LocalTypeBinding(ClassScope scope, SourceTypeBinding enclosingType, CaseStatement switchCase) {
> 	super(
> 		new char[][] {CharOperation.concat(LocalTypeBinding.LocalTypePrefix, scope.referenceContext.name)},
> 		scope,

Actions: View | Diff

Attachments on bug 307523: 174440