Skip to content

Commit 65a9262

Browse files
author
Vitaliy Boyko
committed
Code review fixes
1 parent bfa0d10 commit 65a9262

11 files changed

+17
-21
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* RequireJS mapping support (reference navigation, completion)
77
* Plugin class methods generation
88
* Plugin declaration inspection in the scope of a Plugin Class
9-
* MFTF support (reference navigation, completion)
9+
* MFTF support MVP (reference navigation, completion)
1010
* Fixed support of 2020.* versions of IDE's
1111
* Create a New Magento 2 Module action
1212
* Code Inspection: Duplicated Observer Usage in events XML

‎src/com/magento/idea/magento2plugin/actions/generation/data/ModuleComposerJsonData.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public List<String> getModuleDependencies() {
7272
return moduleDependencies;
7373
}
7474

75-
public boolean getCreateModuleDirs() { return this.createModuleDirs; }
76-
75+
public boolean getCreateModuleDirs() {
76+
return this.createModuleDirs;
77+
}
7778
}

‎src/com/magento/idea/magento2plugin/actions/generation/data/ModuleRegistrationPhpData.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@ public PsiDirectory getBaseDir() {
3636
return this.baseDir;
3737
}
3838

39-
public boolean getCreateModuleDirs() { return this.createModuleDirs; }
39+
public boolean getCreateModuleDirs() {
40+
return this.createModuleDirs;
41+
}
4042
}

‎src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@ public PsiDirectory getBaseDir() {
3636
return this.baseDir;
3737
}
3838

39-
public boolean getCreateModuleDirs() { return this.createModuleDirs; }
39+
public boolean getCreateModuleDirs() {
40+
return this.createModuleDirs;
41+
}
4042
}

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

-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.intellij.openapi.project.Project;
1010
import com.intellij.psi.PsiDirectory;
1111
import com.intellij.psi.PsiFile;
12-
import com.intellij.util.indexing.FileBasedIndex;
1312
import com.magento.idea.magento2plugin.actions.generation.NewModuleAction;
1413
import com.magento.idea.magento2plugin.actions.generation.data.ModuleComposerJsonData;
1514
import com.magento.idea.magento2plugin.actions.generation.data.ModuleRegistrationPhpData;
@@ -24,16 +23,13 @@
2423
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
2524
import com.magento.idea.magento2plugin.magento.packages.Package;
2625
import com.magento.idea.magento2plugin.project.Settings;
27-
import com.magento.idea.magento2plugin.stubs.indexes.ModuleNameIndex;
2826
import com.magento.idea.magento2plugin.util.CamelCaseToHyphen;
2927
import org.jetbrains.annotations.NotNull;
3028
import org.jetbrains.annotations.Nullable;
3129
import javax.swing.*;
3230
import javax.swing.event.ListSelectionEvent;
3331
import javax.swing.event.ListSelectionListener;
3432
import java.awt.event.*;
35-
import java.util.ArrayList;
36-
import java.util.Collection;
3733
import java.util.List;
3834
import java.util.Vector;
3935

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ public PsiFile generate(String actionName) {
4545
if (moduleComposerJsonData.getCreateModuleDirs()) {
4646
ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleComposerJsonData.getPackageName(), moduleComposerJsonData.getModuleName(), moduleComposerJsonData.getBaseDir());
4747
return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);
48-
} else {
49-
return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleComposerJsonData.getBaseDir(), actionName);
5048
}
49+
return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleComposerJsonData.getBaseDir(), actionName);
5150
}
5251

5352
protected void fillAttributes(Properties attributes) {

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ public PsiFile generate(String actionName) {
3131
if (moduleRegistrationPhpData.getCreateModuleDirs()) {
3232
ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleRegistrationPhpData.getPackageName(), moduleRegistrationPhpData.getModuleName(), moduleRegistrationPhpData.getBaseDir());
3333
return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);
34-
} else {
35-
return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);
3634
}
35+
return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);
3736
}
3837

3938
protected void fillAttributes(Properties attributes) {

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ public PsiFile generate(String actionName) {
3434
if (moduleXmlData.getCreateModuleDirs()) {
3535
ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleXmlData.getPackageName(), moduleXmlData.getModuleName(), moduleXmlData.getBaseDir());
3636
return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), moduleDirectoriesData.getModuleEtcDirectory(), actionName);
37-
} else {
38-
PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);
39-
return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);
4037
}
38+
PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);
39+
return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);
4140
}
4241

4342
protected void fillAttributes(Properties attributes) {

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

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.jetbrains.annotations.Nls;
2929
import org.jetbrains.annotations.NotNull;
3030
import org.jetbrains.annotations.Nullable;
31-
3231
import java.util.ArrayList;
3332

3433
public class MagentoModuleGenerator extends WebProjectTemplate<MagentoProjectGeneratorSettings> {

‎src/com/magento/idea/magento2plugin/generation/MagentoProjectGeneratorSettings.java

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package com.magento.idea.magento2plugin.generation;
66

77
import com.magento.idea.magento2plugin.project.Settings;
8-
98
import java.util.List;
109

1110
public class MagentoProjectGeneratorSettings {

‎src/com/magento/idea/magento2plugin/init/ConfigurationManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
8787
ContentEntry[] entries = contentEntries;
8888
int length = contentEntries.length;
8989

90-
for(int i = 0; i < length; ++i) {
90+
for (int i = 0; i < length; ++i) {
9191
ContentEntry entry = entries[i];
9292
VirtualFile entryFile = entry.getFile();
9393
if (entryFile != null && VfsUtilCore.isAncestor(entryFile, project.getBaseDir(), false)) {
@@ -215,7 +215,7 @@ private static boolean isFileInsideModule(@NotNull VirtualFile magentoFile, @Not
215215
VirtualFile[] roots = contentRoots;
216216
int length = contentRoots.length;
217217

218-
for(int i = 0; i < length; ++i) {
218+
for (int i = 0; i < length; ++i) {
219219
VirtualFile root = roots[i];
220220
if (VfsUtilCore.isAncestor(root, magentoFile, false)) {
221221
return true;
@@ -237,7 +237,7 @@ public static void notifyGlobally(@Nullable Project project, String title, Strin
237237
Function[] functions = actions;
238238
int length = actions.length;
239239

240-
for(int i = 0; i < length; ++i) {
240+
for (int i = 0; i < length; ++i) {
241241
Function<Notification, AnAction> generator = functions[i];
242242
notification.addAction(generator.apply(notification));
243243
}

0 commit comments

Comments
 (0)