Merge pull request #317 from drpayyne/bug/disabled-validator

Fixed validator when plugin is disabled

Author: Vitaliy

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">

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")
+                );
+            }
         }
     }
-}
+}