MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 02:09:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[inspections] Automatically convert createOptionsPanel() to getOptionsPane() in simple cases

Browse Source 
GitOrigin-RevId: 8377376db858deac58eead81e92b286c1b099e10
This commit is contained in:
Tagir Valeev
2022-12-10 13:04:22 +01:00
committed by intellij-monorepo-bot
parent 88fb2cea2a
commit 394fd38cb5
200 changed files with 1389 additions and 1206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
RegExpSupport/src/org/intellij/lang/regexp/inspection/RegExpRedundantEscapeInspection.java
View File

@@ -5,6 +5,7 @@ import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.project.Project;
@@ -21,6 +22,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author Bas Leijdekkers
*/
@@ -29,9 +32,9 @@ public class RegExpRedundantEscapeInspection extends LocalInspectionTool {
public boolean ignoreEscapedMetaCharacters = false;
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(RegExpBundle.message("inspection.option.ignore.escaped.closing.brackets"),
this, "ignoreEscapedMetaCharacters");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreEscapedMetaCharacters", RegExpBundle.message("inspection.option.ignore.escaped.closing.brackets")));
}
@NotNull

13
java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
View File

@@ -5,7 +5,7 @@ import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.ChangeContextUtil;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
import com.intellij.codeInsight.intention.HighPriorityAction;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -23,15 +23,15 @@ import com.intellij.util.containers.hash.LinkedHashMap;
import com.intellij.util.text.UniqueNameGenerator;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.*;
import java.util.function.UnaryOperator;
import static com.intellij.codeInsight.AnnotationUtil.CHECK_EXTERNAL;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class AnonymousCanBeLambdaInspection extends AbstractBaseJavaLocalInspectionTool {
public static final Logger LOG = Logger.getInstance(AnonymousCanBeLambdaInspection.class);
@@ -56,10 +56,11 @@ public class AnonymousCanBeLambdaInspection extends AbstractBaseJavaLocalInspect
return "Convert2Lambda";
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("report.when.interface.is.not.annotated.with.functional.interface"), this, "reportNotAnnotatedInterfaces");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("reportNotAnnotatedInterfaces",
JavaAnalysisBundle.message("report.when.interface.is.not.annotated.with.functional.interface")));
}
@NotNull

19
java/java-analysis-impl/src/com/intellij/codeInspection/ConditionalBreakInInfiniteLoopInspection.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInspection;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
@@ -15,12 +15,12 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Collections;
import java.util.Set;
import java.util.stream.Collectors;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class ConditionalBreakInInfiniteLoopInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -28,14 +28,13 @@ public class ConditionalBreakInInfiniteLoopInspection extends AbstractBaseJavaLo
public boolean allowConditionFusion = false;
public boolean suggestConversionWhenIfIsASingleStmtInLoop = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaBundle.message("inspection.conditional.break.in.infinite.loop.no.conversion.with.do.while"), "noConversionToDoWhile");
panel.addCheckbox(JavaBundle.message("inspection.conditional.break.in.infinite.loop.allow.condition.fusion"), "allowConditionFusion");
panel.addCheckbox(JavaBundle.message("inspection.conditional.break.in.infinite.loop.suggest.conversion.when.if.is.single.stmt.in.loop"), "suggestConversionWhenIfIsASingleStmtInLoop");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("noConversionToDoWhile", JavaBundle.message("inspection.conditional.break.in.infinite.loop.no.conversion.with.do.while")),
checkbox("allowConditionFusion", JavaBundle.message("inspection.conditional.break.in.infinite.loop.allow.condition.fusion")),
checkbox("suggestConversionWhenIfIsASingleStmtInLoop",
JavaBundle.message("inspection.conditional.break.in.infinite.loop.suggest.conversion.when.if.is.single.stmt.in.loop")));
}
@NotNull

10
java/java-analysis-impl/src/com/intellij/codeInspection/NumericOverflowInspection.java
View File

@@ -2,6 +2,7 @@
package com.intellij.codeInspection;
import com.intellij.codeInsight.daemon.JavaErrorBundle;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.project.Project;
@@ -17,16 +18,17 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class NumericOverflowInspection extends AbstractBaseJavaLocalInspectionTool {
private static final Key<String> HAS_OVERFLOW_IN_CHILD = Key.create("HAS_OVERFLOW_IN_CHILD");
public boolean ignoreLeftShiftWithNegativeResult = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("ignore.operation.which.results.in.negative.value"), this,
"ignoreLeftShiftWithNegativeResult");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreLeftShiftWithNegativeResult", JavaAnalysisBundle.message("ignore.operation.which.results.in.negative.value")));
}
@Nls

13
java/java-analysis-impl/src/com/intellij/codeInspection/duplicateThrows/DuplicateThrowsInspection.java
View File

@@ -6,7 +6,7 @@ import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.psi.*;
import com.intellij.psi.javadoc.PsiDocComment;
@@ -14,9 +14,9 @@ import com.intellij.psi.javadoc.PsiDocTag;
import com.intellij.psi.javadoc.PsiDocTagValue;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class DuplicateThrowsInspection extends AbstractBaseJavaLocalInspectionTool implements CleanupLocalInspectionTool {
@SuppressWarnings("PublicField")
@@ -34,11 +34,10 @@ public class DuplicateThrowsInspection extends AbstractBaseJavaLocalInspectionTo
return "DuplicateThrows";
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
JavaAnalysisBundle.message("inspection.duplicate.throws.ignore.subclassing.option"), this, "ignoreSubclassing");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreSubclassing", JavaAnalysisBundle.message("inspection.duplicate.throws.ignore.subclassing.option")));
}
@Override

11
java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/JavaRequiresAutoModuleInspection.java
View File

@@ -3,7 +3,7 @@ package com.intellij.codeInspection.java19modules;
import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.psi.*;
import com.intellij.psi.impl.light.LightJavaModule;
@@ -11,15 +11,16 @@ import com.intellij.psi.util.PsiUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class JavaRequiresAutoModuleInspection extends AbstractBaseJavaLocalInspectionTool {
public boolean TRANSITIVE_ONLY = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("inspection.requires.auto.module.option"), this, "TRANSITIVE_ONLY");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("TRANSITIVE_ONLY", JavaAnalysisBundle.message("inspection.requires.auto.module.option")));
}
@Override

21
java/java-analysis-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java
View File

@@ -2,7 +2,7 @@
package com.intellij.codeInspection.localCanBeFinal;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.WriteExternalException;
@@ -16,9 +16,11 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class LocalCanBeFinal extends AbstractBaseJavaLocalInspectionTool implements CleanupLocalInspectionTool {
public boolean REPORT_VARIABLES = true;
public boolean REPORT_PARAMETERS = true;
@@ -353,13 +355,12 @@ public class LocalCanBeFinal extends AbstractBaseJavaLocalInspectionTool impleme
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaAnalysisBundle.message("inspection.local.can.be.final.option"), "REPORT_VARIABLES");
panel.addCheckbox(JavaAnalysisBundle.message("inspection.local.can.be.final.option1"), "REPORT_PARAMETERS");
panel.addCheckbox(JavaAnalysisBundle.message("inspection.local.can.be.final.option2"), "REPORT_CATCH_PARAMETERS");
panel.addCheckbox(JavaAnalysisBundle.message("inspection.local.can.be.final.option3"), "REPORT_FOREACH_PARAMETERS");
panel.addCheckbox(JavaAnalysisBundle.message("inspection.local.can.be.final.option4"), "REPORT_IMPLICIT_FINALS");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("REPORT_VARIABLES", JavaAnalysisBundle.message("inspection.local.can.be.final.option")),
checkbox("REPORT_PARAMETERS", JavaAnalysisBundle.message("inspection.local.can.be.final.option1")),
checkbox("REPORT_CATCH_PARAMETERS", JavaAnalysisBundle.message("inspection.local.can.be.final.option2")),
checkbox("REPORT_FOREACH_PARAMETERS", JavaAnalysisBundle.message("inspection.local.can.be.final.option3")),
checkbox("REPORT_IMPLICIT_FINALS", JavaAnalysisBundle.message("inspection.local.can.be.final.option4")));
}
}

9
java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspection.java
View File

@@ -6,6 +6,7 @@ import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.dataFlow.CommonDataflow;
import com.intellij.codeInspection.dataFlow.TypeConstraint;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.InspectionMessage;
import com.intellij.java.analysis.JavaAnalysisBundle;
@@ -20,6 +21,8 @@ import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author ven
*/
@@ -32,9 +35,9 @@ public class SuspiciousCollectionsMethodCallsInspection extends AbstractBaseJava
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("report.suspicious.but.possibly.correct.method.calls"), this, "REPORT_CONVERTIBLE_METHOD_CALLS");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("REPORT_CONVERTIBLE_METHOD_CALLS", JavaAnalysisBundle.message("report.suspicious.but.possibly.correct.method.calls")));
}
@Override

10
java/java-analysis-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
View File

@@ -3,6 +3,7 @@ package com.intellij.codeInspection.redundantCast;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.miscGenerics.SuspiciousMethodCallUtil;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.project.Project;
@@ -18,6 +19,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import static com.intellij.codeInspection.options.OptPane.*;
public class RedundantCastInspection extends AbstractBaseJavaLocalInspectionTool implements CleanupLocalInspectionTool {
private final LocalQuickFix myQuickFixAction;
@NonNls private static final String SHORT_NAME = "RedundantCast";
@@ -48,10 +51,9 @@ public class RedundantCastInspection extends AbstractBaseJavaLocalInspectionTool
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(JavaAnalysisBundle.message("ignore.casts.in.suspicious.collections.method.calls"), "IGNORE_SUSPICIOUS_METHOD_CALLS");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("IGNORE_SUSPICIOUS_METHOD_CALLS", JavaAnalysisBundle.message("ignore.casts.in.suspicious.collections.method.calls")));
}
@Nullable

9
java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationInspection.java
View File

@@ -8,6 +8,7 @@ import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil;
import com.intellij.codeInsight.javadoc.JavaDocUtil;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.reference.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclarationLocalInspection.ThrowRefType;
@@ -36,15 +37,17 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.intellij.codeInspection.options.OptPane.*;
public final class RedundantThrowsDeclarationInspection extends GlobalJavaBatchInspectionTool {
public boolean IGNORE_ENTRY_POINTS = false;
private final RedundantThrowsDeclarationLocalInspection myLocalInspection = new RedundantThrowsDeclarationLocalInspection(this);
@NotNull
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("ignore.exceptions.thrown.by.entry.points.methods"), this, "IGNORE_ENTRY_POINTS");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("IGNORE_ENTRY_POINTS", JavaAnalysisBundle.message("ignore.exceptions.thrown.by.entry.points.methods")));
}
@Override

8
java/java-analysis-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java
View File

@@ -3,6 +3,7 @@ package com.intellij.codeInspection.unusedLibraries;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.reference.RefGraphAnnotator;
import com.intellij.codeInspection.reference.RefManager;
import com.intellij.codeInspection.reference.RefModule;
@@ -38,14 +39,17 @@ import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import static com.intellij.codeInspection.options.OptPane.*;
public final class UnusedLibrariesInspection extends GlobalInspectionTool {
private static final Logger LOG = Logger.getInstance(UnusedLibrariesInspection.class);
public boolean IGNORE_LIBRARY_PARTS = true;
@Override
public @NotNull JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("don.t.report.unused.jars.inside.used.library"), this, "IGNORE_LIBRARY_PARTS");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("IGNORE_LIBRARY_PARTS", JavaAnalysisBundle.message("don.t.report.unused.jars.inside.used.library")));
}
@Override

14
java/java-impl-inspections/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java
View File

@@ -2,7 +2,7 @@
package com.intellij.codeInspection;
import com.intellij.codeInsight.intention.QuickFixFactory;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.LambdaGenerationUtil;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.diagnostic.Logger;
@@ -24,12 +24,12 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class ExplicitArrayFillingInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -37,12 +37,10 @@ public class ExplicitArrayFillingInspection extends AbstractBaseJavaLocalInspect
public boolean mySuggestSetAll = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.explicit.array.filling.suggest.set.all"),
this,
"mySuggestSetAll");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("mySuggestSetAll", JavaBundle.message("inspection.explicit.array.filling.suggest.set.all")));
}
@NotNull

15
java/java-impl-inspections/src/com/intellij/codeInspection/ManualMinMaxCalculationInspection.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -21,21 +21,18 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class ManualMinMaxCalculationInspection extends AbstractBaseJavaLocalInspectionTool {
public boolean disableForNonIntegralTypes = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaBundle.message("inspection.manual.min.max.calculation.disable.for.non.integral"),
"disableForNonIntegralTypes");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("disableForNonIntegralTypes", JavaBundle.message("inspection.manual.min.max.calculation.disable.for.non.integral")));
}
@NotNull

10
java/java-impl-inspections/src/com/intellij/codeInspection/OptionalAssignedToNullInspection.java
View File

@@ -3,6 +3,7 @@ package com.intellij.codeInspection;
import com.intellij.codeInsight.PsiEquivalenceUtil;
import com.intellij.codeInspection.dataFlow.DfaUtil;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.OptionalUtil;
import com.intellij.java.JavaBundle;
@@ -24,17 +25,18 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class OptionalAssignedToNullInspection extends AbstractBaseJavaLocalInspectionTool {
private static final CallMatcher MAP_GET = CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "get").parameterTypes(
CommonClassNames.JAVA_LANG_OBJECT);
public boolean WARN_ON_COMPARISON = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.null.value.for.optional.option.comparisons"),
this, "WARN_ON_COMPARISON");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("WARN_ON_COMPARISON", JavaBundle.message("inspection.null.value.for.optional.option.comparisons")));
}
@NotNull

9
java/java-impl-inspections/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java
View File

@@ -2,6 +2,7 @@
package com.intellij.codeInspection;
import com.intellij.codeInsight.intention.HighPriorityAction;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.OptionalUtil;
import com.intellij.java.JavaBundle;
@@ -27,6 +28,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;
import static com.intellij.codeInspection.options.OptPane.*;
import static com.intellij.util.ObjectUtils.tryCast;
import static com.siyeh.ig.callMatcher.CallMatcher.*;
import static com.siyeh.ig.psiutils.StreamApiUtil.findSubsequentCall;
@@ -87,11 +89,10 @@ public class RedundantStreamOptionalCallInspection extends AbstractBaseJavaLocal
@SuppressWarnings("PublicField")
public boolean USELESS_BOXING_IN_STREAM_MAP = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.redundant.stream.optional.call.option.streamboxing"), this,
"USELESS_BOXING_IN_STREAM_MAP");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("USELESS_BOXING_IN_STREAM_MAP", JavaBundle.message("inspection.redundant.stream.optional.call.option.streamboxing")));
}
@NotNull

10
java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceNullCheckInspection.java
View File

@@ -3,6 +3,7 @@ package com.intellij.codeInspection;
import com.intellij.codeInsight.Nullability;
import com.intellij.codeInspection.dataFlow.NullabilityUtil;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.LambdaGenerationUtil;
import com.intellij.java.JavaBundle;
@@ -21,6 +22,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
import static com.intellij.util.ObjectUtils.tryCast;
public class ReplaceNullCheckInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -37,12 +39,10 @@ public class ReplaceNullCheckInspection extends AbstractBaseJavaLocalInspectionT
@SuppressWarnings("PublicField")
public boolean noWarningReplacementBigger = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaBundle.message("inspection.require.non.null.no.warning.replacement.bigger"), "noWarningReplacementBigger");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("noWarningReplacementBigger", JavaBundle.message("inspection.require.non.null.no.warning.replacement.bigger")));
}
@NotNull

8
java/java-impl-inspections/src/com/intellij/codeInspection/StringRepeatCanBeUsedInspection.java
View File

@@ -6,6 +6,7 @@ import com.intellij.codeInsight.Nullability;
import com.intellij.codeInspection.dataFlow.CommonDataflow;
import com.intellij.codeInspection.dataFlow.NullabilityUtil;
import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
@@ -22,6 +23,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
import static com.intellij.util.ObjectUtils.tryCast;
public class StringRepeatCanBeUsedInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -29,10 +31,10 @@ public class StringRepeatCanBeUsedInspection extends AbstractBaseJavaLocalInspec
public boolean ADD_MATH_MAX = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("label.add.math.max.0.count.to.avoid.possible.semantics.change"), this, "ADD_MATH_MAX");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ADD_MATH_MAX", JavaBundle.message("label.add.math.max.0.count.to.avoid.possible.semantics.change")));
}
@NotNull

10
java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockMigrationInspection.java
View File

@@ -2,6 +2,7 @@
package com.intellij.codeInspection;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.editor.Document;
@@ -21,18 +22,17 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
import static com.intellij.util.ObjectUtils.tryCast;
public class TextBlockMigrationInspection extends AbstractBaseJavaLocalInspectionTool {
public boolean mySuggestLiteralReplacement = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.text.block.migration.suggest.literal.replacement"),
this,
"mySuggestLiteralReplacement");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("mySuggestLiteralReplacement", JavaBundle.message("inspection.text.block.migration.suggest.literal.replacement")));
}
@NotNull

19
java/java-impl-inspections/src/com/intellij/codeInspection/dataFlow/ConstantValueInspection.java
View File

@@ -15,7 +15,7 @@ import com.intellij.codeInspection.dataFlow.jvm.SpecialField;
import com.intellij.codeInspection.dataFlow.types.DfReferenceType;
import com.intellij.codeInspection.dataFlow.types.DfType;
import com.intellij.codeInspection.dataFlow.types.DfTypes;
import com.intellij.codeInspection.ui.InspectionOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -41,10 +41,11 @@ import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.java.JavaBundle.message;
import static com.intellij.util.ObjectUtils.tryCast;
@@ -55,15 +56,11 @@ public class ConstantValueInspection extends AbstractBaseJavaLocalInspectionTool
public boolean REPORT_CONSTANT_REFERENCE_VALUES = true;
@Override
public @Nullable JComponent createOptionsPanel() {
InspectionOptionsPanel panel = new InspectionOptionsPanel(this);
panel.addCheckbox(message("inspection.data.flow.true.asserts.option"),
"DONT_REPORT_TRUE_ASSERT_STATEMENTS");
panel.addCheckbox(message("inspection.data.flow.ignore.assert.statements"),
"IGNORE_ASSERT_STATEMENTS");
panel.addCheckbox(message("inspection.data.flow.warn.when.reading.a.value.guaranteed.to.be.constant"),
"REPORT_CONSTANT_REFERENCE_VALUES");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("DONT_REPORT_TRUE_ASSERT_STATEMENTS", message("inspection.data.flow.true.asserts.option")),
checkbox("IGNORE_ASSERT_STATEMENTS", message("inspection.data.flow.ignore.assert.statements")),
checkbox("REPORT_CONSTANT_REFERENCE_VALUES", message("inspection.data.flow.warn.when.reading.a.value.guaranteed.to.be.constant")));
}
@Override

12
java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8ListReplaceAllInspection.java
View File

@@ -5,7 +5,7 @@ import com.intellij.codeInsight.PsiEquivalenceUtil;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.IteratorDeclaration;
import com.intellij.codeInspection.util.LambdaGenerationUtil;
import com.intellij.java.JavaBundle;
@@ -27,10 +27,11 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
import java.util.function.Predicate;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class Java8ListReplaceAllInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -38,11 +39,10 @@ public class Java8ListReplaceAllInspection extends AbstractBaseJavaLocalInspecti
@SuppressWarnings("PublicField") public boolean dontWarnInCaseOfMultilineLambda = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("checkbox.don.t.warn.in.case.of.multiline.lambda"), this,
"dontWarnInCaseOfMultilineLambda");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("dontWarnInCaseOfMultilineLambda", JavaBundle.message("checkbox.don.t.warn.in.case.of.multiline.lambda")));
}
@NotNull

26
java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java
View File

@@ -7,7 +7,7 @@ import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.intention.FileModifier;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.dataFlow.NullabilityUtil;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.LambdaGenerationUtil;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.diagnostic.Logger;
@@ -28,11 +28,12 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.siyeh.ig.psiutils.Java8MigrationUtils.*;
import static com.siyeh.ig.psiutils.Java8MigrationUtils.MapCheckCondition.fromConditional;
@@ -57,18 +58,17 @@ public class Java8MapApiInspection extends AbstractBaseJavaLocalInspectionTool {
@SuppressWarnings("PublicField")
public boolean mySideEffects = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaBundle.message("checkbox.suggest.conversion.to.map.computeifabsent"), "mySuggestMapComputeIfAbsent");
panel.addCheckbox(JavaBundle.message("checkbox.suggest.conversion.to.map.getordefault"), "mySuggestMapGetOrDefault");
panel.addCheckbox(JavaBundle.message("checkbox.suggest.conversion.to.map.putifabsent"), "mySuggestMapPutIfAbsent");
panel.addCheckbox(JavaBundle.message("checkbox.suggest.conversion.to.map.merge"), "mySuggestMapMerge");
panel.addCheckbox(JavaBundle.message("checkbox.suggest.conversion.to.map.replaceall"), "mySuggestMapReplaceAll");
panel.addCheckbox(JavaBundle.message("checkbox.treat.get.k.null.the.same.as.containskey.k.may.change.semantics"), "myTreatGetNullAsContainsKey");
panel.addCheckbox(JavaBundle.message("checkbox.suggest.replacement.even.if.lambda.may.have.side.effects"), "mySideEffects");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("mySuggestMapComputeIfAbsent", JavaBundle.message("checkbox.suggest.conversion.to.map.computeifabsent")),
checkbox("mySuggestMapGetOrDefault", JavaBundle.message("checkbox.suggest.conversion.to.map.getordefault")),
checkbox("mySuggestMapPutIfAbsent", JavaBundle.message("checkbox.suggest.conversion.to.map.putifabsent")),
checkbox("mySuggestMapMerge", JavaBundle.message("checkbox.suggest.conversion.to.map.merge")),
checkbox("mySuggestMapReplaceAll", JavaBundle.message("checkbox.suggest.conversion.to.map.replaceall")),
checkbox("myTreatGetNullAsContainsKey",
JavaBundle.message("checkbox.treat.get.k.null.the.same.as.containskey.k.may.change.semantics")),
checkbox("mySideEffects", JavaBundle.message("checkbox.suggest.replacement.even.if.lambda.may.have.side.effects")));
}
@NotNull

14
java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java
View File

@@ -2,7 +2,7 @@
package com.intellij.codeInspection.java18api;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.LambdaGenerationUtil;
import com.intellij.java.JavaBundle;
import com.intellij.java.analysis.JavaAnalysisBundle;
@@ -21,12 +21,13 @@ import com.siyeh.ig.callMatcher.CallMatcher;
import com.siyeh.ig.psiutils.*;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
import java.util.Objects;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class Java8MapForEachInspection extends AbstractBaseJavaLocalInspectionTool {
private static final String JAVA_UTIL_MAP_ENTRY = CommonClassNames.JAVA_UTIL_MAP + ".Entry";
@@ -39,11 +40,10 @@ public class Java8MapForEachInspection extends AbstractBaseJavaLocalInspectionTo
public boolean DO_NOT_HIGHLIGHT_LOOP = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.map.foreach.option.no.loops"), this,
"DO_NOT_HIGHLIGHT_LOOP");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("DO_NOT_HIGHLIGHT_LOOP", JavaBundle.message("inspection.map.foreach.option.no.loops")));
}
@NotNull

15
java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspection.java
View File

@@ -18,7 +18,7 @@ package com.intellij.codeInspection.java19api;
import com.intellij.codeInsight.Nullability;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.dataFlow.NullabilityUtil;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
@@ -39,10 +39,11 @@ import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import java.util.function.Function;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.psi.CommonClassNames.*;
import static com.intellij.util.ObjectUtils.tryCast;
import static com.siyeh.ig.callMatcher.CallMatcher.instanceCall;
@@ -68,13 +69,11 @@ public class Java9CollectionFactoryInspection extends AbstractBaseJavaLocalInspe
public boolean IGNORE_NON_CONSTANT = false;
public boolean SUGGEST_MAP_OF_ENTRIES = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaBundle.message("inspection.collection.factories.option.ignore.non.constant"), "IGNORE_NON_CONSTANT");
panel.addCheckbox(JavaBundle.message("inspection.collection.factories.option.suggest.ofentries"), "SUGGEST_MAP_OF_ENTRIES");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("IGNORE_NON_CONSTANT", JavaBundle.message("inspection.collection.factories.option.ignore.non.constant")),
checkbox("SUGGEST_MAP_OF_ENTRIES", JavaBundle.message("inspection.collection.factories.option.suggest.ofentries")));
}
@NotNull

25
java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RawUseOfParameterizedTypeInspection.java
View File

@@ -5,6 +5,7 @@ import com.intellij.codeInsight.intention.HighPriorityAction;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.RemoveRedundantTypeArgumentsUtil;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.java.JavaBundle;
@@ -32,6 +33,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Set;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author dsl
*/
@@ -67,20 +70,14 @@ public class RawUseOfParameterizedTypeInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(JavaBundle.message("raw.use.of.parameterized.type.ignore.new.objects.option"),
"ignoreObjectConstruction");
optionsPanel.addCheckbox(JavaBundle.message("raw.use.of.parameterized.type.ignore.type.casts.option"),
"ignoreTypeCasts");
optionsPanel.addCheckbox(JavaBundle.message("raw.use.of.parameterized.type.ignore.uncompilable.option"),
"ignoreUncompilable");
optionsPanel.addCheckbox(JavaBundle.message("raw.use.of.parameterized.type.ignore.overridden.parameter.option"),
"ignoreParametersOfOverridingMethods");
optionsPanel.addCheckbox(JavaBundle.message("raw.use.of.parameterized.type.ignore.quickfix.not.available.option"),
"ignoreWhenQuickFixNotAvailable");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreObjectConstruction", JavaBundle.message("raw.use.of.parameterized.type.ignore.new.objects.option")),
checkbox("ignoreTypeCasts", JavaBundle.message("raw.use.of.parameterized.type.ignore.type.casts.option")),
checkbox("ignoreUncompilable", JavaBundle.message("raw.use.of.parameterized.type.ignore.uncompilable.option")),
checkbox("ignoreParametersOfOverridingMethods",
JavaBundle.message("raw.use.of.parameterized.type.ignore.overridden.parameter.option")),
checkbox("ignoreWhenQuickFixNotAvailable", JavaBundle.message("raw.use.of.parameterized.type.ignore.quickfix.not.available.option")));
}
@Override

12
java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FuseStreamOperationsInspection.java
View File

@@ -2,8 +2,8 @@
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.streamMigration.CollectMigration.CollectTerminal;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.ide.nls.NlsMessages;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
@@ -20,9 +20,10 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Objects;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class FuseStreamOperationsInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -113,11 +114,10 @@ public class FuseStreamOperationsInspection extends AbstractBaseJavaLocalInspect
}
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.fuse.stream.operations.option.strict.mode"), this,
"myStrictMode");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myStrictMode", JavaBundle.message("inspection.fuse.stream.operations.option.strict.mode")));
}
@NotNull

9
java/java-impl-inspections/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java
View File

@@ -2,6 +2,7 @@
package com.intellij.codeInspection.streamToLoop;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.redundantCast.RemoveRedundantCastUtil;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.InspectionMessage;
@@ -29,6 +30,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class StreamToLoopInspection extends AbstractBaseJavaLocalInspectionTool {
private static final Logger LOG = Logger.getInstance(StreamToLoopInspection.class);
@@ -46,10 +49,10 @@ public class StreamToLoopInspection extends AbstractBaseJavaLocalInspectionTool
@SuppressWarnings("PublicField")
public boolean SUPPORT_UNKNOWN_SOURCES = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("checkbox.iterate.unknown.stream.sources.via.stream.iterator"), this, "SUPPORT_UNKNOWN_SOURCES");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("SUPPORT_UNKNOWN_SOURCES", JavaBundle.message("checkbox.iterate.unknown.stream.sources.via.stream.iterator")));
}
@NotNull

14
java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
View File

@@ -2,7 +2,7 @@
package com.intellij.codeInspection;
import com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection.MethodReferenceCandidate;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.JavaBundle;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.diagnostic.Logger;
@@ -15,12 +15,13 @@ import com.intellij.psi.util.RedundantCastUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Collection;
import java.util.Collections;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class AnonymousCanBeMethodReferenceInspection extends AbstractBaseJavaLocalInspectionTool {
private static final Logger LOG = Logger.getInstance(AnonymousCanBeMethodReferenceInspection.class);
@@ -44,10 +45,11 @@ public class AnonymousCanBeMethodReferenceInspection extends AbstractBaseJavaLoc
return "Anonymous2MethodRef";
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("report.when.interface.is.not.annotated.with.functional.interface"), this, "reportNotAnnotatedInterfaces");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("reportNotAnnotatedInterfaces",
JavaAnalysisBundle.message("report.when.interface.is.not.annotated.with.functional.interface")));
}
@NotNull

13
java/java-impl/src/com/intellij/codeInspection/EnhancedSwitchMigrationInspection.java
View File

@@ -4,7 +4,7 @@ package com.intellij.codeInspection;
import com.intellij.codeInsight.BlockUtils;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature;
import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel.PatternsInSwitchBlockHighlightingModel.CompletenessResult;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -17,24 +17,23 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.PropertyKey;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel.PatternsInSwitchBlockHighlightingModel;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class EnhancedSwitchMigrationInspection extends AbstractBaseJavaLocalInspectionTool {
public boolean myWarnOnlyOnExpressionConversion = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.switch.expression.migration.warn.only.on.expression"),
this,
"myWarnOnlyOnExpressionConversion");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myWarnOnlyOnExpressionConversion", JavaBundle.message("inspection.switch.expression.migration.warn.only.on.expression")));
}
private final static SwitchConversion[] ourInspections = new SwitchConversion[]{

10
java/java-impl/src/com/intellij/codeInspection/bulkOperation/UseBulkOperationInspection.java
View File

@@ -5,6 +5,7 @@ import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.IteratorDeclaration;
import com.intellij.java.JavaBundle;
@@ -27,6 +28,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.regex.Pattern;
import static com.intellij.codeInspection.options.OptPane.*;
public class UseBulkOperationInspection extends AbstractBaseJavaLocalInspectionTool {
private static final Pattern FOR_EACH_METHOD = Pattern.compile("forEach(Ordered)?");
@@ -39,11 +42,10 @@ public class UseBulkOperationInspection extends AbstractBaseJavaLocalInspectionT
public boolean USE_ARRAYS_AS_LIST = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaBundle.message("inspection.replace.with.bulk.wrap.arrays"), this,
"USE_ARRAYS_AS_LIST");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("USE_ARRAYS_AS_LIST", JavaBundle.message("inspection.replace.with.bulk.wrap.arrays")));
}
@Nullable

12
java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
View File

@@ -9,7 +9,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.InspectionMessage;
import com.intellij.ide.DataManager;
import com.intellij.ide.util.FQNameCellRenderer;
@@ -31,9 +31,11 @@ import com.intellij.util.io.URLUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class JavaDocReferenceInspection extends LocalInspectionTool {
private static final String SHORT_NAME = "JavadocReference";
@@ -41,9 +43,9 @@ public class JavaDocReferenceInspection extends LocalInspectionTool {
public boolean REPORT_INACCESSIBLE = true;
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
JavaBundle.message("checkbox.html.report.inaccessible.symbols"), this, "REPORT_INACCESSIBLE");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("REPORT_INACCESSIBLE", JavaBundle.message("checkbox.html.report.inaccessible.symbols")));
}
@Override

13
java/java-impl/src/com/intellij/codeInspection/nullable/NotNullFieldNotInitializedInspection.java
View File

@@ -14,6 +14,7 @@ import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.SetInspectionOptionFix;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.InspectionMessage;
import com.intellij.java.JavaBundle;
@@ -25,19 +26,19 @@ import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.*;
public class NotNullFieldNotInitializedInspection extends AbstractBaseJavaLocalInspectionTool {
private static final String IGNORE_IMPLICITLY_WRITTEN_FIELDS_NAME = "IGNORE_IMPLICITLY_WRITTEN_FIELDS";
private static final String IGNORE_FIELDS_WRITTEN_IN_SETUP_NAME = "IGNORE_FIELDS_WRITTEN_IN_SETUP";
public boolean IGNORE_IMPLICITLY_WRITTEN_FIELDS = true;
public boolean IGNORE_FIELDS_WRITTEN_IN_SETUP = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaBundle.message("inspection.notnull.field.not.initialized.option.implicit"), IGNORE_IMPLICITLY_WRITTEN_FIELDS_NAME);
panel.addCheckbox(JavaBundle.message("inspection.notnull.field.not.initialized.option.setup"), IGNORE_FIELDS_WRITTEN_IN_SETUP_NAME);
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox(IGNORE_IMPLICITLY_WRITTEN_FIELDS_NAME, JavaBundle.message("inspection.notnull.field.not.initialized.option.implicit")),
checkbox(IGNORE_FIELDS_WRITTEN_IN_SETUP_NAME, JavaBundle.message("inspection.notnull.field.not.initialized.option.setup")));
}
@NotNull

19
java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java
View File

@@ -3,7 +3,7 @@ package com.intellij.refactoring.typeMigration.inspections;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -27,9 +27,11 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
/**
* @author Dmitry Batkovich
*/
@@ -43,13 +45,12 @@ public final class GuavaInspection extends AbstractBaseJavaLocalInspectionTool {
public boolean ignoreJavaxNullable = true;
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(TypeMigrationBundle.message("inspection.guava.variables.option"), "checkVariables");
panel.addCheckbox(TypeMigrationBundle.message("inspection.guava.method.chains.option"), "checkChains");
panel.addCheckbox(TypeMigrationBundle.message("inspection.guava.return.types.option"), "checkReturnTypes");
panel.addCheckbox(TypeMigrationBundle.message("inspection.guava.erase.option"), "ignoreJavaxNullable");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("checkVariables", TypeMigrationBundle.message("inspection.guava.variables.option")),
checkbox("checkChains", TypeMigrationBundle.message("inspection.guava.method.chains.option")),
checkbox("checkReturnTypes", TypeMigrationBundle.message("inspection.guava.return.types.option")),
checkbox("ignoreJavaxNullable", TypeMigrationBundle.message("inspection.guava.erase.option")));
}
@NotNull

23
json/src/com/intellij/json/codeinsight/JsonStandardComplianceInspection.java
View File

@@ -6,8 +6,11 @@ import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.json.*;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.json.JsonBundle;
import com.intellij.json.JsonDialectUtil;
import com.intellij.json.JsonElementTypes;
import com.intellij.json.JsonLanguage;
import com.intellij.json.jsonLines.JsonLinesFileType;
import com.intellij.json.psi.*;
import com.intellij.lang.injection.InjectedLanguageManager;
@@ -22,7 +25,8 @@ import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
/**
* Compliance checks include
@@ -68,13 +72,12 @@ public class JsonStandardComplianceInspection extends LocalInspectionTool {
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(JsonBundle.message("inspection.compliance.option.comments"), "myWarnAboutComments");
optionsPanel.addCheckbox(JsonBundle.message("inspection.compliance.option.multiple.top.level.values"), "myWarnAboutMultipleTopLevelValues");
optionsPanel.addCheckbox(JsonBundle.message("inspection.compliance.option.trailing.comma"), "myWarnAboutTrailingCommas");
optionsPanel.addCheckbox(JsonBundle.message("inspection.compliance.option.nan.infinity"), "myWarnAboutNanInfinity");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myWarnAboutComments", JsonBundle.message("inspection.compliance.option.comments")),
checkbox("myWarnAboutMultipleTopLevelValues", JsonBundle.message("inspection.compliance.option.multiple.top.level.values")),
checkbox("myWarnAboutTrailingCommas", JsonBundle.message("inspection.compliance.option.trailing.comma")),
checkbox("myWarnAboutNanInfinity", JsonBundle.message("inspection.compliance.option.nan.infinity")));
}
protected static @NotNull String escapeSingleQuotedStringContent(@NotNull String content) {

13
json/src/com/jetbrains/jsonSchema/impl/inspections/JsonSchemaComplianceInspection.java
View File

@@ -3,7 +3,7 @@ package com.jetbrains.jsonSchema.impl.inspections;
import com.intellij.codeInspection.LocalInspectionToolSession;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.json.JsonBundle;
import com.intellij.json.psi.JsonElementVisitor;
import com.intellij.json.psi.JsonValue;
@@ -17,7 +17,8 @@ import com.jetbrains.jsonSchema.impl.JsonSchemaObject;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class JsonSchemaComplianceInspection extends JsonSchemaBasedInspectionBase {
public boolean myCaseInsensitiveEnum = false;
@@ -41,12 +42,10 @@ public class JsonSchemaComplianceInspection extends JsonSchemaBasedInspectionBas
};
}
@Nullable
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(JsonBundle.message("json.schema.inspection.case.insensitive.enum"), "myCaseInsensitiveEnum");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myCaseInsensitiveEnum", JsonBundle.message("json.schema.inspection.case.insensitive.enum")));
}
private static void annotate(@NotNull PsiElement element,

19
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/HamcrestAssertionsConverterInspection.kt
View File

@@ -3,14 +3,19 @@ package com.intellij.codeInspection.test.junit
import com.intellij.analysis.JvmAnalysisBundle
import com.intellij.codeInspection.*
import com.intellij.codeInspection.options.OptPane.checkbox
import com.intellij.codeInspection.options.OptPane.pane
import com.intellij.codeInspection.test.junit.HamcrestCommonClassNames.*
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel
import com.intellij.openapi.project.Project
import com.intellij.psi.*
import com.intellij.psi.CommonClassNames.*
import com.intellij.psi.CommonClassNames.JAVA_LANG_STRING
import com.intellij.psi.CommonClassNames.JAVA_UTIL_COLLECTION
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiElementVisitor
import com.intellij.psi.PsiPrimitiveType
import com.intellij.uast.UastHintedVisitorAdapter
import com.intellij.util.asSafely
import com.siyeh.ig.junit.JUnitCommonClassNames.*
import com.siyeh.ig.junit.JUnitCommonClassNames.JUNIT_FRAMEWORK_ASSERT
import com.siyeh.ig.junit.JUnitCommonClassNames.ORG_JUNIT_ASSERT
import com.siyeh.ig.psiutils.TypeUtils
import org.jetbrains.uast.*
import org.jetbrains.uast.generate.UastElementFactory
@@ -18,15 +23,13 @@ import org.jetbrains.uast.generate.getUastElementFactory
import org.jetbrains.uast.generate.importMemberOnDemand
import org.jetbrains.uast.generate.replace
import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor
import javax.swing.JComponent
class HamcrestAssertionsConverterInspection : AbstractBaseUastLocalInspectionTool() {
@JvmField
var importMemberOnDemand = true
override fun createOptionsPanel(): JComponent = SingleCheckboxOptionsPanel(
JvmAnalysisBundle.message("jvm.inspections.migrate.assert.to.matcher.option"), this, "importMemberOnDemand"
)
override fun getOptionsPane() = pane(
checkbox("importMemberOnDemand", JvmAnalysisBundle.message("jvm.inspections.migrate.assert.to.matcher.option")))
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
val matcherFqn =

9
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/JUnitIgnoredTestInspection.kt
View File

@@ -3,7 +3,8 @@ package com.intellij.codeInspection.test.junit
import com.intellij.analysis.JvmAnalysisBundle
import com.intellij.codeInspection.*
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel
import com.intellij.codeInspection.options.OptPane.checkbox
import com.intellij.codeInspection.options.OptPane.pane
import com.intellij.codeInspection.util.InspectionMessage
import com.intellij.psi.PsiElementVisitor
import com.intellij.psi.PsiFile
@@ -14,15 +15,13 @@ import org.jetbrains.uast.UClass
import org.jetbrains.uast.UDeclaration
import org.jetbrains.uast.UMethod
import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor
import javax.swing.JComponent
class JUnitIgnoredTestInspection : AbstractBaseUastLocalInspectionTool() {
@JvmField
var onlyReportWithoutReason = true
override fun createOptionsPanel(): JComponent = SingleCheckboxOptionsPanel(
JvmAnalysisBundle.message("jvm.inspections.junit.ignored.test.ignore.reason.option"), this, "onlyReportWithoutReason"
)
override fun getOptionsPane() = pane(
checkbox("onlyReportWithoutReason", JvmAnalysisBundle.message("jvm.inspections.junit.ignored.test.ignore.reason.option")))
private fun shouldInspect(file: PsiFile) = isJUnit4InScope(file) || isJUnit5InScope(file)

11
platform/lang-impl/src/com/intellij/codeInspection/EmptyDirectoryInspection.java
View File

@@ -2,8 +2,8 @@
package com.intellij.codeInspection;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.reference.RefElement;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.lang.LangBundle;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.project.Project;
@@ -19,7 +19,8 @@ import com.intellij.psi.search.SearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class EmptyDirectoryInspection extends GlobalInspectionTool {
@@ -27,9 +28,9 @@ public class EmptyDirectoryInspection extends GlobalInspectionTool {
public boolean onlyReportDirectoriesUnderSourceRoots = false;
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(LangBundle.message("empty.directories.only.under.source.roots.option"), this,
"onlyReportDirectoriesUnderSourceRoots");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyReportDirectoriesUnderSourceRoots", LangBundle.message("empty.directories.only.under.source.roots.option")));
}
@Override

11
platform/lang-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
View File

@@ -1,14 +1,17 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInspection;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class RedundantSuppressInspection extends RedundantSuppressInspectionBase {
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.redundant.suppression.option", "@SuppressWarning(\"ALL\")"), this, "IGNORE_ALL");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("IGNORE_ALL", InspectionsBundle.message("inspection.redundant.suppression.option", "@SuppressWarning(\"ALL\")")));
}
}

8
platform/lang-impl/src/com/intellij/codeInspection/TodoCommentInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.intellij.codeInspection;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.ide.todo.TodoConfiguration;
import com.intellij.ide.todo.TodoIndexPatternProvider;
@@ -36,13 +37,16 @@ import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import static com.intellij.codeInspection.options.OptPane.*;
public class TodoCommentInspection extends LocalInspectionTool {
public boolean onlyWarnOnEmpty = true;
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(LangBundle.message("todo.comment.only.warn.on.empty.option"), this, "onlyWarnOnEmpty");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyWarnOnEmpty", LangBundle.message("todo.comment.only.warn.on.empty.option")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/BooleanParameterInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.abstraction;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.util.PropertyUtilBase;
import com.siyeh.InspectionGadgetsBundle;
@@ -24,9 +24,9 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.LibraryUtil;
import com.siyeh.ig.psiutils.MethodCallUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
/**
* @author Bas Leijdekkers
@@ -53,11 +53,10 @@ public class BooleanParameterInspection extends BaseInspection {
}
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message("boolean.parameter.only.report.multiple.option"), this, "onlyReportMultiple");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyReportMultiple", InspectionGadgetsBundle.message("boolean.parameter.only.report.multiple.option")));
}
@Override

24
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java
View File

@@ -16,7 +16,7 @@
package com.siyeh.ig.abstraction;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -26,13 +26,14 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.psiutils.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class DeclareCollectionAsInterfaceInspection extends BaseInspection {
/**
@@ -60,17 +61,12 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel =
new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(InspectionGadgetsBundle.message(
"collection.declared.by.class.ignore.locals.option"),
"ignoreLocalVariables");
optionsPanel.addCheckbox(InspectionGadgetsBundle.message(
"collection.declared.by.class.ignore.private.members.option"),
"ignorePrivateMethodsAndFields");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreLocalVariables", InspectionGadgetsBundle.message(
"collection.declared.by.class.ignore.locals.option")),
checkbox("ignorePrivateMethodsAndFields", InspectionGadgetsBundle.message(
"collection.declared.by.class.ignore.private.members.option")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.abstraction;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
@@ -26,7 +26,8 @@ import com.siyeh.ig.psiutils.ControlFlowUtils;
import com.siyeh.ig.psiutils.LibraryUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class InstanceofChainInspection extends BaseInspection {
@@ -50,9 +51,9 @@ public class InstanceofChainInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("ignore.instanceof.on.library.classes"), this,
"ignoreInstanceofOnLibraryClasses");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreInstanceofOnLibraryClasses", InspectionGadgetsBundle.message("ignore.instanceof.on.library.classes")));
}
@Override

18
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/MethodOnlyUsedFromInnerClassInspection.java
View File

@@ -2,7 +2,7 @@
package com.siyeh.ig.abstraction;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
@@ -14,9 +14,9 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.ClassUtils;
import com.siyeh.ig.psiutils.DeclarationSearchUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class MethodOnlyUsedFromInnerClassInspection extends BaseInspection {
@@ -42,13 +42,11 @@ public class MethodOnlyUsedFromInnerClassInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("method.only.used.from.inner.class.ignore.option"),
"ignoreMethodsAccessedFromAnonymousClass");
panel.addCheckbox(InspectionGadgetsBundle.message("only.report.static.methods"), "onlyReportStaticMethods");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreMethodsAccessedFromAnonymousClass",
InspectionGadgetsBundle.message("method.only.used.from.inner.class.ignore.option")),
checkbox("onlyReportStaticMethods", InspectionGadgetsBundle.message("only.report.static.methods")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.abstraction;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -32,6 +33,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class OverlyStrongTypeCastInspection extends BaseInspection {
@SuppressWarnings({"PublicField"})
@@ -46,10 +49,10 @@ public class OverlyStrongTypeCastInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("overly.strong.type.cast.ignore.in.matching.instanceof.option"),
this, "ignoreInMatchingInstanceof");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreInMatchingInstanceof",
InspectionGadgetsBundle.message("overly.strong.type.cast.ignore.in.matching.instanceof.option")));
}
@Override

26
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/UseOfConcreteClassInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.abstraction;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -34,6 +35,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class UseOfConcreteClassInspection extends BaseInspection {
private static final CallMatcher OBJECT_GET_CLASS =
CallMatcher.exactInstanceCall(CommonClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0);
@@ -58,18 +61,17 @@ public class UseOfConcreteClassInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
var panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.ignore.abstract"), "ignoreAbstractClasses");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.ignore.records"), "ignoreRecords");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.method.returns"), "reportMethodReturns");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.parameter"), "reportMethodParameters");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.local.variable"), "reportLocalVariables");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.static.fields"), "reportStaticFields");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.instance.fields"), "reportInstanceFields");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.instanceof"), "reportInstanceOf");
panel.addCheckbox(InspectionGadgetsBundle.message("use.of.concrete.class.option.report.cast"), "reportCast");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreAbstractClasses", InspectionGadgetsBundle.message("use.of.concrete.class.option.ignore.abstract")),
checkbox("ignoreRecords", InspectionGadgetsBundle.message("use.of.concrete.class.option.ignore.records")),
checkbox("reportMethodReturns", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.method.returns")),
checkbox("reportMethodParameters", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.parameter")),
checkbox("reportLocalVariables", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.local.variable")),
checkbox("reportStaticFields", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.static.fields")),
checkbox("reportInstanceFields", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.instance.fields")),
checkbox("reportInstanceOf", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.instanceof")),
checkbox("reportCast", InspectionGadgetsBundle.message("use.of.concrete.class.option.report.cast")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentToNullInspection.java
View File

@@ -17,7 +17,7 @@ package com.siyeh.ig.assignment;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.InspectionGadgetsBundle;
@@ -28,7 +28,8 @@ import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class AssignmentToNullInspection extends BaseInspection {
@@ -68,9 +69,10 @@ public class AssignmentToNullInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
"assignment.to.null.option"), this, "ignoreAssignmentsToFields");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreAssignmentsToFields", InspectionGadgetsBundle.message(
"assignment.to.null.option")));
}
@Override

19
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java
View File

@@ -18,6 +18,7 @@ package com.siyeh.ig.assignment;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.openapi.project.Project;
@@ -37,6 +38,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class ReplaceAssignmentWithOperatorAssignmentInspection extends BaseInspection implements CleanupLocalInspectionTool {
/**
@@ -66,16 +69,12 @@ public class ReplaceAssignmentWithOperatorAssignmentInspection extends BaseInspe
}
@Override
@Nullable
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(InspectionGadgetsBundle.message(
"assignment.replaceable.with.operator.assignment.ignore.conditional.operators.option"),
"ignoreLazyOperators");
optionsPanel.addCheckbox(InspectionGadgetsBundle.message(
"assignment.replaceable.with.operator.assignment.ignore.obscure.operators.option"),
"ignoreObscureOperators");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreLazyOperators", InspectionGadgetsBundle.message(
"assignment.replaceable.with.operator.assignment.ignore.conditional.operators.option")),
checkbox("ignoreObscureOperators", InspectionGadgetsBundle.message(
"assignment.replaceable.with.operator.assignment.ignore.obscure.operators.option")));
}
static String calculateReplacementExpression(PsiExpression lhs,

8
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.bitwise;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.lang.java.parser.ExpressionParser;
import com.intellij.openapi.project.Project;
@@ -35,6 +36,7 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
import static com.intellij.psi.JavaTokenType.*;
public class PointlessBitwiseExpressionInspection extends BaseInspection {
@@ -62,9 +64,9 @@ public class PointlessBitwiseExpressionInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("pointless.boolean.expression.ignore.option"),
this, "m_ignoreExpressionsContainingConstants");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreExpressionsContainingConstants", InspectionGadgetsBundle.message("pointless.boolean.expression.ignore.option")));
}
String calculateReplacementExpression(PsiExpression expression, CommentTracker ct) {

15
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsBetweenInconvertibleTypesInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.bugs;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.TypeConversionUtil;
@@ -27,21 +27,22 @@ import com.siyeh.ig.psiutils.InconvertibleTypesChecker.Convertible;
import com.siyeh.ig.psiutils.InconvertibleTypesChecker.TypeMismatch;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Objects;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class EqualsBetweenInconvertibleTypesInspection extends BaseInspection {
@SuppressWarnings("PublicField")
public boolean WARN_IF_NO_MUTUAL_SUBCLASS_FOUND = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("equals.between.inconvertible.types.mutual.subclass.option"),
this, "WARN_IF_NO_MUTUAL_SUBCLASS_FOUND");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("WARN_IF_NO_MUTUAL_SUBCLASS_FOUND",
InspectionGadgetsBundle.message("equals.between.inconvertible.types.mutual.subclass.option")));
}
@Override

16
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.bugs;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.psi.*;
@@ -41,6 +42,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Collection;
import static com.intellij.codeInspection.options.OptPane.*;
public class ObjectEqualityInspection extends BaseInspection {
/**
@@ -65,13 +68,12 @@ public class ObjectEqualityInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this);
optionsPanel.addCheckbox(InspectionGadgetsBundle.message("object.comparison.enumerated.ignore.option"), "m_ignoreEnums");
optionsPanel.addCheckbox(InspectionGadgetsBundle.message("object.comparison.klass.ignore.option"), "m_ignoreClassObjects");
optionsPanel.addCheckbox(InspectionGadgetsBundle.message(
"object.equality.ignore.between.objects.of.a.type.with.only.private.constructors.option"), "m_ignorePrivateConstructors");
return optionsPanel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreEnums", InspectionGadgetsBundle.message("object.comparison.enumerated.ignore.option")),
checkbox("m_ignoreClassObjects", InspectionGadgetsBundle.message("object.comparison.klass.ignore.option")),
checkbox("m_ignorePrivateConstructors", InspectionGadgetsBundle.message(
"object.equality.ignore.between.objects.of.a.type.with.only.private.constructors.option")));
}
@Override

17
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.bugs;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
@@ -34,21 +35,21 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class ObjectToStringInspection extends BaseInspection {
public boolean IGNORE_NONNLS = false;
public boolean IGNORE_EXCEPTION = false;
public boolean IGNORE_ASSERT = false;
public boolean IGNORE_TOSTRING = false;
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("inspection.option.ignore.nonnls"), "IGNORE_NONNLS");
panel.addCheckbox(InspectionGadgetsBundle.message("inspection.option.ignore.exceptions"), "IGNORE_EXCEPTION");
panel.addCheckbox(InspectionGadgetsBundle.message("inspection.option.ignore.assert"), "IGNORE_ASSERT");
panel.addCheckbox(InspectionGadgetsBundle.message("inspection.option.ignore.in.tostring"), "IGNORE_TOSTRING");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("IGNORE_NONNLS", InspectionGadgetsBundle.message("inspection.option.ignore.nonnls")),
checkbox("IGNORE_EXCEPTION", InspectionGadgetsBundle.message("inspection.option.ignore.exceptions")),
checkbox("IGNORE_ASSERT", InspectionGadgetsBundle.message("inspection.option.ignore.assert")),
checkbox("IGNORE_TOSTRING", InspectionGadgetsBundle.message("inspection.option.ignore.in.tostring")));
}
@Override

9
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationMissingWhitespaceInspection.java
View File

@@ -3,6 +3,7 @@
*/
package com.siyeh.ig.bugs;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
@@ -17,6 +18,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author Bas Leijdekkers
*/
@@ -32,9 +35,9 @@ public class StringConcatenationMissingWhitespaceInspection extends BaseInspecti
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("string.concatenation.missing.whitespace.option"),
this, "ignoreNonStringLiterals");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreNonStringLiterals", InspectionGadgetsBundle.message("string.concatenation.missing.whitespace.option")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java
View File

@@ -4,6 +4,7 @@ package com.siyeh.ig.bugs;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.dataFlow.CommonDataflow;
import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.project.Project;
@@ -25,6 +26,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class SuspiciousIntegerDivAssignmentInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -36,12 +39,10 @@ public class SuspiciousIntegerDivAssignmentInspection extends BaseInspection {
return InspectionGadgetsBundle.message("suspicious.integer.div.assignment.problem.descriptor");
}
@Nullable
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(JavaAnalysisBundle.message("inspection.suspicious.integer.div.assignment.option"), "myReportPossiblyExactDivision");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myReportPossiblyExactDivision", JavaAnalysisBundle.message("inspection.suspicious.integer.div.assignment.option")));
}
@Nullable

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java
View File

@@ -20,7 +20,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.intention.QuickFixFactory;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
@@ -33,11 +33,12 @@ import com.siyeh.ig.fixes.ChangeModifierFix;
import com.siyeh.ig.performance.ClassInitializerMayBeStaticInspection;
import com.siyeh.ig.psiutils.CommentTracker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Collection;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ClassInitializerInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -55,10 +56,10 @@ public class ClassInitializerInspection extends BaseInspection {
return InspectionGadgetsBundle.message("class.initializer.problem.descriptor");
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("class.initializer.option"), this, "onlyWarnWhenConstructor");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyWarnWhenConstructor", InspectionGadgetsBundle.message("class.initializer.option")));
}

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassMayBeInterfaceInspection.java
View File

@@ -19,7 +19,7 @@ import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature;
import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.WriteExternalException;
@@ -40,10 +40,12 @@ import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ClassMayBeInterfaceInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -55,11 +57,10 @@ public class ClassMayBeInterfaceInspection extends BaseInspection {
return InspectionGadgetsBundle.message("class.may.be.interface.problem.descriptor");
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("class.may.be.interface.java8.option"), this,
"reportClassesWithNonAbstractMethods");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("reportClassesWithNonAbstractMethods", InspectionGadgetsBundle.message("class.may.be.interface.java8.option")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java
View File

@@ -17,7 +17,7 @@ package com.siyeh.ig.classlayout;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
@@ -30,7 +30,8 @@ import com.siyeh.ig.psiutils.ControlFlowUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ListenerMayUseAdapterInspection extends BaseInspection {
@@ -48,9 +49,9 @@ public class ListenerMayUseAdapterInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("listener.may.use.adapter.emtpy.methods.option"), this,
"checkForEmptyMethods");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("checkForEmptyMethods", InspectionGadgetsBundle.message("listener.may.use.adapter.emtpy.methods.option")));
}
@Override

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/NonFinalFieldInEnumInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.classlayout;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiField;
@@ -30,6 +31,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author Bas Leijdekkers
*/
@@ -38,10 +41,9 @@ public class NonFinalFieldInEnumInspection extends BaseInspection {
public boolean onlyWarnWhenQuickFix = true;
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message("non.final.field.in.enum.quickfix.option"), this, "onlyWarnWhenQuickFix"
);
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyWarnWhenQuickFix", InspectionGadgetsBundle.message("non.final.field.in.enum.quickfix.option")));
}
@NotNull

9
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/StaticNonFinalFieldInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.classlayout;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiModifier;
@@ -28,6 +29,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class StaticNonFinalFieldInspection extends BaseInspection {
public boolean ignoreNonPublicFields = true;
@@ -46,10 +49,10 @@ public class StaticNonFinalFieldInspection extends BaseInspection {
return MakeFieldFinalFix.buildFix(field);
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("static.non.final.field.option"), this, "ignoreNonPublicFields");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreNonPublicFields", InspectionGadgetsBundle.message("static.non.final.field.option")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java
View File

@@ -16,7 +16,7 @@
package com.siyeh.ig.cloneable;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.PsiClass;
@@ -32,9 +32,9 @@ import com.siyeh.ig.psiutils.CloneUtils;
import com.siyeh.ig.psiutils.MethodUtils;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class CloneDeclaresCloneNotSupportedInspection extends BaseInspection {
@@ -57,11 +57,10 @@ public class CloneDeclaresCloneNotSupportedInspection extends BaseInspection {
return true;
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("only.warn.on.protected.clone.methods"),
this, "onlyWarnOnProtectedClone");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyWarnOnProtectedClone", InspectionGadgetsBundle.message("only.warn.on.protected.clone.methods")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneInNonCloneableClassInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.cloneable;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
@@ -30,9 +30,9 @@ import com.siyeh.ig.psiutils.CloneUtils;
import com.siyeh.ig.psiutils.ControlFlowUtils;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class CloneInNonCloneableClassInspection extends BaseInspection {
@@ -55,11 +55,10 @@ public class CloneInNonCloneableClassInspection extends BaseInspection {
}
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("only.warn.on.public.clone.methods"),
this, "onlyWarnOnPublicClone");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyWarnOnPublicClone", InspectionGadgetsBundle.message("only.warn.on.public.clone.methods")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java
View File

@@ -3,7 +3,7 @@ package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.siyeh.InspectionGadgetsBundle;
@@ -17,7 +17,8 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
/**
* @author Bas Leijdekkers
@@ -32,11 +33,10 @@ public class ConditionalCanBePushedInsideExpressionInspection extends BaseInspec
return InspectionGadgetsBundle.message("conditional.can.be.pushed.inside.expression.problem.descriptor");
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("conditional.can.be.pushed.inside.expression.option"),
this, "ignoreSingleArgument");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreSingleArgument", InspectionGadgetsBundle.message("conditional.can.be.pushed.inside.expression.option")));
}
@Nullable

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java
View File

@@ -17,7 +17,7 @@ package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -30,7 +30,8 @@ import org.intellij.lang.annotations.Pattern;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ConfusingElseInspection extends BaseInspection implements CleanupLocalInspectionTool {
@@ -51,8 +52,9 @@ public class ConfusingElseInspection extends BaseInspection implements CleanupLo
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("confusing.else.option"), this, "reportWhenNoStatementFollow");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("reportWhenNoStatementFollow", InspectionGadgetsBundle.message("confusing.else.option")));
}
@Override

14
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
@@ -29,11 +29,12 @@ import com.siyeh.ig.psiutils.EquivalenceChecker;
import com.siyeh.ig.psiutils.SideEffectChecker;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class DuplicateConditionInspection extends BaseInspection {
/**
@@ -51,10 +52,9 @@ public class DuplicateConditionInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("duplicate.condition.ignore.method.calls.option"),
this, "ignoreSideEffectConditions");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreSideEffectConditions", InspectionGadgetsBundle.message("duplicate.condition.ignore.method.calls.option")));
}
@Override

14
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java
View File

@@ -20,7 +20,7 @@ import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -37,9 +37,10 @@ import one.util.streamex.StreamEx;
import org.intellij.lang.annotations.Pattern;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.Collection;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.openapi.util.Predicates.nonNull;
public class ForLoopReplaceableByWhileInspection extends BaseInspection implements CleanupLocalInspectionTool {
@@ -64,11 +65,10 @@ public class ForLoopReplaceableByWhileInspection extends BaseInspection implemen
}
@Override
public JComponent createOptionsPanel() {
MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message(
"for.loop.replaceable.by.while.ignore.option"), "m_ignoreLoopsWithoutConditions");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreLoopsWithoutConditions", InspectionGadgetsBundle.message(
"for.loop.replaceable.by.while.ignore.option")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.siyeh.HardcodedMethodConstants;
import com.siyeh.InspectionGadgetsBundle;
@@ -25,9 +25,9 @@ import com.siyeh.ig.psiutils.MethodCallUtils;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ForLoopWithMissingComponentInspection extends BaseInspection {
@@ -68,10 +68,9 @@ public class ForLoopWithMissingComponentInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("for.loop.with.missing.component.collection.loop.option"),
this, "ignoreCollectionLoops");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreCollectionLoops", InspectionGadgetsBundle.message("for.loop.with.missing.component.collection.loop.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java
View File

@@ -17,7 +17,7 @@ package com.siyeh.ig.controlflow;
import com.intellij.codeInsight.BlockUtils;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.util.InspectionMessage;
import com.intellij.codeInspection.util.IntentionName;
import com.intellij.java.analysis.JavaAnalysisBundle;
@@ -33,10 +33,11 @@ import com.siyeh.ig.psiutils.*;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.*;
import javax.swing.*;
import java.util.*;
import java.util.function.Predicate;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
// Not really with identical branches, but also common parts
@@ -50,10 +51,11 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava
);
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("inspection.common.if.parts.settings.highlight.when.tail.call"), this, "myHighlightWhenLastStatementIsCall");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myHighlightWhenLastStatementIsCall",
JavaAnalysisBundle.message("inspection.common.if.parts.settings.highlight.when.tail.call")));
}
@NotNull

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.psi.*;
@@ -29,17 +29,17 @@ import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
import static com.intellij.util.ObjectUtils.tryCast;
public class InfiniteLoopStatementInspection extends BaseInspection {
public boolean myIgnoreInThreadTopLevel = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("inspection.infinite.loop.option"), this, "myIgnoreInThreadTopLevel");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("myIgnoreInThreadTopLevel", JavaAnalysisBundle.message("inspection.infinite.loop.option")));
}
@Override

14
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.SmartList;
@@ -27,9 +27,11 @@ import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection {
@SuppressWarnings({"PublicField"})
@@ -58,11 +60,9 @@ public class LoopConditionNotUpdatedInsideLoopInspection extends BaseInspection
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message("loop.variable.not.updated.inside.loop.option.nonlocal"),
this, "ignorePossibleNonLocalChanges");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignorePossibleNonLocalChanges", InspectionGadgetsBundle.message("loop.variable.not.updated.inside.loop.option.nonlocal")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
@@ -23,9 +23,9 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.ControlFlowUtils;
import org.intellij.lang.annotations.Pattern;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class LoopStatementsThatDontLoopInspection extends BaseInspection {
@@ -44,10 +44,10 @@ public class LoopStatementsThatDontLoopInspection extends BaseInspection {
return InspectionGadgetsBundle.message("loop.statements.that.dont.loop.problem.descriptor");
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("ignore.enhanced.for.loop.statements"), this, "ignoreForeach");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreForeach", InspectionGadgetsBundle.message("ignore.enhanced.for.loop.statements")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiConditionalExpression;
@@ -35,6 +36,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class NegatedConditionalInspection extends BaseInspection {
/**
@@ -67,11 +70,10 @@ public class NegatedConditionalInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("negated.if.else.ignore.negated.null.option"), "m_ignoreNegatedNullComparison");
panel.addCheckbox(InspectionGadgetsBundle.message("negated.if.else.ignore.negated.zero.option"), "m_ignoreNegatedZeroComparison");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreNegatedNullComparison", InspectionGadgetsBundle.message("negated.if.else.ignore.negated.null.option")),
checkbox("m_ignoreNegatedZeroComparison", InspectionGadgetsBundle.message("negated.if.else.ignore.negated.zero.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -33,6 +34,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class NegatedIfElseInspection extends BaseInspection {
@SuppressWarnings("PublicField") public boolean m_ignoreNegatedNullComparison = true;
@@ -57,11 +60,10 @@ public class NegatedIfElseInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("negated.if.else.ignore.negated.null.option"), "m_ignoreNegatedNullComparison");
panel.addCheckbox(InspectionGadgetsBundle.message("negated.if.else.ignore.negated.zero.option"), "m_ignoreNegatedZeroComparison");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreNegatedNullComparison", InspectionGadgetsBundle.message("negated.if.else.ignore.negated.null.option")),
checkbox("m_ignoreNegatedZeroComparison", InspectionGadgetsBundle.message("negated.if.else.ignore.negated.zero.option")));
}
@Override

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java
View File

@@ -20,6 +20,7 @@ import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.dataFlow.CommonDataflow;
import com.intellij.codeInspection.dataFlow.types.DfTypes;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -41,14 +42,15 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class SimplifiableEqualsExpressionInspection extends BaseInspection implements CleanupLocalInspectionTool {
public boolean REPORT_NON_CONSTANT = true;
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("simplifiable.equals.expression.option.non.constant"), this,
"REPORT_NON_CONSTANT");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("REPORT_NON_CONSTANT", InspectionGadgetsBundle.message("simplifiable.equals.expression.option.non.constant")));
}
@NotNull

8
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.util.FileTypeUtils;
@@ -28,6 +29,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class UnnecessaryContinueInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -45,8 +48,9 @@ public class UnnecessaryContinueInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("unnecessary.return.option"), this, "ignoreInThenBranch");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreInThenBranch", InspectionGadgetsBundle.message("unnecessary.return.option")));
}
@Override

9
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java
View File

@@ -21,6 +21,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingMode
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.dataFlow.fix.DeleteSwitchLabelFix;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -44,6 +45,7 @@ import java.util.Set;
import static com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel.PatternsInSwitchBlockHighlightingModel.CompletenessResult.COMPLETE_WITHOUT_TOTAL;
import static com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING;
import static com.intellij.codeInspection.ProblemHighlightType.INFORMATION;
import static com.intellij.codeInspection.options.OptPane.*;
public class UnnecessaryDefaultInspection extends BaseInspection {
@@ -56,11 +58,10 @@ public class UnnecessaryDefaultInspection extends BaseInspection {
"unnecessary.default.problem.descriptor");
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("unnecessary.default.expressions.option"),
this, "onlyReportSwitchExpressions");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyReportSwitchExpressions", InspectionGadgetsBundle.message("unnecessary.default.expressions.option")));
}
@Nullable

8
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryReturnInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.controlflow;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.*;
@@ -32,6 +33,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class UnnecessaryReturnInspection extends BaseInspection implements CleanupLocalInspectionTool {
@SuppressWarnings("PublicField")
public boolean ignoreInThenBranch = false;
@@ -59,8 +62,9 @@ public class UnnecessaryReturnInspection extends BaseInspection implements Clean
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("unnecessary.return.option"), this, "ignoreInThenBranch");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreInThenBranch", InspectionGadgetsBundle.message("unnecessary.return.option")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.siyeh.ig.dataflow;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.InspectionGadgetsBundle;
@@ -10,9 +10,9 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.DeclarationSearchUtils;
import com.siyeh.ig.psiutils.MethodUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class LawOfDemeterInspection extends BaseInspection {
@@ -29,10 +29,9 @@ public class LawOfDemeterInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("law.of.demeter.ignore.library.calls.option"), this,
"ignoreLibraryCalls");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreLibraryCalls", InspectionGadgetsBundle.message("law.of.demeter.ignore.library.calls.option")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java
View File

@@ -17,10 +17,9 @@ package com.siyeh.ig.dependency;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.reference.RefClass;
import com.intellij.codeInspection.reference.RefEntity;
import com.intellij.codeInspection.reference.RefPackage;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.RefEntityAlphabeticalComparator;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
@@ -30,20 +29,22 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.uast.UDeclarationKt;
import javax.swing.*;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class CyclicClassDependencyInspection extends BaseGlobalInspection {
public boolean ignoreInSameFile = false;
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("cyclic.class.dependency.ignore.in.same.file"),
this, "ignoreInSameFile");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreInSameFile", InspectionGadgetsBundle.message("cyclic.class.dependency.ignore.in.same.file")));
}
@Override

17
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.errorhandling;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
@@ -27,12 +27,13 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.HashSet;
import java.util.Set;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ExceptionFromCatchWhichDoesntWrapInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -54,12 +55,10 @@ public class ExceptionFromCatchWhichDoesntWrapInspection extends BaseInspection
}
@Override
@Nullable
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("exception.from.catch.which.doesntwrap.ignore.option"), "ignoreGetMessage");
panel.addCheckbox(InspectionGadgetsBundle.message("exception.from.catch.which.doesntwrap.ignore.cant.wrap.option"), "ignoreCantWrap");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreGetMessage", InspectionGadgetsBundle.message("exception.from.catch.which.doesntwrap.ignore.option")),
checkbox("ignoreCantWrap", InspectionGadgetsBundle.message("exception.from.catch.which.doesntwrap.ignore.cant.wrap.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThrowCaughtLocallyInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.errorhandling;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -27,6 +28,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class ThrowCaughtLocallyInspection extends BaseInspection {
/**
@@ -42,11 +45,10 @@ public class ThrowCaughtLocallyInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
"throw.caught.locally.ignore.option"), this,
"ignoreRethrownExceptions");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreRethrownExceptions", InspectionGadgetsBundle.message(
"throw.caught.locally.ignore.option")));
}
@Override

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.errorhandling;
import com.intellij.codeInsight.ExceptionUtil;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -31,6 +32,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
import static com.intellij.codeInspection.options.OptPane.*;
public class ThrowFromFinallyBlockInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -41,11 +44,10 @@ public class ThrowFromFinallyBlockInspection extends BaseInspection {
return true;
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("throw,from.finally.block.everywhere.option"),
this, "warnOnAllExceptions");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("warnOnAllExceptions", InspectionGadgetsBundle.message("throw,from.finally.block.everywhere.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/finalization/FinalizeInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.finalization;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.PsiMethod;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
@@ -23,7 +23,8 @@ import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.MethodUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class FinalizeInspection extends BaseInspection {
@@ -44,10 +45,9 @@ public class FinalizeInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message("ignore.trivial.finalizers.option"), this,
"ignoreTrivialFinalizers");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreTrivialFinalizers", InspectionGadgetsBundle.message("ignore.trivial.finalizers.option")));
}
@Override

15
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java
View File

@@ -19,7 +19,7 @@ import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -40,12 +40,14 @@ import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.psiutils.MethodUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class AbstractMethodOverridesAbstractMethodInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -63,11 +65,10 @@ public class AbstractMethodOverridesAbstractMethodInspection extends BaseInspect
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message(
"abstract.method.overrides.abstract.method.ignore.different.javadoc.option"), "ignoreJavaDoc");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreJavaDoc", InspectionGadgetsBundle.message(
"abstract.method.overrides.abstract.method.ignore.different.javadoc.option")));
}
private static class AbstractMethodOverridesAbstractMethodFix extends InspectionGadgetsFix {

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ExtendsUtilityClassInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.inheritance;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiModifier;
import com.siyeh.InspectionGadgetsBundle;
@@ -23,9 +23,9 @@ import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.UtilityClassUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ExtendsUtilityClassInspection extends BaseInspection {
@@ -40,11 +40,10 @@ public class ExtendsUtilityClassInspection extends BaseInspection {
return InspectionGadgetsBundle.message("class.extends.utility.class.problem.descriptor", superClassName);
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("class.extends.utility.class.ignore.utility.class.option"),
this, "ignoreUtilityClasses");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreUtilityClasses", InspectionGadgetsBundle.message("class.extends.utility.class.ignore.utility.class.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/NonProtectedConstructorInAbstractClassInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.inheritance;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
@@ -29,6 +30,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class NonProtectedConstructorInAbstractClassInspection extends BaseInspection implements CleanupLocalInspectionTool {
/**
@@ -50,11 +53,10 @@ public class NonProtectedConstructorInAbstractClassInspection extends BaseInspec
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message(
"non.protected.constructor.in.abstract.class.ignore.option"),
this, "m_ignoreNonPublicClasses");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreNonPublicClasses", InspectionGadgetsBundle.message(
"non.protected.constructor.in.abstract.class.ignore.option")));
}
@Override

9
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java
View File

@@ -2,6 +2,7 @@
package com.siyeh.ig.inheritance;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -23,6 +24,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class RedundantMethodOverrideInspection extends BaseInspection {
public boolean checkLibraryMethods = false;
@@ -37,9 +40,9 @@ public class RedundantMethodOverrideInspection extends BaseInspection {
}
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("redundant.method.override.option.check.library.methods"),
this, "checkLibraryMethods");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("checkLibraryMethods", InspectionGadgetsBundle.message("redundant.method.override.option.check.library.methods")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java
View File

@@ -18,7 +18,7 @@ package com.siyeh.ig.initialization;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInsight.TestFrameworks;
import com.intellij.codeInsight.daemon.ImplicitUsageProvider;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
@@ -29,7 +29,8 @@ import com.siyeh.ig.psiutils.ClassUtils;
import com.siyeh.ig.psiutils.InitializationUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class InstanceVariableInitializationInspection extends BaseInspection {
@@ -57,10 +58,9 @@ public class InstanceVariableInitializationInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message("primitive.fields.ignore.option"),
this, "m_ignorePrimitives");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignorePrimitives", InspectionGadgetsBundle.message("primitive.fields.ignore.option")));
}
@Override

8
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/StaticVariableInitializationInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.initialization;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.*;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.siyeh.InspectionGadgetsBundle;
@@ -28,6 +29,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class StaticVariableInitializationInspection extends BaseInspection {
/**
@@ -48,8 +51,9 @@ public class StaticVariableInitializationInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("primitive.fields.ignore.option"), this, "m_ignorePrimitives");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignorePrimitives", InspectionGadgetsBundle.message("primitive.fields.ignore.option")));
}
@Override

9
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/StaticVariableUninitializedUseInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.initialization;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.siyeh.InspectionGadgetsBundle;
@@ -27,6 +28,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.Arrays;
import static com.intellij.codeInspection.options.OptPane.*;
public class StaticVariableUninitializedUseInspection extends BaseInspection {
/**
@@ -48,9 +51,9 @@ public class StaticVariableUninitializedUseInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("primitive.fields.ignore.option"),
this, "m_ignorePrimitives");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignorePrimitives", InspectionGadgetsBundle.message("primitive.fields.ignore.option")));
}
@Override

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.j2me;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -34,6 +35,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class MultiplyOrDivideByPowerOfTwoInspection
extends BaseInspection {
@@ -43,9 +46,10 @@ public class MultiplyOrDivideByPowerOfTwoInspection
public boolean checkDivision = false;
@Override
public @Nullable JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
"multiply.or.divide.by.power.of.two.divide.option"), this, "checkDivision");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("checkDivision", InspectionGadgetsBundle.message(
"multiply.or.divide.by.power.of.two.divide.option")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java
View File

@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.javabeans;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
@@ -26,7 +26,8 @@ import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class ClassWithoutNoArgConstructorInspection extends BaseInspection {
@@ -36,9 +37,9 @@ public class ClassWithoutNoArgConstructorInspection extends BaseInspection {
public boolean m_ignoreClassesWithNoConstructors = true;
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("class.without.no.arg.constructor.ignore.option"),
this, "m_ignoreClassesWithNoConstructors");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreClassesWithNoConstructors", InspectionGadgetsBundle.message("class.without.no.arg.constructor.ignore.option")));
}
@Override

9
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.javabeans;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.psi.PsiClass;
@@ -31,6 +32,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author Bas Leijdekkers
*/
@@ -47,10 +50,10 @@ public class SuspiciousGetterSetterInspection extends BaseInspection {
: InspectionGadgetsBundle.message("suspicious.getter.problem.descriptor", infos[1]);
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(JavaAnalysisBundle.message("inspection.suspicious.getter.setter.field.option"), this, "onlyWarnWhenFieldPresent");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyWarnWhenFieldPresent", JavaAnalysisBundle.message("inspection.suspicious.getter.setter.field.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/MissingDeprecatedAnnotationInspection.java
View File

@@ -18,7 +18,7 @@ package com.siyeh.ig.javadoc;
import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.text.StringUtil;
@@ -38,7 +38,8 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
final class MissingDeprecatedAnnotationInspection extends BaseInspection implements CleanupLocalInspectionTool {
@SuppressWarnings("PublicField") public boolean warnOnMissingJavadoc = false;
@@ -52,11 +53,10 @@ final class MissingDeprecatedAnnotationInspection extends BaseInspection impleme
: InspectionGadgetsBundle.message("missing.deprecated.tag.problem.descriptor");
}
@NotNull
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("missing.deprecated.tag.option"),
this, "warnOnMissingJavadoc");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("warnOnMissingJavadoc", InspectionGadgetsBundle.message("missing.deprecated.tag.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java
View File

@@ -17,6 +17,7 @@ package com.siyeh.ig.javadoc;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
@@ -36,6 +37,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class UnnecessaryJavaDocLinkInspection extends BaseInspection implements CleanupLocalInspectionTool {
private static final int THIS_METHOD = 1;
@@ -62,11 +65,10 @@ public class UnnecessaryJavaDocLinkInspection extends BaseInspection implements
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(
InspectionGadgetsBundle.message(
"unnecessary.javadoc.link.option"),
this, "ignoreInlineLinkToSuper");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreInlineLinkToSuper", InspectionGadgetsBundle.message(
"unnecessary.javadoc.link.option")));
}
@Override

19
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java
View File

@@ -16,7 +16,7 @@
package com.siyeh.ig.jdk;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
@@ -26,15 +26,19 @@ import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.PsiReplacementUtil;
import com.siyeh.ig.psiutils.*;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.MethodCallUtils;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.HashMap;
import java.util.Map;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
public class AutoBoxingInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -65,10 +69,9 @@ public class AutoBoxingInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("auto.boxing.ignore.added.to.collection.option"), this,
"ignoreAddedToCollection");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreAddedToCollection", InspectionGadgetsBundle.message("auto.boxing.ignore.added.to.collection.option")));
}
@Override

13
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ObsoleteCollectionInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.maturity;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
@@ -33,6 +34,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class ObsoleteCollectionInspection extends BaseInspection {
private static final int MAX_OCCURRENCES = 20;
@@ -53,11 +56,11 @@ public class ObsoleteCollectionInspection extends BaseInspection {
}
@Override
@Nullable
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
"use.obsolete.collection.type.ignore.library.arguments.option"
), this, "ignoreRequiredObsoleteCollectionTypes");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreRequiredObsoleteCollectionTypes", InspectionGadgetsBundle.message(
"use.obsolete.collection.type.ignore.library.arguments.option"
)));
}
@Override

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/ReturnOfInnerClassInspection.java
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.siyeh.ig.memory;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -13,6 +14,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
/**
* @author Bas Leijdekkers
*/
@@ -32,11 +35,10 @@ public class ReturnOfInnerClassInspection extends BaseInspection {
};
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("return.of.inner.class.ignore.non.public.option"),
this, "ignoreNonPublic");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("ignoreNonPublic", InspectionGadgetsBundle.message("return.of.inner.class.ignore.non.public.option")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/StaticCollectionInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.memory;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiModifier;
@@ -27,6 +28,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class StaticCollectionInspection extends BaseInspection {
/**
@@ -42,10 +45,10 @@ public class StaticCollectionInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
"static.collection.ignore.option"),
this, "m_ignoreWeakCollections");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreWeakCollections", InspectionGadgetsBundle.message(
"static.collection.ignore.option")));
}
@Override

12
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/methodmetrics/ThreeNegationsPerMethodInspection.java
View File

@@ -15,6 +15,7 @@
*/
package com.siyeh.ig.methodmetrics;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.psi.PsiMethod;
import com.siyeh.InspectionGadgetsBundle;
@@ -25,6 +26,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class ThreeNegationsPerMethodInspection extends BaseInspection {
/**
@@ -42,11 +45,10 @@ public class ThreeNegationsPerMethodInspection extends BaseInspection {
}
@Override
public JComponent createOptionsPanel() {
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("three.negations.per.method.ignore.option"), "m_ignoreInEquals");
panel.addCheckbox(InspectionGadgetsBundle.message("three.negations.per.method.ignore.assert.option"), "ignoreInAssert");
return panel;
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("m_ignoreInEquals", InspectionGadgetsBundle.message("three.negations.per.method.ignore.option")),
checkbox("ignoreInAssert", InspectionGadgetsBundle.message("three.negations.per.method.ignore.assert.option")));
}
@Override

11
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java
View File

@@ -5,7 +5,7 @@ import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
@@ -24,7 +24,8 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.checkbox;
import static com.intellij.codeInspection.options.OptPane.pane;
/**
* @author Bas Leijdekkers
@@ -34,10 +35,10 @@ public class EqualsReplaceableByObjectsCallInspection extends BaseInspection imp
private static final EquivalenceChecker EQUIVALENCE = new NoSideEffectExpressionEquivalenceChecker();
@NotNull
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("equals.replaceable.by.objects.check.not.null.option"), this, "checkNotNull");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("checkNotNull", InspectionGadgetsBundle.message("equals.replaceable.by.objects.check.not.null.option")));
}
@NotNull

10
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java
View File

@@ -17,6 +17,7 @@ package com.siyeh.ig.migration;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.openapi.project.Project;
@@ -38,6 +39,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import static com.intellij.codeInspection.options.OptPane.*;
public class UnnecessaryBoxingInspection extends BaseInspection {
@SuppressWarnings("PublicField")
@@ -48,11 +51,10 @@ public class UnnecessaryBoxingInspection extends BaseInspection {
return true;
}
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("unnecessary.boxing.superfluous.option"),
this, "onlyReportSuperfluouslyBoxed");
public @NotNull OptPane getOptionsPane() {
return pane(
checkbox("onlyReportSuperfluouslyBoxed", InspectionGadgetsBundle.message("unnecessary.boxing.superfluous.option")));
}
@Override

Some files were not shown because too many files have changed in this diff Show More