Skip to content

Commit 4b9c779

Browse files
author
Sergiy Zhovnir
committed
Add code adjustments
1 parent 4220a63 commit 4b9c779

File tree

7 files changed

+37
-21
lines changed

7 files changed

+37
-21
lines changed

‎src/com/magento/idea/magento2plugin/actions/generation/NewControllerAction.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
package com.magento.idea.magento2plugin.actions.generation;
77

88
import com.intellij.ide.IdeView;
9-
import com.intellij.openapi.actionSystem.*;
9+
import com.intellij.openapi.actionSystem.AnAction;
10+
import com.intellij.openapi.actionSystem.AnActionEvent;
11+
import com.intellij.openapi.actionSystem.CommonDataKeys;
12+
import com.intellij.openapi.actionSystem.DataContext;
13+
import com.intellij.openapi.actionSystem.LangDataKeys;
1014
import com.intellij.openapi.project.Project;
1115
import com.intellij.psi.PsiDirectory;
12-
import com.magento.idea.magento2plugin.actions.generation.dialog.NewControllerDialog;
1316
import com.magento.idea.magento2plugin.MagentoIcons;
17+
import com.magento.idea.magento2plugin.actions.generation.dialog.NewControllerDialog;
1418
import org.jetbrains.annotations.NotNull;
1519

1620
@SuppressWarnings({"PMD.OnlyOneReturn"})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import com.intellij.psi.PsiFile;
1111
import com.magento.idea.magento2plugin.actions.generation.data.ControllerFileData;
1212
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.NewControllerValidator;
13-
import com.magento.idea.magento2plugin.actions.generation.generator.ModuleControllerClassGenerator;
1413
import com.magento.idea.magento2plugin.actions.generation.NewControllerAction;
14+
import com.magento.idea.magento2plugin.actions.generation.generator.ModuleControllerClassGenerator;
1515
import com.magento.idea.magento2plugin.magento.files.ControllerBackendPhp;
1616
import com.magento.idea.magento2plugin.magento.files.ControllerFrontendPhp;
1717
import com.magento.idea.magento2plugin.magento.packages.File;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
import com.jetbrains.php.refactoring.PhpNameUtil;
99
import com.magento.idea.magento2plugin.actions.generation.dialog.NewGraphQlResolverDialog;
1010
import com.magento.idea.magento2plugin.bundles.CommonBundle;
11-
import com.magento.idea.magento2plugin.util.RegExUtil;
1211
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
12+
import com.magento.idea.magento2plugin.util.RegExUtil;
1313
import javax.swing.JOptionPane;
1414

1515
@SuppressWarnings({"PMD.OnlyOneReturn"})
1616
public class NewGraphQlResolverValidator {
1717
private static NewGraphQlResolverValidator INSTANCE = null;
1818
private ValidatorBundle validatorBundle;
1919
private CommonBundle commonBundle;
20-
2120
private NewGraphQlResolverDialog dialog;
2221

2322
/**
@@ -35,6 +34,9 @@ public static NewGraphQlResolverValidator getInstance(NewGraphQlResolverDialog d
3534
return INSTANCE;
3635
}
3736

37+
/**
38+
* New Graph Ql Resolver validator constructor.
39+
*/
3840
public NewGraphQlResolverValidator() {
3941
this.validatorBundle = new ValidatorBundle();
4042
this.commonBundle = new CommonBundle();
@@ -45,8 +47,7 @@ public NewGraphQlResolverValidator() {
4547
*
4648
* @return Boolean
4749
*/
48-
public boolean validate()
49-
{
50+
public boolean validate() {
5051
String errorTitle = commonBundle.message("common.error");
5152
String resolverClassName = dialog.getGraphQlResolverClassName();
5253

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public static NewModuleDialogValidator getInstance(NewModuleDialog dialog) {
3333
return INSTANCE;
3434
}
3535

36+
/**
37+
* New module dialog validator constructor.
38+
*/
3639
public NewModuleDialogValidator() {
3740
this.validatorBundle = new ValidatorBundle();
3841
this.commonBundle = new CommonBundle();
@@ -43,8 +46,7 @@ public NewModuleDialogValidator() {
4346
*
4447
* @return Boolean
4548
*/
46-
public boolean validate()
47-
{
49+
public boolean validate() {
4850
String errorTitle = commonBundle.message("common.error");
4951
String packageName = dialog.getPackageName();
5052
if (packageName.length() == 0) {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.jetbrains.php.refactoring.PhpNameUtil;
99
import com.magento.idea.magento2plugin.actions.generation.dialog.NewViewModelDialog;
1010
import com.magento.idea.magento2plugin.bundles.CommonBundle;
11-
import com.magento.idea.magento2plugin.util.RegExUtil;
1211
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
12+
import com.magento.idea.magento2plugin.util.RegExUtil;
1313
import javax.swing.JOptionPane;
1414

1515
@SuppressWarnings({"PMD.OnlyOneReturn"})
@@ -34,6 +34,9 @@ public static NewViewModelValidator getInstance(NewViewModelDialog dialog) {
3434
return INSTANCE;
3535
}
3636

37+
/**
38+
* New view model validator constructor.
39+
*/
3740
public NewViewModelValidator() {
3841
this.validatorBundle = new ValidatorBundle();
3942
this.commonBundle = new CommonBundle();
@@ -44,8 +47,7 @@ public NewViewModelValidator() {
4447
*
4548
* @return Boolean
4649
*/
47-
public boolean validate()
48-
{
50+
public boolean validate() {
4951
String errorTitle = commonBundle.message("common.error");
5052

5153
String moduleName = dialog.getViewModelName();

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import com.jetbrains.php.refactoring.PhpNameUtil;
1010
import com.magento.idea.magento2plugin.actions.generation.dialog.OverrideClassByAPreferenceDialog;
1111
import com.magento.idea.magento2plugin.bundles.CommonBundle;
12+
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
1213
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
1314
import com.magento.idea.magento2plugin.util.RegExUtil;
14-
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
15-
import javax.swing.JOptionPane;
1615
import java.util.List;
16+
import javax.swing.JOptionPane;
1717

1818
@SuppressWarnings({"PMD.OnlyOneReturn"})
1919
public class OverrideClassByAPreferenceDialogValidator {
@@ -51,8 +51,7 @@ public OverrideClassByAPreferenceDialogValidator() {
5151
*
5252
* @return boolean
5353
*/
54-
public boolean validate(Project project)
55-
{
54+
public boolean validate(Project project) {
5655
String errorTitle = commonBundle.message("common.error");
5756
String preferenceClassName = dialog.getPreferenceClassName();
5857

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.intellij.openapi.project.Project;
1010
import com.intellij.psi.PsiDirectory;
1111
import com.intellij.psi.PsiFile;
12-
import com.jetbrains.php.lang.psi.elements.PhpClass;
1312
import com.jetbrains.php.lang.psi.PhpFile;
13+
import com.jetbrains.php.lang.psi.elements.PhpClass;
1414
import com.magento.idea.magento2plugin.actions.generation.data.ControllerFileData;
1515
import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
1616
import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
@@ -70,10 +70,15 @@ public PsiFile generate(String actionName) {
7070
final PsiFile[] controllerFiles = new PsiFile[1];
7171

7272
WriteCommandAction.runWriteCommandAction(project, () -> {
73-
PhpClass controller = GetPhpClassByFQN.getInstance(project).execute(getControllerFqn());
73+
PhpClass controller = GetPhpClassByFQN.getInstance(project).execute(
74+
getControllerFqn()
75+
);
7476

7577
if (controller != null) {
76-
String errorMessage = this.validatorBundle.message("validator.file.alreadyExists", "Controller Class");
78+
String errorMessage = this.validatorBundle.message(
79+
"validator.file.alreadyExists",
80+
"Controller Class"
81+
);
7782
JOptionPane.showMessageDialog(
7883
null,
7984
errorMessage,
@@ -87,7 +92,10 @@ public PsiFile generate(String actionName) {
8792
controller = createControllerClass(actionName);
8893

8994
if (controller == null) {
90-
String errorMessage = this.validatorBundle.message("validator.file.cantBeCreated", "Controller Class");
95+
String errorMessage = this.validatorBundle.message(
96+
"validator.file.cantBeCreated",
97+
"Controller Class"
98+
);
9199
JOptionPane.showMessageDialog(
92100
null,
93101
errorMessage,
@@ -172,14 +180,14 @@ private PhpClass createControllerClass(String actionName) {
172180
}
173181

174182
protected void fillAttributes(Properties attributes) {
175-
ArrayList<String> uses = getUses();
176183
String actionClassName = controllerFileData.getActionClassName();
177184
attributes.setProperty("NAME", actionClassName);
178185
attributes.setProperty("NAMESPACE", controllerFileData.getNamespace());
179186
String httpMethodInterface = getHttpMethodInterfaceByMethod(
180187
controllerFileData.getHttpMethodName()
181188
);
182189
attributes.setProperty("IMPLEMENTS", getNameFromFqn(httpMethodInterface));
190+
ArrayList<String> uses = getUses();
183191
uses.add(httpMethodInterface);
184192

185193
if (controllerFileData.getIsInheritClass()) {

0 commit comments

Comments
 (0)