From 2528c19155b90af65359264cb75f214c67b965a2 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 15 Feb 2010 13:46:11 +0300 Subject: [PATCH] git merge fail --- .../plugins/groovy/annotator/GroovyAnnotator.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java index f04ee3a793..35707bf19c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java @@ -26,8 +26,8 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.psi.infos.CandidateInfo; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.ClassUtil; import com.intellij.psi.util.PsiTreeUtil; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; @@ -76,12 +76,10 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GroovyScriptClass; import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil; import org.jetbrains.plugins.groovy.lang.resolve.processors.PropertyResolverProcessor; +import org.jetbrains.plugins.groovy.overrideImplement.GroovyOverrideImplementUtil; import org.jetbrains.plugins.groovy.overrideImplement.quickFix.ImplementMethodsQuickFix; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author ven @@ -647,11 +645,12 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator { if (typeDefinition.isEnum() || typeDefinition.isAnnotationType()) return; if (typeDefinition instanceof GrTypeParameter) return; - PsiMethod abstractMethod = ClassUtil.getAnyAbstractMethod(typeDefinition); + Collection collection = GroovyOverrideImplementUtil.getMethodsToImplement(typeDefinition); + if (collection.isEmpty()) return; - if (abstractMethod == null) return; - - String notImplementedMethodName = abstractMethod.getName(); + final PsiElement element = collection.iterator().next().getElement(); + assert element instanceof PsiNamedElement; + String notImplementedMethodName = ((PsiNamedElement)element).getName(); final int startOffset = typeDefinition.getTextOffset(); int endOffset = typeDefinition.getNameIdentifierGroovy().getTextRange().getEndOffset(); -- 2.11.4.GIT