267: static fixes

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/project/SettingsForm.java

@@ -44,7 +44,7 @@ public class SettingsForm implements PhpFrameworkConfigurable {
     private JTextField moduleDefaultLicenseName;
     private JCheckBox mftfSupportEnabled;
     private TextFieldWithBrowseButton magentoPath;
-    private final SettingsFormValidator validator = SettingsFormValidator.getInstance(this);
+    private final SettingsFormValidator validator = new SettingsFormValidator(this);
     private JLabel magentoVersionLabel;//NOPMD
     private JLabel magentoPathLabel;//NOPMD
 

src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java

@@ -1,49 +1,56 @@
-/**
+/*
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.project.validator;
 
 import com.intellij.openapi.options.ConfigurationException;
-import com.magento.idea.magento2plugin.util.magento.MagentoVersionUtil;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.project.SettingsForm;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.util.magento.MagentoBasePathUtil;
+import com.magento.idea.magento2plugin.util.magento.MagentoVersionUtil;
 
 public class SettingsFormValidator {
-    private static SettingsFormValidator INSTANCE = null;
-    private SettingsForm form;
-    private ValidatorBundle validatorBundle;
-
-    public static SettingsFormValidator getInstance(SettingsForm form) {
-        if (null == INSTANCE) {
-            INSTANCE = new SettingsFormValidator();
-        }
-        INSTANCE.form = form;
-        return INSTANCE;
-    }
+    private final SettingsForm form;
+    private final ValidatorBundle validatorBundle;
 
-    public SettingsFormValidator() {
+    public SettingsFormValidator(
+            final SettingsForm form
+    ) {
+        this.form = form;
         this.validatorBundle = new ValidatorBundle();
     }
 
+    /**
+     * Validate form.
+     *
+     * @throws ConfigurationException
+     */
     public void validate() throws ConfigurationException {
         if (!form.getSettings().pluginEnabled) {
             return;
         }
 
         if (!MagentoBasePathUtil.isMagentoFolderValid(form.getMagentoPath())) {
-            throw new ConfigurationException(validatorBundle.message("validator.package.validPath"));
+            throw new ConfigurationException(
+                    validatorBundle.message("validator.package.validPath")
+            );
         }
 
-        String magentoVersion = form.getMagentoVersion();
+        final String magentoVersion = form.getMagentoVersion();
         if (magentoVersion.length() == 0) {
-            throw new ConfigurationException(validatorBundle.message("validator.notEmpty", "Magento Version"));
+            throw new ConfigurationException(
+                    validatorBundle.message("validator.notEmpty", "Magento Version")
+            );
         }
 
-        if (!magentoVersion.matches(RegExUtil.MAGENTO_VERSION) && !magentoVersion.equals(MagentoVersionUtil.DEFAULT_VERSION)) {
-            throw new ConfigurationException(validatorBundle.message("validator.magentoVersionInvalid"));
+        if (!magentoVersion.matches(RegExUtil.MAGENTO_VERSION) &&
+                !magentoVersion.equals(MagentoVersionUtil.DEFAULT_VERSION)) {
+            throw new ConfigurationException(
+                    validatorBundle.message("validator.magentoVersionInvalid")
+            );
         }
     }
 }