diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2011-05-03 02:26:15 +0200 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2011-05-03 02:26:15 +0200 |
| commit | b93a58298556aedaeef9e3d5fa4e53bc9b0ebe59 (patch) | |
| tree | 5b9aa50af1f0b8648d8083bfe9f95e4f0ac4b618 /src/eclipseAgent/lombok | |
| parent | e5e35213780a87c813b892d5efc1288125980baf (diff) | |
| parent | 12e4f36a2f5aae5b17266fb15376c82d74b7bf95 (diff) | |
| download | lombok-b93a58298556aedaeef9e3d5fa4e53bc9b0ebe59.tar.gz lombok-b93a58298556aedaeef9e3d5fa4e53bc9b0ebe59.tar.bz2 lombok-b93a58298556aedaeef9e3d5fa4e53bc9b0ebe59.zip | |
Merge branch 'master' of git@github.com:rzwitserloot/lombok
Diffstat (limited to 'src/eclipseAgent/lombok')
| -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)", |