Additional changes after branch updating

bohdan-harniuk · bohdan-harniuk · commit 58f5762fe742 · 2021-03-31T15:55:39.000+03:00
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGenerator.java
@@ -110,7 +110,7 @@ public PsiFile generate(final @NotNull String actionName) {
      * @return PhpClass
      */
     private PhpClass createModel(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(data.getModuleName());
         final PsiDirectory dataModelDirectory = directoryGenerator.findOrCreateSubdirectories(
                 parentDirectory,
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGenerator.java
@@ -107,7 +107,7 @@ public PsiFile generate(final String actionName) {
      * @return PhpClass
      */
     private PhpClass createInterface(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(data.getModuleName());
         final PsiDirectory dtoInterfaceDirectory = directoryGenerator
                 .findOrCreateSubdirectories(parentDirectory, DataModelInterfaceFile.DIRECTORY);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityByIdCommandGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityByIdCommandGenerator.java
@@ -63,9 +63,9 @@ public DeleteEntityByIdCommandGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         file = new DeleteEntityByIdCommandFile(data.getEntityName());
     }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java
@@ -37,8 +37,8 @@ public DeleteEntityControllerFileGenerator(
     ) {
         super(project);
         this.data = data;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        moduleIndex = new ModuleIndex(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         file = new DeleteActionFile(data.getEntityName());
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/EditEntityActionGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/EditEntityActionGenerator.java
@@ -62,8 +62,8 @@ public EditEntityActionGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        moduleIndex = new ModuleIndex(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         file = new EditActionFile(data.getEntityName());
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java
@@ -64,9 +64,9 @@ public EntityDataMapperGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new EntityDataMapperFile(data.getEntityName());
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/FormGenericButtonBlockGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/FormGenericButtonBlockGenerator.java
@@ -63,9 +63,9 @@ public FormGenericButtonBlockGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         file = new FormGenericButtonBlockFile();
     }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/GetListQueryModelGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/GetListQueryModelGenerator.java
@@ -63,9 +63,9 @@ public GetListQueryModelGenerator(
         this.project = project;
         this.data = data;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         file = new GetListQueryFile(data.getEntityName());
     }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/GridActionColumnFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/GridActionColumnFileGenerator.java
@@ -65,9 +65,9 @@ public GridActionColumnFileGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new GridActionColumnFile();
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         uses = new ArrayList<>();
         classNamespaceBuilder = new NamespaceBuilder(
                 data.getModuleName(),
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/IndexActionGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/IndexActionGenerator.java
@@ -63,9 +63,9 @@ public IndexActionGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new IndexActionFile(data.getEntityName());
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityControllerFileGenerator.java
@@ -42,8 +42,8 @@ public NewActionEntityControllerFileGenerator(
     ) {
         super(project);
         this.fileData = fileData;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        moduleIndex = new ModuleIndex(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         uses = new ArrayList<>();
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/NewEntityLayoutGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/NewEntityLayoutGenerator.java
@@ -59,9 +59,9 @@ public NewEntityLayoutGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new NewEntityLayoutFile(data.getNewActionPath().replace(File.separator, "_"));
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PhpFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PhpFileGenerator.java
@@ -43,9 +43,9 @@ public PhpFileGenerator(
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java
@@ -51,7 +51,7 @@ public QueryGenerator(
         super(project);
         this.data = data;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
@@ -115,7 +115,7 @@ public PsiFile generate(final @NotNull String actionName) {
      * @return PhpClass
      */
     private PhpClass createDataProviderClass(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(this.moduleName);
         final PsiDirectory dataProviderDirectory =
                 directoryGenerator.findOrCreateSubdirectories(parentDirectory, data.getPath());
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java
@@ -65,8 +65,8 @@ public SaveEntityControllerFileGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        moduleIndex = new ModuleIndex(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         file = new SaveActionFile(data.getEntityName());
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java
@@ -55,7 +55,7 @@ public UiComponentDataProviderGenerator(
         super(project);
         this.data = data;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
@@ -126,7 +126,7 @@ public PsiFile generate(final @NotNull String actionName) {
      * @return PhpClass
      */
     private PhpClass createDataProviderClass(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(this.moduleName);
         final PsiDirectory fileDirectory =
                 directoryGenerator.findOrCreateSubdirectories(parentDirectory, data.getPath());
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonBlockGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonBlockGenerator.java
@@ -93,9 +93,9 @@ public UiComponentFormButtonBlockGenerator(
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         this.entityName = entityName;
         this.entityIdField = entityIdField;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         uses = new ArrayList<>();
     }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java
@@ -94,10 +94,10 @@ protected PsiFile createForm(
     ) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
         final String moduleName = data.getModuleName();
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
 
         final ArrayList<String> fileDirectories = new ArrayList<>();
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGenerator.java
@@ -55,8 +55,8 @@ public UiComponentGridXmlGenerator(
 
         this.data = data;
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         getCodeTemplateUtil = new GetCodeTemplateUtil(project);
     }
 
