simplify 'compareTo' method overriding in "range type check" inspection

This commit is contained in:
Max Medvedev
2013-04-02 17:26:41 +04:00
parent 3e2240bae8
commit 1499964722
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
*/
package org.jetbrains.plugins.groovy.codeInspection.bugs;
import com.intellij.codeInsight.generation.GenerateMembersUtil;
import com.intellij.codeInsight.generation.OverrideImplementUtil;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.ide.fileTemplates.FileTemplate;
@@ -46,7 +45,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
import org.jetbrains.plugins.groovy.lang.psi.impl.GrRangeType;
import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
import org.jetbrains.plugins.groovy.overrideImplement.GroovyOverrideImplementUtil;
import java.io.IOException;
import java.util.ArrayList;
@@ -60,6 +58,7 @@ import java.util.Properties;
public class GroovyRangeTypeCheckInspection extends BaseInspection {
private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.codeInspection.bugs.GroovyRangeTypeCheckInspection");
@NotNull
@Override
protected BaseInspectionVisitor buildVisitor() {
return new MyVisitor();
@@ -80,7 +79,7 @@ public class GroovyRangeTypeCheckInspection extends BaseInspection {
}
@Override
protected GroovyFix buildFix(PsiElement location) {
protected GroovyFix buildFix(@NotNull PsiElement location) {
final GrRangeExpression range = (GrRangeExpression)location;
final PsiType type = range.getType();
final List<GroovyFix> fixes = new ArrayList<GroovyFix>(3);
@@ -309,9 +308,7 @@ public class GroovyRangeTypeCheckInspection extends BaseInspection {
}
if (comparable != null && !myPsiClass.isInterface()) {
final PsiMethod baseMethod = comparable.getMethods()[0];
final GrMethod prototype = GroovyOverrideImplementUtil.generateMethodPrototype(myPsiClass, baseMethod, substitutor);
final PsiElement anchor = OverrideImplementUtil.getDefaultAnchorToOverrideOrImplement(myPsiClass, baseMethod, substitutor);
GenerateMembersUtil.insert(myPsiClass, prototype, anchor, true);
OverrideImplementUtil.overrideOrImplement(myPsiClass, baseMethod);
}
}