From cc622018cd63e63a90b42efdacceb4794734cc50 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 25 Aug 2015 16:16:38 +0200 Subject: [PATCH] Use shouldInspect() method more --- .../ig/bugs/EmptyStatementBodyInspection.java | 16 +++++------- ...NameDiffersFromFileNameInspectionBase.java | 11 +++++--- .../UnnecessaryContinueInspection.java | 10 +++++--- .../UnnecessaryReturnInspection.java | 12 +++++---- .../EmptyCatchBlockInspectionBase.java | 11 ++++---- .../EmptyFinallyBlockInspection.java | 10 +++++--- .../EmptyTryBlockInspection.java | 11 +++++--- .../ig/imports/JavaLangImportInspection.java | 10 +++++--- .../ig/imports/OnDemandImportInspection.java | 10 +++++--- .../imports/SamePackageImportInspection.java | 12 +++++---- .../imports/SingleClassImportInspection.java | 25 ++++++++----------- .../imports/StaticImportInspectionBase.java | 10 +++++--- .../ig/imports/UnusedImportInspection.java | 12 +++++---- .../ClassWithoutConstructorInspection.java | 15 ++++++----- .../DesignForExtensionInspection.java | 11 ++++---- .../EmptySynchronizedStatementInspection.java | 19 +++++++------- 16 files changed, 113 insertions(+), 92 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java index afea6ecabdc6..2302d2d824c2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2013 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,6 +74,11 @@ public class EmptyStatementBodyInspection extends BaseInspection { return panel; } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyStatementVisitor(); @@ -106,9 +111,6 @@ public class EmptyStatementBodyInspection extends BaseInspection { } private void checkLoopStatement(PsiLoopStatement statement) { - if (FileTypeUtils.isInServerPageFile(statement)) { - return; - } final PsiStatement body = statement.getBody(); if (body == null || !isEmpty(body)) { return; @@ -119,9 +121,6 @@ public class EmptyStatementBodyInspection extends BaseInspection { @Override public void visitIfStatement(@NotNull PsiIfStatement statement) { super.visitIfStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement)) { - return; - } final PsiStatement thenBranch = statement.getThenBranch(); if (thenBranch != null && isEmpty(thenBranch)) { registerStatementError(statement); @@ -140,9 +139,6 @@ public class EmptyStatementBodyInspection extends BaseInspection { @Override public void visitSwitchStatement(PsiSwitchStatement statement) { super.visitSwitchStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement)) { - return; - } final PsiCodeBlock body = statement.getBody(); if (body == null || !isEmpty(body)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspectionBase.java index 3726e6aa38ea..ea2c4076b14d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspectionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -17,6 +17,7 @@ package com.siyeh.ig.classlayout; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; import com.intellij.psi.PsiJavaFile; import com.intellij.psi.util.FileTypeUtils; import com.siyeh.InspectionGadgetsBundle; @@ -39,6 +40,11 @@ public class ClassNameDiffersFromFileNameInspectionBase extends BaseInspection { "class.name.differs.from.file.name.problem.descriptor"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassNameDiffersFromFileNameVisitor(); @@ -50,9 +56,6 @@ public class ClassNameDiffersFromFileNameInspectionBase extends BaseInspection { @Override public void visitClass(@NotNull PsiClass aClass) { // no call to super, so that it doesn't drill down to inner classes - if (FileTypeUtils.isInServerPageFile(aClass)) { - return; - } final PsiElement parent = aClass.getParent(); if (!(parent instanceof PsiJavaFile)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java index 77a3ab33f26a..51d0954086bb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,6 +61,11 @@ public class UnnecessaryContinueInspection extends BaseInspection { return new UnnecessaryContinueVisitor(); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new DeleteUnnecessaryStatementFix("continue"); @@ -70,9 +75,6 @@ public class UnnecessaryContinueInspection extends BaseInspection { @Override public void visitContinueStatement(@NotNull PsiContinueStatement statement) { - if (FileTypeUtils.isInServerPageFile(statement.getContainingFile())) { - return; - } final PsiStatement continuedStatement = statement.findContinuedStatement(); PsiStatement body = null; if (continuedStatement instanceof PsiForeachStatement) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java index 48c10184cb54..5a91e861441a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.*; +import com.intellij.psi.util.FileTypeUtils; import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -24,7 +25,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.DeleteUnnecessaryStatementFix; import com.siyeh.ig.psiutils.ControlFlowUtils; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -71,6 +71,11 @@ public class UnnecessaryReturnInspection extends BaseInspection { return new DeleteUnnecessaryStatementFix("return"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryReturnVisitor(); @@ -80,9 +85,6 @@ public class UnnecessaryReturnInspection extends BaseInspection { @Override public void visitReturnStatement(@NotNull PsiReturnStatement statement) { super.visitReturnStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement.getContainingFile())) { - return; - } if (statement.getReturnValue() != null) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspectionBase.java index 628853e6412c..62cf346c9083 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspectionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2013 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.ig.psiutils.TestUtils; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -113,6 +112,11 @@ public class EmptyCatchBlockInspectionBase extends BaseInspection { } } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyCatchBlockVisitor(); @@ -123,9 +127,6 @@ public class EmptyCatchBlockInspectionBase extends BaseInspection { @Override public void visitTryStatement(@NotNull PsiTryStatement statement) { super.visitTryStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement.getContainingFile())) { - return; - } final PsiCatchSection[] catchSections = statement.getCatchSections(); for (final PsiCatchSection section : catchSections) { checkCatchSection(section); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java index 5abb492c0cee..048b9ec89582 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -143,6 +143,11 @@ public class EmptyFinallyBlockInspection extends BaseInspection { } } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyFinallyBlockVisitor(); @@ -152,9 +157,6 @@ public class EmptyFinallyBlockInspection extends BaseInspection { @Override public void visitTryStatement(@NotNull PsiTryStatement statement) { super.visitTryStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement.getContainingFile())) { - return; - } final PsiCodeBlock finallyBlock = statement.getFinallyBlock(); if (finallyBlock == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java index 04f50afdaa2d..a2a011088924 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.psi.PsiCodeBlock; +import com.intellij.psi.PsiFile; import com.intellij.psi.PsiTryStatement; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -43,6 +44,11 @@ public class EmptyTryBlockInspection extends BaseInspection { "empty.try.block.problem.descriptor"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyTryBlockVisitor(); @@ -54,9 +60,6 @@ public class EmptyTryBlockInspection extends BaseInspection { @Override public void visitTryStatement(@NotNull PsiTryStatement statement) { super.visitTryStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement.getContainingFile())) { - return; - } final PsiCodeBlock finallyBlock = statement.getTryBlock(); if (finallyBlock == null) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/JavaLangImportInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/JavaLangImportInspection.java index 8ac422e74c31..8ec10761c661 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/JavaLangImportInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/JavaLangImportInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,6 +48,11 @@ public class JavaLangImportInspection extends BaseInspection implements CleanupL return new DeleteImportFix(); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new JavaLangImportVisitor(); @@ -61,9 +66,6 @@ public class JavaLangImportInspection extends BaseInspection implements CleanupL if (!(aClass.getParent() instanceof PsiJavaFile)) { return; } - if (FileTypeUtils.isInServerPageFile(aClass.getContainingFile())) { - return; - } final PsiJavaFile file = (PsiJavaFile)aClass.getContainingFile(); if (!file.getClasses()[0].equals(aClass)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/OnDemandImportInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/OnDemandImportInspection.java index f9d5aea7344d..b1eff0367f24 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/OnDemandImportInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/OnDemandImportInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,11 @@ public class OnDemandImportInspection extends BaseInspection { return InspectionGadgetsBundle.message("import.problem.descriptor"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new PackageImportVisitor(); @@ -51,9 +56,6 @@ public class OnDemandImportInspection extends BaseInspection { return; } final PsiJavaFile file = (PsiJavaFile)parent; - if (FileTypeUtils.isInServerPageFile(aClass.getContainingFile())) { - return; - } if (!file.getClasses()[0].equals(aClass)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java index a1bd67ab359b..602720549847 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SamePackageImportInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2011 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ package com.siyeh.ig.imports; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.psi.*; +import com.intellij.psi.util.FileTypeUtils; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.DeleteImportFix; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; public class SamePackageImportInspection extends BaseInspection implements CleanupLocalInspectionTool { @@ -46,6 +46,11 @@ public class SamePackageImportInspection extends BaseInspection implements Clean return new DeleteImportFix(); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new SamePackageImportVisitor(); @@ -60,9 +65,6 @@ public class SamePackageImportInspection extends BaseInspection implements Clean if (!(parent instanceof PsiJavaFile)) { return; } - if (FileTypeUtils.isInServerPageFile(importList)) { - return; - } final PsiJavaFile javaFile = (PsiJavaFile)parent; final String packageName = javaFile.getPackageName(); final PsiImportStatement[] importStatements = diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SingleClassImportInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SingleClassImportInspection.java index 9bcad8fc0a95..bcb21fe7390d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SingleClassImportInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/SingleClassImportInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,14 +15,11 @@ */ package com.siyeh.ig.imports; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiImportList; -import com.intellij.psi.PsiImportStatement; -import com.intellij.psi.PsiJavaFile; +import com.intellij.psi.*; +import com.intellij.psi.util.FileTypeUtils; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; public class SingleClassImportInspection extends BaseInspection { @@ -41,6 +38,11 @@ public class SingleClassImportInspection extends BaseInspection { "single.class.import.problem.descriptor"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new PackageImportVisitor(); @@ -51,16 +53,11 @@ public class SingleClassImportInspection extends BaseInspection { @Override public void visitClass(@NotNull PsiClass aClass) { // no call to super, so it doesn't drill down - if (!(aClass.getParent() instanceof PsiJavaFile)) { - return; - } - if (FileTypeUtils.isInServerPageFile(aClass.getContainingFile())) { - return; - } - final PsiJavaFile file = (PsiJavaFile)aClass.getParent(); - if (file == null) { + final PsiElement parent = aClass.getParent(); + if (!(parent instanceof PsiJavaFile)) { return; } + final PsiJavaFile file = (PsiJavaFile)parent; if (!file.getClasses()[0].equals(aClass)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/StaticImportInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/StaticImportInspectionBase.java index db4e8f123a51..ebb5febf972d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/StaticImportInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/StaticImportInspectionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -56,6 +56,11 @@ public class StaticImportInspectionBase extends BaseInspection { "static.import.problem.descriptor"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new StaticImportFix(); @@ -245,9 +250,6 @@ public class StaticImportInspectionBase extends BaseInspection { return; } final PsiJavaFile file = (PsiJavaFile)parent; - if (FileTypeUtils.isInServerPageFile(file)) { - return; - } if (!file.getClasses()[0].equals(aClass)) { return; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/UnusedImportInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/UnusedImportInspection.java index 4a3ec992b2f0..33780d975018 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/UnusedImportInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/UnusedImportInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2014 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package com.siyeh.ig.imports; import com.intellij.psi.*; +import com.intellij.psi.util.FileTypeUtils; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.DeleteImportFix; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,6 +49,11 @@ public class UnusedImportInspection extends BaseInspection { return new DeleteImportFix(); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new UnusedImportVisitor(); @@ -58,9 +63,6 @@ public class UnusedImportInspection extends BaseInspection { @Override public void visitJavaFile(PsiJavaFile file) { - if (FileTypeUtils.isInServerPageFile(file)) { - return; - } final PsiClass[] classes = file.getClasses(); final PsiPackageStatement packageStatement = file.getPackageStatement(); final PsiModifierList annotationList; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java index d1bd35e9e508..ce338b554bf0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2011 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,12 @@ import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; +import com.intellij.psi.util.FileTypeUtils; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; public class ClassWithoutConstructorInspection extends BaseInspection { @@ -98,6 +98,11 @@ public class ClassWithoutConstructorInspection extends BaseInspection { } } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassWithoutConstructorVisitor(); @@ -109,12 +114,10 @@ public class ClassWithoutConstructorInspection extends BaseInspection { @Override public void visitClass(@NotNull PsiClass aClass) { // no call to super, so it doesn't drill down - if (aClass.isInterface() || aClass.isEnum() || - aClass.isAnnotationType() || FileTypeUtils.isInServerPageFile(aClass)) { + if (aClass.isInterface() || aClass.isEnum() || aClass.isAnnotationType()) { return; } - if (aClass instanceof PsiTypeParameter || - aClass instanceof PsiAnonymousClass) { + if (aClass instanceof PsiTypeParameter || aClass instanceof PsiAnonymousClass) { return; } final PsiMethod[] constructors = aClass.getConstructors(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/DesignForExtensionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/DesignForExtensionInspection.java index 330c38d9d639..95ccf6719278 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/DesignForExtensionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/DesignForExtensionInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2014 Dave Griffith, Bas Leijdekkers + * Copyright 2006-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,6 +85,11 @@ public class DesignForExtensionInspection extends BaseInspection { } } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); // IDEADEV-25538 + } + @Override public BaseInspectionVisitor buildVisitor() { return new DesignForExtensionVisitor(); @@ -94,10 +99,6 @@ public class DesignForExtensionInspection extends BaseInspection { @Override public void visitMethod(PsiMethod method) { - if (FileTypeUtils.isInServerPageFile(method)) { - // IDEADEV-25538 - return; - } super.visitMethod(method); if (method.isConstructor()) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java index 4a9e0f1dddac..502da183578e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,13 @@ package com.siyeh.ig.threading; import com.intellij.psi.PsiCodeBlock; +import com.intellij.psi.PsiFile; import com.intellij.psi.PsiStatement; import com.intellij.psi.PsiSynchronizedStatement; +import com.intellij.psi.util.FileTypeUtils; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; public class EmptySynchronizedStatementInspection extends BaseInspection { @@ -40,21 +41,21 @@ public class EmptySynchronizedStatementInspection extends BaseInspection { "empty.synchronized.statement.problem.descriptor"); } + @Override + public boolean shouldInspect(PsiFile file) { + return !FileTypeUtils.isInServerPageFile(file); + } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptySynchronizedStatementVisitor(); } - private static class EmptySynchronizedStatementVisitor - extends BaseInspectionVisitor { + private static class EmptySynchronizedStatementVisitor extends BaseInspectionVisitor { @Override - public void visitSynchronizedStatement( - @NotNull PsiSynchronizedStatement statement) { + public void visitSynchronizedStatement(@NotNull PsiSynchronizedStatement statement) { super.visitSynchronizedStatement(statement); - if (FileTypeUtils.isInServerPageFile(statement.getContainingFile())) { - return; - } final PsiCodeBlock body = statement.getBody(); if (body == null) { return;