Attachment 26051 Details for Bug 106834 – Proposed fix

[patch] Proposed fix

patch_106834.txt (text/plain), 2.55 KB, created by Olivier Thomann

on 2005-08-12 11:33:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2005-08-12 11:33:17 EDT

Size: 2.55 KB

patch

obsolete

>Index: dom/org/eclipse/jdt/core/dom/BindingComparator.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BindingComparator.java,v
>retrieving revision 1.19
>diff -u -r1.19 BindingComparator.java
>--- dom/org/eclipse/jdt/core/dom/BindingComparator.java	16 Jun 2005 08:40:49 -0000	1.19
>+++ dom/org/eclipse/jdt/core/dom/BindingComparator.java	12 Aug 2005 15:32:06 -0000
>@@ -209,9 +209,6 @@
> 					&& wildcardBinding.boundKind == wildcardBinding2.boundKind;
> 				
> 			case Binding.TYPE_PARAMETER :
>-				if (visitedTypes.contains(typeBinding)) return true;
>-				visitedTypes.add(typeBinding);
>-				
> 				if (!(typeBinding2.isTypeVariable())) {
> 					return false;
> 				}
>@@ -221,17 +218,26 @@
> 					}
> 					CaptureBinding captureBinding = (CaptureBinding) typeBinding;
> 					CaptureBinding captureBinding2 = (CaptureBinding) typeBinding2;
>-					return captureBinding.position == captureBinding2.position
>-						&& isEqual(captureBinding.wildcard, captureBinding2.wildcard, visitedTypes)
>-						&& isEqual(captureBinding.sourceType, captureBinding2.sourceType, visitedTypes);
>+					if (captureBinding.position == captureBinding2.position) {
>+						if (visitedTypes.contains(typeBinding)) return true;
>+						visitedTypes.add(typeBinding);
>+						
>+						return isEqual(captureBinding.wildcard, captureBinding2.wildcard, visitedTypes)
>+							&& isEqual(captureBinding.sourceType, captureBinding2.sourceType, visitedTypes);
>+					}
>+					return false;
> 				}
> 				TypeVariableBinding typeVariableBinding = (TypeVariableBinding) typeBinding;
> 				TypeVariableBinding typeVariableBinding2 = (TypeVariableBinding) typeBinding2;
>-				return CharOperation.equals(typeVariableBinding.sourceName, typeVariableBinding2.sourceName)
>-					&& isEqual(typeVariableBinding.declaringElement, typeVariableBinding2.declaringElement, visitedTypes)
>+				if (CharOperation.equals(typeVariableBinding.sourceName, typeVariableBinding2.sourceName)) {
>+					if (visitedTypes.contains(typeBinding)) return true;
>+					visitedTypes.add(typeBinding);
>+
>+					return isEqual(typeVariableBinding.declaringElement, typeVariableBinding2.declaringElement, visitedTypes)
> 					&& isEqual(typeVariableBinding.superclass(), typeVariableBinding2.superclass(), visitedTypes)
> 					&& isEqual(typeVariableBinding.superInterfaces(), typeVariableBinding2.superInterfaces(), visitedTypes);
>-			
>+				}
>+				return false;
> 			case Binding.GENERIC_TYPE :
> 				if (!typeBinding2.isGenericType()) {
> 					return false;

Actions: View | Diff

Attachments on bug 106834: 26051 | 26052