[#267]_update style code

Author: iamdylanngo

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

@@ -73,7 +73,7 @@ public class NewModuleDialog extends AbstractDialog implements ListSelectionList
     private JLabel moduleDescriptionLabel;//NOPMD
     private JLabel moduleNameLabel;//NOPMD
 
-    private static final String MAGENTO_OLD_VERSION = "2.2.11";
+    private static final String MAGENTO_BEFORE_DECLARATIVE_SCHEMA_VERSION = "2.2.11";
 
     /**
      * Constructor.
@@ -238,22 +238,20 @@ public String getModuleVersion() {
     }
 
     /**
-     * get Module Version.
+     * Get module version.
      *
      * @return string|null
      */
     public String getSetupVersion() {
-        String setupVersion = null;
         final String magentoVersion = getMagentoVersion();
-
-        if (!MagentoVersion.compareMagentoVersion(magentoVersion, MAGENTO_OLD_VERSION)) {
-            setupVersion = this.moduleVersion.getText().trim();
+        if (!MagentoVersion.compare(magentoVersion, MAGENTO_BEFORE_DECLARATIVE_SCHEMA_VERSION)) {
+            return this.moduleVersion.getText().trim();
         }
-        return setupVersion;
+        return null;
     }
 
     /**
-     * get Magento Version.
+     * Get magento version.
      *
      * @return string
      */
@@ -362,7 +360,7 @@ public void valueChanged(final ListSelectionEvent listSelectionEvent) {
     }
 
     /**
-     * get setting.
+     * Get settings.
      *
      * @return Settings
      */

src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java

@@ -64,7 +64,7 @@ public boolean isPrimaryGenerator() {
     }
 
     /**
-     * generateProject.
+     * Generate project.
      *
      * @param project Project
      * @param baseDir Base directory
@@ -102,7 +102,7 @@ public void generateProject(
     }
 
     /**
-     * generateComposerJson.
+     * Generate composer json.
      *
      * @param project Project
      * @param baseDir Base directory
@@ -128,7 +128,8 @@ private PsiFile generateComposerJson(
     }
 
     /**
-     * generateRegistrationPhp.
+     * Generate registration php.
+     *
      * @param project Project
      * @param baseDir Base directory
      * @param settings Settings
@@ -148,7 +149,7 @@ private PsiFile generateRegistrationPhp(
     }
 
     /**
-     * generateModuleXml.
+     * Generate module xml.
      *
      * @param project Project
      * @param baseDir Base directory

src/com/magento/idea/magento2plugin/util/magento/MagentoVersion.java

@@ -72,20 +72,23 @@ private static String getFilePath(final String magentoPath) {
     }
 
     /**
-     * compare Magento Version.
+     * Compare two magento version.
      *
-     * @param str1 String
-     * @param str2 String
-     * @return boolean
+     * @param version1 String
+     * @param version2 String
+     * @return the value {@code true} if the argument version1 is greater than equal to version2;
+     *         the value {@code false} if the argument version1 is less than to version2.
      */
-    public static boolean compareMagentoVersion(final String str1, final String str2) {
-        if (str1.equals(str2)) return true;
+    public static boolean compare(final String version1, final String version2) {
+        if (version1.equals(version2)) {
+            return true;
+        }
 
-        final String[] str1s = str1.split("\\.");
-        final String[] str2s = str2.split("\\.");
+        final String[] version1s = version1.split("\\.");
+        final String[] version2s = version2.split("\\.");
         for (int i = 0; i < 2; i++) {
-            final Integer value1 = Integer.parseInt(str1s[i]);
-            final Integer value2 = Integer.parseInt(str2s[i]);
+            final int value1 = Integer.parseInt(version1s[i]);
+            final int value2 = Integer.parseInt(version2s[i]);
             if (value1 > value2) {
                 return true;
             }