Merge pull request #180 from coderimus/fix/improve-new-module-form-and-creation-process

Improvement: module name must not be equal to the package name.

Author: Vitaliy

resources/fileTemplates/internal/Magento Module Composer.json.ft

@@ -21,4 +21,4 @@
       "${PACKAGE}\\\\${MODULE_NAME}\\": ""
     }
   }
-}
+}

resources/magento2/common.properties

@@ -0,0 +1,8 @@
+common.package.name=Package Name
+common.module.name=Module Name
+common.module.version=Module Version
+common.module.license=Module's license(s)
+common.module.dependencies=Module Dependencies
+common.module.description=Module Description
+common.ok=OK
+common.cancel=Cancel

resources/magento2/inspection.properties

@@ -1,2 +1,2 @@
 inspection.plugin.duplicateInSameFile=The plugin name already used in this file. For more details see Inspection Description.
-inspection.plugin.duplicateInOtherPlaces=The plugin name "{0}" for targeted "{1}" class is already used in the module "{2}" ({3} scope). For more details see Inspection Description.
+inspection.plugin.duplicateInOtherPlaces=The plugin name "{0}" for targeted "{1}" class is already used in the module "{2}" ({3} scope). For more details see Inspection Description.

resources/magento2/validation.properties

@@ -13,3 +13,5 @@ validator.magentoVersionInvalid=Please specify valid Magento version or use 'any
 validator.class.targetClassNotFound=Target class is not found. Check the di.xml file
 validator.cronSchedule.invalidExpression={0} has invalid cron schedule expression (e.g. * * * * *)
 validator.configPath.invalidFormat={0} has invalid config path format (e.g. section/group/field)
+validator.moduleNameIsTheSameAsPackage=Module name must be different from the package name
+validator.mustNotBeEmptyShouldContainLettersOrNumbers=Must not be empty, should contain letters or numbers

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.form

@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="462" height="496"/>
+      <xy x="48" y="54" width="746" height="596"/>
     </constraints>
     <properties>
       <preferredSize width="450" height="591"/>
@@ -36,15 +36,15 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="OK"/>
+                  <text resource-bundle="magento2/common" key="common.ok"/>
                 </properties>
               </component>
               <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
                 <constraints>
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Cancel"/>
+                  <text resource-bundle="magento2/common" key="common.cancel"/>
                 </properties>
               </component>
             </children>
@@ -56,7 +56,9 @@
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <toolTipText value=""/>
+        </properties>
         <border type="none"/>
         <children>
           <component id="ad3ba" class="javax.swing.JTextField" binding="packageName" default-binding="true">
@@ -65,7 +67,10 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <text value=""/>
+              <toolTipText resource-bundle="magento2/validation" key="validator.mustNotBeEmptyShouldContainLettersOrNumbers"/>
+            </properties>
             <clientProperties>
               <html.disable class="java.lang.Boolean" value="true"/>
             </clientProperties>
@@ -75,7 +80,9 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Package Name"/>
+              <text resource-bundle="magento2/common" key="common.package.name"/>
+              <toolTipText value=""/>
+              <verifyInputWhenFocusTarget value="false"/>
             </properties>
           </component>
           <component id="e4858" class="javax.swing.JTextField" binding="moduleName">
@@ -84,7 +91,10 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <text value=""/>
+              <toolTipText resource-bundle="magento2/validation" key="validator.mustNotBeEmptyShouldContainLettersOrNumbers"/>
+            </properties>
             <clientProperties>
               <html.disable class="java.lang.Boolean" value="true"/>
             </clientProperties>
@@ -94,7 +104,8 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Module Name"/>
+              <text resource-bundle="magento2/common" key="common.module.name"/>
+              <toolTipText value=""/>
             </properties>
           </component>
           <component id="423dc" class="javax.swing.JTextField" binding="moduleVersion">
@@ -115,15 +126,17 @@
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Module Version"/>
+              <text resource-bundle="magento2/common" key="common.module.version"/>
+              <toolTipText value=""/>
             </properties>
           </component>
           <component id="c5925" class="javax.swing.JLabel" binding="moduleLicenseLabel">
             <constraints>
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="License(s)"/>
+              <text resource-bundle="magento2/common" key="common.module.license"/>
+              <toolTipText value=""/>
             </properties>
           </component>
           <component id="26905" class="javax.swing.JTextField" binding="moduleLicenseCustom">
@@ -154,7 +167,7 @@
                 <constraints/>
                 <properties>
                   <model/>
-                  <toolTipText value="Module's Lincese"/>
+                  <toolTipText value=""/>
                 </properties>
               </component>
             </children>
@@ -164,7 +177,8 @@
               <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Module Dependencies"/>
+              <text resource-bundle="magento2/common" key="common.module.dependencies"/>
+              <toolTipText value=""/>
             </properties>
           </component>
           <scrollpane id="90d78" binding="moduleDependenciesScrollPanel">
@@ -195,7 +209,7 @@
         </constraints>
         <properties>
           <text value="N/A"/>
-          <toolTipText value="Module Description"/>
+          <toolTipText value=""/>
         </properties>
         <clientProperties>
           <html.disable class="java.lang.Boolean" value="true"/>
@@ -206,9 +220,13 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Module Description"/>
+          <text resource-bundle="magento2/common" key="common.module.description"/>
+          <toolTipText value=""/>
         </properties>
       </component>
     </children>
   </grid>
+  <inspectionSuppressions>
+    <suppress inspection="I18nForm" id="bda0f"/>
+  </inspectionSuppressions>
 </form>

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

@@ -66,6 +66,13 @@ public boolean validate()
             return false;
         }
 
+        if (moduleName.equals(packageName)) {
+            String errorMessage = validatorBundle.message("validator.moduleNameIsTheSameAsPackage", "Module Name");
+            JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);
+
+            return false;
+        }
+
         if (!Character.isUpperCase(moduleName.charAt(0)) && !Character.isDigit(moduleName.charAt(0))) {
             String errorMessage = validatorBundle.message("validator.startWithNumberOrCapitalLetter", "Module Name");
             JOptionPane.showMessageDialog(null, errorMessage, errorTitle, JOptionPane.ERROR_MESSAGE);