2880: Remove unused Swing imports and simplify dialog classes

Unused Swing-related imports (e.g., JButton, KeyEvent) and redundant code were removed across multiple dialog classes, improving code readability and maintainability. Additionally, some fields were marked as final where applicable and PMD suppressions were updated for better clarity.

Author: VitaliyBoyko

check_modified.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Get the list of modified files
+MODIFIED_FILES=$(git diff --name-only HEAD | grep -E '\.java$' | sed 's/^/"/;s/$/"/' | tr '\n' ',' | sed 's/,$//')
+MODIFIED_FILES="[$MODIFIED_FILES]"
+
+# Export the environment variable
+export MODIFIED_FILES
+
+# Run the checkstyle and PMD tasks
+./gradlew checkstyleCI pmdCI

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java

@@ -24,17 +24,13 @@
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/GatherArrayValuesDialog.java

@@ -40,8 +40,6 @@ public class GatherArrayValuesDialog extends AbstractDialog {
     private final DiArrayValueData arrayValueData;
 
     private JPanel contentPane;
-    private JButton buttonCancel;
-    private JButton buttonOK;
     private JPanel itemsPane;// NOPMD
     private JScrollPane itemsScrollPane;// NOPMD
     private JTable itemsTable;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.java

@@ -24,18 +24,13 @@
 import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.Locale;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,8 +43,6 @@ public class NewCLICommandDialog extends AbstractDialog {
     private static final String COMMAND_DESCRIPTION = "description";
 
     private JPanel contentPane;
-    private JButton buttonCancel;
-    private JButton buttonOK;
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, CLASS_NAME})

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewCategoryEavAttributeDialog.java

@@ -47,20 +47,26 @@
 import javax.swing.JTextField;
 import org.jetbrains.annotations.Nullable;
 
+/**
+ * This class handles the creation and configuration of Category EAV attributes.
+ * Note: This class is flagged as a "God Class" by PMD due to its complexity.
+ * A proper refactoring into smaller, more focused classes would be a better long-term solution.
+ */
 @SuppressWarnings({
         "PMD.TooManyFields",
         "PMD.ExcessiveImports",
         "PMD.TooManyMethods",
-        "PMD.UnusedPrivateField"
+        "PMD.UnusedPrivateField",
+        "PMD.GodClass"
 })
 public class NewCategoryEavAttributeDialog extends AbstractDialog {
 
     private static final String ENTITY_NAME = "Category";
-    private String moduleName;
-    private Project project;
-    private String actionName;
+    private final String moduleName;
+    private final Project project;
+    private final String actionName;
     private TableGroupWrapper entityPropertiesTableGroupWrapper;
-    private SourceModelData sourceModelData;
+    private final SourceModelData sourceModelData;
 
     private JPanel contentPanel;
     private JButton buttonOK;
@@ -171,6 +177,7 @@ protected void initDialogState() {
     /**
      * Fill attribute type combo box.
      */
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     protected void fillAttributeTypeComboBox() {
         if (typeComboBox == null) {
             return;
@@ -186,6 +193,7 @@ protected void fillAttributeTypeComboBox() {
     /**
      * Fill attribute input combo box.
      */
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     protected void fillAttributeInputComboBox() {
         if (inputComboBox == null) {
             return;
@@ -542,12 +550,16 @@ protected void generateExtraFilesBeforeDataPatchGeneration() {
 
     /**
      * Generate extra files after data patch generation.
+     * This is a hook method for subclasses to override and generate additional files.
+     * The base implementation does nothing.
      *
      * @param eavEntityDataInterface EavEntityDataInterface
      */
     protected void generateExtraFilesAfterDataPatchGeneration(
             final EavEntityDataInterface eavEntityDataInterface
-    ) {}
+    ) {
+        // No additional files to generate in the base implementation
+    }
 
     /**
      * Create center panel.

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java

@@ -23,20 +23,14 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings({
@@ -49,8 +43,6 @@ public class NewControllerDialog extends AbstractDialog {
     private final String moduleName;
     private final Project project;
     private JPanel contentPane;
-    private JButton buttonOK;
-    private JButton buttonCancel;
     private FilteredComboBox controllerAreaSelect;
     private FilteredComboBox httpMethodSelect;
     private JCheckBox inheritClass;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.java

@@ -22,12 +22,9 @@
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java

@@ -54,12 +54,9 @@
 import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
 import com.magento.idea.magento2plugin.util.magento.GetAclResourcesListUtil;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -358,25 +355,6 @@ private void initPropertiesTable() {
         entityPropertiesTableGroupWrapper.initTableGroup();
     }
 
-    /**
-     * Generate new entity files.
-     *
-     * @param event ActionEvent
-     */
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void generateNewEntityFiles(final @NotNull ActionEvent event) {
-        if (!onOkActionFired.isInProgress()) {
-            if (propertyTable.isEditing()) {
-                propertyTable.getCellEditor().stopCellEditing();
-            }
-
-            new ProcessWorker(
-                    this::onOK,
-                    this::releaseDialogAfterGeneration,
-                    onOkActionFired
-            ).execute();
-        }
-    }
 
     /**
      * Perform code generation using input data.
@@ -417,14 +395,6 @@ protected boolean validateFormFields() {
         return true;
     }
 
-    /**
-     * Release dialog buttons and hide.
-     */
-    private void releaseDialogAfterGeneration() {
-        if (onOkActionFired.isFinished()) {
-            exit();
-        }
-    }
 
     /**
      * Get entity creator context data.

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java

@@ -32,11 +32,8 @@
 import com.magento.idea.magento2plugin.util.magento.MagentoVersionUtil;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.List;
 import java.util.Vector;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewObserverDialog.java

@@ -34,22 +34,16 @@
 import com.magento.idea.magento2plugin.stubs.indexes.EventNameIndex;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import javax.swing.event.DocumentEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -69,8 +63,6 @@ public class NewObserverDialog extends AbstractDialog {
     private final String moduleName;
     private final String modulePackage;
     private JPanel contentPanel;
-    private JButton buttonOK;
-    private JButton buttonCancel;
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, OBSERVER_NAME})

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentGridDialog.java

@@ -55,14 +55,11 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import com.magento.idea.magento2plugin.util.magento.GetResourceCollections;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java

@@ -29,10 +29,7 @@
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.List;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideLayoutInThemeDialog.java

@@ -19,17 +19,12 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.List;
-import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideTemplateInThemeDialog.java

@@ -19,17 +19,11 @@
 import com.magento.idea.magento2plugin.magento.packages.OverridableFileType;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.List;
-import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 
 public class OverrideTemplateInThemeDialog extends AbstractDialog {
@@ -39,8 +33,6 @@ public class OverrideTemplateInThemeDialog extends AbstractDialog {
     private final @NotNull Project project;
     private final PsiFile psiFile;
     private JPanel contentPane;
-    private JButton buttonOK;
-    private JButton buttonCancel;
     private JLabel selectTheme; //NOPMD
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,

src/main/java/com/magento/idea/magento2uct/ui/ConfigurationDialog.java

@@ -24,8 +24,6 @@
 import com.magento.idea.magento2uct.util.module.UctModulePathValidatorUtil;
 import java.awt.Color;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.Objects;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;

src/main/java/com/magento/idea/magento2uct/ui/ReindexDialog.java

@@ -16,8 +16,6 @@
 import com.magento.idea.magento2uct.packages.IndexRegistry;
 import com.magento.idea.magento2uct.packages.SupportedVersion;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;