diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-03-28 21:36:08 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-03-28 21:36:08 +0200 |
| commit | ab1d938ca85870639dc912fdfc46955cb3b4764f (patch) | |
| tree | 2913371a6184c2425ff74488569629e2005d4f51 /src | |
| parent | 816c0b99e7f0395b26f8a8c26e52110107f0b1e1 (diff) | |
| download | lombok-ab1d938ca85870639dc912fdfc46955cb3b4764f.tar.gz lombok-ab1d938ca85870639dc912fdfc46955cb3b4764f.tar.bz2 lombok-ab1d938ca85870639dc912fdfc46955cb3b4764f.zip | |
Now delegating classes defined in the same project works.
At this revision, you can easily and reliably reproduce issue #164 by
creating a loop (A delegates B and B delegates A).
Diffstat (limited to 'src')
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java index 0aa47dba..846232f6 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java @@ -74,7 +74,6 @@ import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding; import org.eclipse.jdt.internal.compiler.lookup.BaseTypeBinding; import org.eclipse.jdt.internal.compiler.lookup.Binding; import org.eclipse.jdt.internal.compiler.lookup.ClassScope; -import org.eclipse.jdt.internal.compiler.lookup.MemberTypeBinding; import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; import org.eclipse.jdt.internal.compiler.lookup.ParameterizedTypeBinding; import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; @@ -475,7 +474,7 @@ public class PatchDelegate { inner = binding; } - if (inner instanceof MemberTypeBinding) { + if (inner instanceof SourceTypeBinding) { ClassScope cs = ((SourceTypeBinding)inner).scope; if (cs != null) { try { @@ -527,6 +526,7 @@ public class PatchDelegate { private static final List<String> METHODS_IN_OBJECT = Collections.unmodifiableList(Arrays.asList( "hashCode()", + "canEqual(java.lang.Object)", //Not in j.l.Object, but it goes with hashCode and equals so if we ignore those two, we should ignore this one. "equals(java.lang.Object)", "wait()", "wait(long)", |