From f01a64f460581c2164a29a3d77842cf39258b83c Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 13 Dec 2022 11:36:11 +0100 Subject: [PATCH] [java-inspections] ClassMetrics: Convert to OptPane GitOrigin-RevId: 3aea9dc2e7cb741f4abf495e28977570dcd51f1a --- .../classmetrics/ClassCouplingInspection.java | 23 +++++-------- .../ig/classmetrics/FieldCountInspection.java | 33 +++++-------------- .../classmetrics/MethodCountInspection.java | 21 +++++------- 3 files changed, 25 insertions(+), 52 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java index d38f08e97571..021683da3900 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/ClassCouplingInspection.java @@ -15,13 +15,13 @@ */ package com.siyeh.ig.classmetrics; -import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; +import com.intellij.codeInspection.options.OptPane; import com.intellij.psi.PsiClass; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import org.jetbrains.annotations.NotNull; -import javax.swing.*; +import static com.intellij.codeInspection.options.OptPane.*; public class ClassCouplingInspection extends ClassMetricInspection { @@ -62,19 +62,12 @@ public class ClassCouplingInspection } @Override - public JComponent createOptionsPanel() { - final String configurationLabel = getConfigurationLabel(); - final JLabel label = new JLabel(configurationLabel); - final JFormattedTextField valueField = prepareNumberEditor("m_limit"); - - final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this); - panel.addRow(label, valueField); - - panel.addCheckbox(InspectionGadgetsBundle.message( - "include.java.system.classes.option"), "m_includeJavaClasses"); - panel.addCheckbox(InspectionGadgetsBundle.message( - "include.library.classes.option"), "m_includeLibraryClasses"); - return panel; + public @NotNull OptPane getOptionsPane() { + return pane( + number("m_limit", getConfigurationLabel(), 1, 1000), + checkbox("m_includeJavaClasses", InspectionGadgetsBundle.message("include.java.system.classes.option")), + checkbox("m_includeLibraryClasses", InspectionGadgetsBundle.message("include.library.classes.option")) + ); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/FieldCountInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/FieldCountInspection.java index 577428cfe3cb..fd70206a1961 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/FieldCountInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/FieldCountInspection.java @@ -15,18 +15,17 @@ */ package com.siyeh.ig.classmetrics; -import com.intellij.codeInspection.ui.InspectionOptionsPanel; +import com.intellij.codeInspection.options.OptPane; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiEnumConstant; import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; -import com.intellij.util.ui.CheckBox; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ClassUtils; import org.jetbrains.annotations.NotNull; -import javax.swing.*; +import static com.intellij.codeInspection.options.OptPane.*; public class FieldCountInspection extends ClassMetricInspection { @@ -64,27 +63,13 @@ public class FieldCountInspection extends ClassMetricInspection { } @Override - public JComponent createOptionsPanel() { - final String configurationLabel = getConfigurationLabel(); - final JLabel label = new JLabel(configurationLabel); - final JFormattedTextField valueField = prepareNumberEditor("m_limit"); - - final CheckBox includeCheckBox = - new CheckBox(InspectionGadgetsBundle.message("field.count.inspection.include.constant.fields.in.count.checkbox"), - this, "m_countConstantFields"); - final CheckBox considerCheckBox = - new CheckBox(InspectionGadgetsBundle.message("field.count.inspection.static.final.fields.count.as.constant.checkbox"), - this, "m_considerStaticFinalFieldsConstant"); - final CheckBox enumConstantCheckBox = - new CheckBox(InspectionGadgetsBundle.message("field.count.inspection.include.enum.constants.in.count"), - this, "myCountEnumConstants"); - - final InspectionOptionsPanel panel = new InspectionOptionsPanel(); - panel.addRow(label, valueField); - panel.add(includeCheckBox); - panel.add(considerCheckBox); - panel.add(enumConstantCheckBox); - return panel; + public @NotNull OptPane getOptionsPane() { + return pane( + number("m_limit", getConfigurationLabel(), 1, 1000), + checkbox("m_countConstantFields", InspectionGadgetsBundle.message("field.count.inspection.include.constant.fields.in.count.checkbox")), + checkbox("m_considerStaticFinalFieldsConstant", InspectionGadgetsBundle.message("field.count.inspection.static.final.fields.count.as.constant.checkbox")), + checkbox("myCountEnumConstants", InspectionGadgetsBundle.message("field.count.inspection.include.enum.constants.in.count")) + ); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/MethodCountInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/MethodCountInspection.java index 8a3d8388ce37..7be57b5ca9ec 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/MethodCountInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classmetrics/MethodCountInspection.java @@ -15,7 +15,7 @@ */ package com.siyeh.ig.classmetrics; -import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; +import com.intellij.codeInspection.options.OptPane; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PropertyUtil; @@ -25,8 +25,7 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.MethodUtils; import org.jetbrains.annotations.NotNull; -import javax.swing.*; -import java.awt.*; +import static com.intellij.codeInspection.options.OptPane.*; public class MethodCountInspection extends BaseInspection { @@ -48,16 +47,12 @@ public class MethodCountInspection extends BaseInspection { } @Override - public JComponent createOptionsPanel() { - final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this); - final Component label = new JLabel(InspectionGadgetsBundle.message("method.count.limit.option")); - final JFormattedTextField valueField = prepareNumberEditor("m_limit"); - - panel.addRow(label, valueField); - panel.addCheckbox(InspectionGadgetsBundle.message("method.count.ignore.getters.setters.option"), "ignoreGettersAndSetters"); - panel.addCheckbox(InspectionGadgetsBundle.message("ignore.methods.overriding.super.method"), "ignoreOverridingMethods"); - - return panel; + public @NotNull OptPane getOptionsPane() { + return pane( + number("m_limit", InspectionGadgetsBundle.message("method.count.limit.option"), 1, 1000), + checkbox("ignoreGettersAndSetters", InspectionGadgetsBundle.message("method.count.ignore.getters.setters.option")), + checkbox("ignoreOverridingMethods", InspectionGadgetsBundle.message("ignore.methods.overriding.super.method")) + ); }