Merge branch '2.1.0-develop' into issue-297

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/SettingsForm.java

@@ -33,8 +33,11 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings({
+        "PMD.TooManyFields",
+        "PMD.TooManyMethods"
+})
 public class SettingsForm implements PhpFrameworkConfigurable {
-
     private final Project project;
     private JCheckBox pluginEnabled;
     private JButton buttonReindex;
@@ -77,13 +80,13 @@ public void mouseClicked(final MouseEvent event) {
                 }
         );
 
-        buttonReindex.setEnabled(getSettings().pluginEnabled);
-        regenerateUrnMapButton.setEnabled(getSettings().pluginEnabled);
-
         regenerateUrnMapButton.addMouseListener(
                 new RegenerateUrnMapListener(project)
         );
 
+        refreshFormStatus(getSettings().pluginEnabled);
+        pluginEnabled.addActionListener(e -> refreshFormStatus(pluginEnabled.isSelected()));
+
         moduleDefaultLicenseName.setText(getSettings().defaultLicense);
         mftfSupportEnabled.setSelected(getSettings().mftfSupportEnabled);
         magentoPath.getTextField().setText(getSettings().magentoPath);
@@ -95,6 +98,15 @@ public void mouseClicked(final MouseEvent event) {
         return (JComponent) panel;
     }
 
+    private void refreshFormStatus(final boolean isEnabled) {
+        buttonReindex.setEnabled(isEnabled);
+        regenerateUrnMapButton.setEnabled(isEnabled);
+        magentoVersion.setEnabled(isEnabled);
+        mftfSupportEnabled.setEnabled(isEnabled);
+        magentoPath.setEnabled(isEnabled);
+        moduleDefaultLicenseName.setEnabled(isEnabled);
+    }
+
     protected void reindex() {
         IndexManager.manualReindex();
         MagentoComponentManager.getInstance(project).flushModules();

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