Skip to content

Commit 385bb4d

Browse files
committed
[#267]_static fixes
1 parent 52e188e commit 385bb4d

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class ModuleXmlData {
1111
private final String packageName;
1212
private final String moduleName;
1313
private final String moduleVersion;
14-
private PsiDirectory baseDir;
15-
private boolean createModuleDirs;
14+
private final PsiDirectory baseDir;
15+
private final boolean createModuleDirs;
1616

1717
/**
1818
* Constructor ModuleXmlData.
@@ -24,11 +24,11 @@ public class ModuleXmlData {
2424
* @param createModuleDirs Create module Dirs
2525
*/
2626
public ModuleXmlData(
27-
String packageName,
28-
String moduleName,
29-
String moduleVersion,
30-
PsiDirectory baseDir,
31-
boolean createModuleDirs
27+
final String packageName,
28+
final String moduleName,
29+
final String moduleVersion,
30+
final PsiDirectory baseDir,
31+
final boolean createModuleDirs
3232
) {
3333
this.packageName = packageName;
3434
this.moduleName = moduleName;

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

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,30 @@
3535
public class MagentoModuleGenerator extends WebProjectTemplate<MagentoProjectGeneratorSettings> {
3636
public static String ACTION_NAME = "Magento 2 Module";
3737

38-
public MagentoModuleGenerator() {
39-
}
40-
4138
@Nls
4239
@NotNull
40+
@Override
4341
public String getName() {
4442
return ACTION_NAME;
4543
}
4644

45+
@Override
4746
public String getDescription() {
4847
return "Create a Magento 2 Module";
4948
}
5049

50+
@Override
5151
public Icon getIcon() {
5252
return MagentoIcons.MODULE;
5353
}
5454

5555
@NotNull
56+
@Override
5657
public ProjectGeneratorPeer<MagentoProjectGeneratorSettings> createPeer() {
5758
return new MagentoProjectPeer();
5859
}
5960

61+
@Override
6062
public boolean isPrimaryGenerator() {
6163
return PlatformUtils.isPhpStorm();
6264
}
@@ -69,16 +71,17 @@ public boolean isPrimaryGenerator() {
6971
* @param settings Settings
7072
* @param module Module
7173
*/
74+
@Override
7275
public void generateProject(
73-
@NotNull Project project,
74-
@NotNull VirtualFile baseDir,
75-
@NotNull MagentoProjectGeneratorSettings settings,
76-
@NotNull Module module
76+
@NotNull final Project project,
77+
@NotNull final VirtualFile baseDir,
78+
@NotNull final MagentoProjectGeneratorSettings settings,
79+
@NotNull final Module module
7780
) {
78-
Settings dataService = Settings.getInstance(project);
81+
final Settings dataService = Settings.getInstance(project);
7982
dataService.setState(settings.getMagentoState());
8083

81-
Runnable generate = () -> {
84+
final Runnable generate = () -> {
8285
ApplicationManager.getApplication().runWriteAction(() -> {
8386
PsiDirectory baseDirElement = PsiManager
8487
.getInstance(project)
@@ -107,9 +110,9 @@ public void generateProject(
107110
* @return
108111
*/
109112
private PsiFile generateComposerJson(
110-
@NotNull Project project,
111-
@NotNull PsiDirectory baseDir,
112-
@NotNull MagentoProjectGeneratorSettings settings
113+
@NotNull final Project project,
114+
@NotNull final PsiDirectory baseDir,
115+
@NotNull final MagentoProjectGeneratorSettings settings
113116
) {
114117
return new ModuleComposerJsonGenerator(new ModuleComposerJsonData(
115118
settings.getPackageName(),
@@ -132,9 +135,9 @@ private PsiFile generateComposerJson(
132135
* @return
133136
*/
134137
private PsiFile generateRegistrationPhp(
135-
@NotNull Project project,
136-
@NotNull PsiDirectory baseDir,
137-
@NotNull MagentoProjectGeneratorSettings settings
138+
@NotNull final Project project,
139+
@NotNull final PsiDirectory baseDir,
140+
@NotNull final MagentoProjectGeneratorSettings settings
138141
) {
139142
return new ModuleRegistrationPhpGenerator(new ModuleRegistrationPhpData(
140143
settings.getPackageName(),
@@ -152,22 +155,24 @@ private PsiFile generateRegistrationPhp(
152155
* @param settings Settings
153156
*/
154157
private void generateModuleXml(
155-
@NotNull Project project,
156-
@NotNull PsiDirectory baseDir,
157-
@NotNull MagentoProjectGeneratorSettings settings
158+
@NotNull final Project project,
159+
@NotNull final PsiDirectory baseDir,
160+
@NotNull final MagentoProjectGeneratorSettings settings
158161
) {
159-
ModuleXmlData moduleXmlData = new ModuleXmlData(
162+
final ModuleXmlData moduleXmlData = new ModuleXmlData(
160163
settings.getPackageName(),
161164
settings.getModuleName(),
162165
settings.getModuleVersion(),
163166
baseDir,
164167
false
165168
);
166-
ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(moduleXmlData, project);
169+
final ModuleXmlGenerator moduleXmlGenerator =
170+
new ModuleXmlGenerator(moduleXmlData, project);
167171
moduleXmlGenerator.generate(ACTION_NAME, true);
168172
}
169173

170174
@Nullable
175+
@Override
171176
public String getHelpId() {
172177
return null;
173178
}

0 commit comments

Comments
 (0)