From e768be236b38879fc631c84183991ff8dd931a5b Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 11 May 2012 20:30:51 +0400 Subject: [PATCH] accept all as suppress for all (IDEA-85806) --- .../intellij/codeInspection/RedundantSuppressInspection.java | 2 +- .../src/com/intellij/codeInspection/SuppressionUtil.java | 2 +- .../com/intellij/codeInspection/reference/RefElementImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java b/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java index e8cecdcef73c..3ee49d07d7b9 100644 --- a/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java @@ -137,7 +137,7 @@ public class RedundantSuppressInspection extends GlobalInspectionTool{ String idsString = SuppressManager.getInstance().getSuppressedInspectionIdsIn(owner); if (idsString != null && idsString.length() != 0) { List ids = StringUtil.split(idsString, ","); - if (IGNORE_ALL && ids.contains(SuppressionUtil.ALL)) return; + if (IGNORE_ALL && (ids.contains(SuppressionUtil.ALL) || ids.contains(SuppressionUtil.ALL.toLowerCase()))) return; Collection suppressed = suppressedScopes.get(owner); if (suppressed == null) { suppressed = ids; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java b/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java index 5eceb14e6783..a43bc1259908 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java @@ -58,7 +58,7 @@ public class SuppressionUtil { for (@NonNls String id : ids) { @NonNls String trim = id.trim(); - if (trim.equals(inspectionToolID) || trim.equals(ALL)) return true; + if (trim.equalsIgnoreCase(ALL)) return true; } return false; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java index 9071543e5984..ddfe49cb0d98 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java @@ -255,7 +255,7 @@ public abstract class RefElementImpl extends RefEntityImpl implements RefElement public boolean isSuppressed(final String toolId) { if (mySuppressions != null) { for (@NonNls String suppression : mySuppressions) { - if (suppression.equals(toolId) || suppression.equals(SuppressionUtil.ALL)){ + if (suppression.equalsIgnoreCase(SuppressionUtil.ALL)){ return true; } }