From d279f00233fdfd955b635b529ea155bc4a81d4e2 Mon Sep 17 00:00:00 2001
From: Adarsh Manickam <amanickam@ztech.io>
Date: Tue, 20 Oct 2020 20:54:37 +0530
Subject: [PATCH 1/2] Fixed validator when plugin is disabled

---
 .../magento2plugin/project/SettingsForm.form  |  2 +-
 .../validator/SettingsFormValidator.java      | 44 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/com/magento/idea/magento2plugin/project/SettingsForm.form b/src/com/magento/idea/magento2plugin/project/SettingsForm.form
index 024974e2f..727f0deeb 100644
--- a/src/com/magento/idea/magento2plugin/project/SettingsForm.form
+++ b/src/com/magento/idea/magento2plugin/project/SettingsForm.form
@@ -80,7 +80,7 @@
             </constraints>
             <properties>
               <horizontalAlignment value="0"/>
-              <text value="Regenerate URN mappings:"/>
+              <text value="Regenerate URN mappings"/>
             </properties>
           </component>
           <component id="aad3b" class="javax.swing.JTextField" binding="magentoVersion">
diff --git a/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java b/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java
index 1caa3b396..86b60b91c 100644
--- a/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java
+++ b/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java
@@ -24,33 +24,31 @@ public SettingsFormValidator(
     }
 
     /**
-     * Validate form.
+     * Validates form if plugin is enabled
      *
      * @throws ConfigurationException Exception
      */
     public void validate() throws ConfigurationException {
-        if (!form.getSettings().pluginEnabled) {
-            return;
-        }
-
-        if (!MagentoBasePathUtil.isMagentoFolderValid(form.getMagentoPath())) {
-            throw new ConfigurationException(
-                    validatorBundle.message("validator.package.validPath")
-            );
-        }
-
-        final String magentoVersion = form.getMagentoVersion();
-        if (magentoVersion.length() == 0) {
-            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 (form.isBeingUsed()) {
+            if (!MagentoBasePathUtil.isMagentoFolderValid(form.getMagentoPath())) {
+                throw new ConfigurationException(
+                        validatorBundle.message("validator.package.validPath")
+                );
+            }
+
+            final String magentoVersion = form.getMagentoVersion();
+            if (magentoVersion.length() == 0) {
+                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")
+                );
+            }
         }
     }
 }
\ No newline at end of file

From 855f359ef936dbd93c4e11e80c66ca53be6ac193 Mon Sep 17 00:00:00 2001
From: Adarsh Manickam <amanickam@ztech.io>
Date: Tue, 20 Oct 2020 21:07:33 +0530
Subject: [PATCH 2/2] Added newline to EOF

---
 .../project/validator/SettingsFormValidator.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java b/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java
index 86b60b91c..6c59ad314 100644
--- a/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java
+++ b/src/com/magento/idea/magento2plugin/project/validator/SettingsFormValidator.java
@@ -24,7 +24,7 @@ public SettingsFormValidator(
     }
 
     /**
-     * Validates form if plugin is enabled
+     * Validates form if plugin is enabled.
      *
      * @throws ConfigurationException Exception
      */
@@ -51,4 +51,4 @@ public void validate() throws ConfigurationException {
             }
         }
     }
-}
\ No newline at end of file
+}