From f53809455f231d55de48dcee8a2b9e9b8390166a Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Thu, 10 Dec 2015 17:00:01 +0300 Subject: [PATCH] [groovy] @NotNull and @Override --- .../plugins/groovy/lang/psi/impl/GroovyResolveResultImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyResolveResultImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyResolveResultImpl.java index 492d24c62151..ee8ac601200f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyResolveResultImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyResolveResultImpl.java @@ -33,7 +33,7 @@ public class GroovyResolveResultImpl implements GroovyResolveResult { private final boolean myIsStaticsOK; private final boolean myIsApplicable; - private final PsiSubstitutor mySubstitutor; + private final @NotNull PsiSubstitutor mySubstitutor; private final boolean myIsInvokedOnProperty; private final @Nullable PsiElement myCurrentFileResolveContext; @@ -102,6 +102,7 @@ public class GroovyResolveResultImpl implements GroovyResolveResult { return isAccessible() && isApplicable() && isStaticsOK(); } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -112,6 +113,7 @@ public class GroovyResolveResultImpl implements GroovyResolveResult { myElement.getManager().areElementsEquivalent(myElement, that.myElement); } + @Override public int hashCode() { int result = 0; if (myElement instanceof PsiNamedElement) {