1016: Code refactoring

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/actions/generation/data/ModuleReadmeMdData.java

@@ -6,46 +6,40 @@
 package com.magento.idea.magento2plugin.actions.generation.data;
 
 import com.intellij.psi.PsiDirectory;
+import org.jetbrains.annotations.NotNull;
 
 public class ModuleReadmeMdData {
+
     private final String packageName;
     private final String moduleName;
     private final PsiDirectory baseDir;
-    private final boolean createModuleDirs;
 
     /**
      * Constructor.
      *
      * @param packageName String
      * @param moduleName String
      * @param baseDir PsiDirectory
-     * @param createModuleDirs boolean
      */
     public ModuleReadmeMdData(
-            final String packageName,
-            final String moduleName,
-            final PsiDirectory baseDir,
-            final boolean createModuleDirs
+            final @NotNull String packageName,
+            final @NotNull String moduleName,
+            final @NotNull PsiDirectory baseDir
     ) {
         this.packageName = packageName;
         this.moduleName = moduleName;
         this.baseDir = baseDir;
-        this.createModuleDirs = createModuleDirs;
-    }
-
-    public String getPackageName() {
-        return this.packageName;
     }
 
-    public String getModuleName() {
-        return this.moduleName;
+    public @NotNull String getPackageName() {
+        return packageName;
     }
 
-    public PsiDirectory getBaseDir() {
-        return this.baseDir;
+    public @NotNull String getModuleName() {
+        return moduleName;
     }
 
-    public boolean hasCreateModuleDirs() {
-        return this.createModuleDirs;
+    public @NotNull PsiDirectory getBaseDir() {
+        return baseDir;
     }
 }

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

@@ -6,7 +6,7 @@
       <xy x="48" y="54" width="746" height="642"/>
     </constraints>
     <properties>
-      <preferredSize width="450" height="591"/>
+      <preferredSize width="455" height="600"/>
     </properties>
     <border type="none"/>
     <children>

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

@@ -241,8 +241,7 @@ private void generateReadmeMd() {
         new ModuleReadmeMdGenerator(new ModuleReadmeMdData(
                 getPackageName(),
                 getModuleName(),
-                getBaseDir(),
-                true
+                getBaseDir()
         ), project).generate(NewModuleAction.actionName);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleReadmeMdGenerator.java

@@ -6,17 +6,18 @@
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleReadmeMdData;
-import com.magento.idea.magento2plugin.actions.generation.generator.data.ModuleDirectoriesData;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.magento.files.ModuleReadmeMd;
-import com.magento.idea.magento2plugin.magento.files.RegistrationPhp;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class ModuleReadmeMdGenerator extends FileGenerator {
+
     private final ModuleReadmeMdData moduleReadmeMdData;
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
     private final DirectoryGenerator directoryGenerator;
@@ -41,28 +42,21 @@ public ModuleReadmeMdGenerator(
      * Generate file.
      *
      * @param actionName String
+     *
      * @return PsiFile
      */
     @Override
     public PsiFile generate(final String actionName) {
-        if (moduleReadmeMdData.hasCreateModuleDirs()) {
-            final ModuleDirectoriesData moduleDirectoriesData = directoryGenerator
-                    .createOrFindModuleDirectories(
-                            moduleReadmeMdData.getPackageName(),
-                            moduleReadmeMdData.getModuleName(),
-                            moduleReadmeMdData.getBaseDir()
-                    );
-            return fileFromTemplateGenerator.generate(
-                    ModuleReadmeMd.getInstance(),
-                    getAttributes(),
-                    moduleDirectoriesData.getModuleDirectory(),
-                    actionName
-            );
+        final PsiDirectory moduleDir = resolveModuleRoot(moduleReadmeMdData);
+
+        if (moduleDir == null) {
+            return null;
         }
+
         return fileFromTemplateGenerator.generate(
-                RegistrationPhp.getInstance(),
+                ModuleReadmeMd.getInstance(),
                 getAttributes(),
-                moduleReadmeMdData.getBaseDir(),
+                moduleDir,
                 actionName
         );
     }
@@ -77,4 +71,10 @@ protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("PACKAGE", moduleReadmeMdData.getPackageName());
         attributes.setProperty("MODULE_NAME", moduleReadmeMdData.getModuleName());
     }
+
+    private @Nullable PsiDirectory resolveModuleRoot(final @NotNull ModuleReadmeMdData data) {
+        final PsiDirectory packageDir = data.getBaseDir().findSubdirectory(data.getPackageName());
+
+        return packageDir != null ? packageDir.findSubdirectory(data.getModuleName()) : null;
+    }
 }

src/com/magento/idea/magento2plugin/magento/files/ModuleReadmeMd.java

@@ -9,6 +9,7 @@
 import com.intellij.lang.html.HTMLLanguage;
 
 public class ModuleReadmeMd implements ModuleFileInterface {
+
     public static final String FILE_NAME = "README.md";
     public static final String TEMPLATE = "Magento Module Readme File MD";
     private static final ModuleReadmeMd INSTANCE = new ModuleReadmeMd();
@@ -35,6 +36,3 @@ public Language getLanguage() {
         return HTMLLanguage.INSTANCE;
     }
 }
-
-
-