diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java index 72f9fa1ac5b7..5c4ef0dfb9bc 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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,6 +15,7 @@ */ package com.intellij.psi.impl.source.javadoc; +import com.intellij.codeInspection.SuppressionUtil; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; @@ -53,7 +54,7 @@ public class JavadocManagerImpl implements JavadocManager { myInfos.add(new SimpleDocTagInfo("code", PsiElement.class, true, LanguageLevel.JDK_1_5)); //Not a standard tag, but added by IDEA for inspection suppression - myInfos.add(new SimpleDocTagInfo("noinspection", PsiElement.class, false, LanguageLevel.JDK_1_3)); + myInfos.add(new SimpleDocTagInfo(SuppressionUtil.SUPPRESS_INSPECTIONS_TAG_NAME, PsiElement.class, false, LanguageLevel.JDK_1_3)); myInfos.add(new ParamDocTagInfo()); myInfos.add(new ReturnDocTagInfo()); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java index 5f6b5bdc0c16..d0d872c192f3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.maturity; +import com.intellij.codeInspection.SuppressionUtil; import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiComment; @@ -55,9 +56,8 @@ public class SuppressionAnnotationInspection extends BaseInspection { && !tokenType.equals(JavaTokenType.C_STYLE_COMMENT)) { return; } - @NonNls final String strippedComment = - commentText.substring(2).trim(); - if (strippedComment.startsWith("noinspection")) { + @NonNls final String strippedComment = commentText.substring(2).trim(); + if (strippedComment.startsWith(SuppressionUtil.SUPPRESS_INSPECTIONS_TAG_NAME)) { registerError(comment); } }