moved to analysis

This commit is contained in:
Alexey Kudravtsev
2013-05-28 19:17:10 +04:00
parent 1d5a384369
commit 59944d7dcf
7 changed files with 11 additions and 13 deletions
@@ -26,6 +26,8 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collection;
public interface BatchSuppressManager {
String SUPPRESS_INSPECTIONS_ANNOTATION_NAME = "java.lang.SuppressWarnings";
class SERVICE {
public static BatchSuppressManager getInstance() {
return ServiceManager.getService(BatchSuppressManager.class);
@@ -15,10 +15,7 @@
*/
package com.intellij.codeInspection.reference;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.SuppressManager;
import com.intellij.codeInspection.SuppressionUtil;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection;
import com.intellij.codeInspection.ex.EntryPointsManager;
import com.intellij.codeInspection.ex.EntryPointsManagerImpl;
@@ -450,7 +447,7 @@ public class RefJavaManagerImpl extends RefJavaManager {
@Override
public void visitAnnotation(PsiAnnotation annotation) {
super.visitAnnotation(annotation);
if (Comparing.strEqual(annotation.getQualifiedName(), SuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME)) {
if (Comparing.strEqual(annotation.getQualifiedName(), BatchSuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME)) {
final PsiModifierListOwner listOwner = PsiTreeUtil.getParentOfType(annotation, PsiModifierListOwner.class);
if (listOwner != null) {
final RefElementImpl element = (RefElementImpl)myRefManager.getReference(listOwner);
@@ -30,7 +30,6 @@ import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
public abstract class SuppressManager implements BatchSuppressManager {
public static final String SUPPRESS_INSPECTIONS_ANNOTATION_NAME = "java.lang.SuppressWarnings";
public static SuppressManager getInstance() {
return ServiceManager.getService(SuppressManager.class);
@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.maturity;
import com.intellij.codeInspection.SuppressManager;
import com.intellij.codeInspection.BatchSuppressManager;
import com.intellij.codeInspection.SuppressionUtil;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.PsiAnnotation;
@@ -76,7 +76,7 @@ public class SuppressionAnnotationInspection extends BaseInspection {
}
@NonNls final String text = reference.getText();
if ("SuppressWarnings".equals(text) ||
SuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME.equals(text)) {
BatchSuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME.equals(text)) {
registerError(annotation);
}
}
@@ -126,7 +126,7 @@ public abstract class GroovySuppressableInspectionTool extends LocalInspectionTo
if (modifierList == null) {
return Collections.emptyList();
}
PsiAnnotation annotation = modifierList.findAnnotation(SuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME);
PsiAnnotation annotation = modifierList.findAnnotation(BatchSuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME);
if (annotation == null) {
return Collections.emptyList();
}
@@ -19,8 +19,8 @@ package org.jetbrains.plugins.groovy.codeInspection;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.codeInsight.daemon.HighlightDisplayKey;
import com.intellij.codeInsight.daemon.impl.actions.AbstractBatchSuppressByNoInspectionCommentFix;
import com.intellij.codeInspection.BatchSuppressManager;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.SuppressManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -113,7 +113,7 @@ public class SuppressForMemberFix extends AbstractBatchSuppressByNoInspectionCom
}
private static void addSuppressAnnotation(final Project project, final GrModifierList modifierList, final String id) throws IncorrectOperationException {
PsiAnnotation annotation = modifierList.findAnnotation(SuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME);
PsiAnnotation annotation = modifierList.findAnnotation(BatchSuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME);
final GrExpression toAdd = GroovyPsiElementFactory.getInstance(project).createExpressionFromText("\"" + id + "\"");
if (annotation != null) {
final PsiAnnotationMemberValue value = annotation.findDeclaredAttributeValue(null);
@@ -128,7 +128,7 @@ public class SuppressForMemberFix extends AbstractBatchSuppressByNoInspectionCom
}
}
else {
modifierList.addAnnotation(SuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME).setDeclaredAttributeValue(null, toAdd);
modifierList.addAnnotation(BatchSuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME).setDeclaredAttributeValue(null, toAdd);
}
}
@@ -536,7 +536,7 @@ public class I18nInspection extends BaseLocalInspectionTool {
@Override public void visitAnnotation(PsiAnnotation annotation) {
//prevent from @SuppressWarnings
if (!SuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME.equals(annotation.getQualifiedName())){
if (!BatchSuppressManager.SUPPRESS_INSPECTIONS_ANNOTATION_NAME.equals(annotation.getQualifiedName())){
super.visitAnnotation(annotation);
}
}