64: static fixes 3

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java

@@ -48,7 +48,7 @@ public OverrideInThemeDialog(final @NotNull Project project, final PsiFile psiFi
 
         this.project = project;
         this.psiFile = psiFile;
-        this.validator = OverrideInThemeDialogValidator.getInstance(this);
+        this.validator = new OverrideInThemeDialogValidator(this);
 
         setContentPane(contentPane);
         setModal(true);

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/OverrideInThemeDialogValidator.java

@@ -2,53 +2,68 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator;
 
 import com.intellij.openapi.project.Project;
 import com.magento.idea.magento2plugin.actions.generation.dialog.OverrideInThemeDialog;
 import com.magento.idea.magento2plugin.bundles.CommonBundle;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
-
-import javax.swing.*;
 import java.util.List;
+import javax.swing.JOptionPane;
 
 public class OverrideInThemeDialogValidator {
-    private static OverrideInThemeDialogValidator INSTANCE = null;
     private final ValidatorBundle validatorBundle;
     private final CommonBundle commonBundle;
-    private OverrideInThemeDialog dialog;
-
-    public static OverrideInThemeDialogValidator getInstance(OverrideInThemeDialog dialog) {
-        if (null == INSTANCE) {
-            INSTANCE = new OverrideInThemeDialogValidator();
-        }
-
-        INSTANCE.dialog = dialog;
-        return INSTANCE;
-    }
+    private final OverrideInThemeDialog dialog;
 
-    public OverrideInThemeDialogValidator() {
+    /**
+     * Constructor.
+     *
+     * @param dialog OverrideInThemeDialog
+     */
+    public OverrideInThemeDialogValidator(final OverrideInThemeDialog dialog) {
+        this.dialog = dialog;
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
     }
 
-    public boolean validate(Project project)
-    {
-        String errorTitle = commonBundle.message("common.error");
+    /**
+     * Validate dialog.
+     *
+     * @param project Project
+     * @return boolean
+     */
+    public boolean validate(final Project project) {
+        final String errorTitle = commonBundle.message("common.error");
 
-        String theme = dialog.getTheme();
+        final String theme = dialog.getTheme();
         if (theme.length() == 0) {
-            String errorMessage = validatorBundle.message("validator.notEmpty", "Target Theme");
-            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
+            final String errorMessage = validatorBundle.message(
+                    "validator.notEmpty",
+                    "Target Theme"
+            );
+            JOptionPane.showMessageDialog(
+                    null,
+                    errorMessage,
+                    errorTitle,
+                    JOptionPane.ERROR_MESSAGE
+            );
 
             return false;
         }
 
-        List<String> allThemesList = ModuleIndex.getInstance(project).getEditableThemeNames();
+        final List<String> allThemesList = ModuleIndex.getInstance(project).getEditableThemeNames();
         if (!allThemesList.contains(theme)) {
-            String errorMessage = validatorBundle.message("validator.module.noSuchModule", theme);
-            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
+            final String errorMessage = validatorBundle
+                    .message("validator.module.noSuchModule", theme);
+            JOptionPane.showMessageDialog(
+                    null,
+                    errorMessage,
+                    errorTitle,
+                    JOptionPane.ERROR_MESSAGE
+            );
 
             return false;
         }

src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java

@@ -42,8 +42,9 @@ public OverrideInThemeGenerator(final Project project) {
      * @param themeName String
      */
     public void execute(final PsiFile baseFile, final String themeName) {
-        final String componentType = GetComponentTypeByNameUtil.execute(GetComponentNameByDirectoryUtil
-                .execute(baseFile.getContainingDirectory(), project));
+        final String componentType = GetComponentTypeByNameUtil.execute(
+                GetComponentNameByDirectoryUtil
+                    .execute(baseFile.getContainingDirectory(), project));
 
         List<String> pathComponents;
         if (componentType.equals(ComponentType.module.toString())) {