Skip to content

Commit 4220a63

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

File tree

10 files changed

+203
-112
lines changed

10 files changed

+203
-112
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,25 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.actions.generation;
67

78
import com.intellij.ide.IdeView;
89
import com.intellij.openapi.actionSystem.*;
910
import com.intellij.openapi.project.Project;
1011
import com.intellij.psi.PsiDirectory;
11-
import com.magento.idea.magento2plugin.MagentoIcons;
1212
import com.magento.idea.magento2plugin.actions.generation.dialog.NewControllerDialog;
13+
import com.magento.idea.magento2plugin.MagentoIcons;
1314
import org.jetbrains.annotations.NotNull;
1415

16+
@SuppressWarnings({"PMD.OnlyOneReturn"})
1517
public class NewControllerAction extends AnAction {
1618
public static String ACTION_NAME = "Magento 2 Controller";
1719
public static String ACTION_DESCRIPTION = "Create a new Magento 2 controller";
1820

21+
/**
22+
* New controller action constructor.
23+
*/
1924
NewControllerAction() {
2025
super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
2126
}

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.actions.generation.data;
67

78
public class ControllerFileData {
@@ -14,6 +15,18 @@ public class ControllerFileData {
1415
private Boolean isInheritClass;
1516
private String namespace;
1617

18+
/**
19+
* Controller data file constructor.
20+
*
21+
* @param actionDirectory String
22+
* @param controllerClassName String
23+
* @param controllerModule String
24+
* @param controllerArea String
25+
* @param httpMethodName String
26+
* @param acl String
27+
* @param isInheritClass Boolean
28+
* @param namespace String
29+
*/
1730
public ControllerFileData(
1831
String actionDirectory,
1932
String controllerClassName,
@@ -34,34 +47,74 @@ public ControllerFileData(
3447
this.namespace = namespace;
3548
}
3649

50+
/**
51+
* Get action directory.
52+
*
53+
* @return String
54+
*/
3755
public String getActionDirectory() {
3856
return actionDirectory;
3957
}
4058

59+
/**
60+
* Get action class name.
61+
*
62+
* @return String
63+
*/
4164
public String getActionClassName() {
4265
return actionClassName;
4366
}
4467

68+
/**
69+
* Get controller module.
70+
*
71+
* @return String
72+
*/
4573
public String getControllerModule() {
4674
return controllerModule;
4775
}
4876

77+
/**
78+
* Get namespace.
79+
*
80+
* @return String
81+
*/
4982
public String getNamespace() {
5083
return namespace;
5184
}
5285

86+
/**
87+
* Get controller area.
88+
*
89+
* @return String
90+
*/
5391
public String getControllerArea() {
5492
return controllerArea;
5593
}
5694

95+
/**
96+
* Get HTTP method name.
97+
*
98+
* @return String
99+
*/
57100
public String getHttpMethodName() {
58101
return httpMethodName;
59102
}
60103

104+
/**
105+
* Get ACL.
106+
*
107+
* @return String
108+
*/
61109
public String getAcl() {
62110
return acl;
63111
}
64112

113+
/**
114+
* Get is inherit class.
115+
*
116+
* @return String
117+
*/
65118
public Boolean getIsInheritClass() {
66119
return isInheritClass;
67120
}

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
import com.intellij.openapi.project.Project;
99
import com.intellij.psi.PsiDirectory;
1010
import com.intellij.psi.PsiFile;
11-
import com.magento.idea.magento2plugin.actions.generation.NewControllerAction;
1211
import com.magento.idea.magento2plugin.actions.generation.data.ControllerFileData;
1312
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.NewControllerValidator;
1413
import com.magento.idea.magento2plugin.actions.generation.generator.ModuleControllerClassGenerator;
14+
import com.magento.idea.magento2plugin.actions.generation.NewControllerAction;
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;
1818
import com.magento.idea.magento2plugin.magento.packages.HttpRequest;
1919
import com.magento.idea.magento2plugin.magento.packages.Package;
2020
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
2121
import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
22-
import javax.swing.JPanel;
23-
import javax.swing.JButton;
24-
import javax.swing.JLabel;
25-
import javax.swing.JTextField;
26-
import javax.swing.JCheckBox;
27-
import javax.swing.JComponent;
28-
import javax.swing.KeyStroke;
29-
import java.awt.event.WindowAdapter;
30-
import java.awt.event.WindowEvent;
31-
import java.awt.event.ActionListener;
3222
import java.awt.event.ActionEvent;
23+
import java.awt.event.ActionListener;
3324
import java.awt.event.KeyEvent;
25+
import java.awt.event.WindowAdapter;
26+
import java.awt.event.WindowEvent;
3427
import java.util.ArrayList;
3528
import java.util.Arrays;
29+
import javax.swing.JButton;
30+
import javax.swing.JCheckBox;
31+
import javax.swing.JComponent;
32+
import javax.swing.JLabel;
33+
import javax.swing.JPanel;
34+
import javax.swing.JTextField;
35+
import javax.swing.KeyStroke;
3636

3737
public class NewControllerDialog extends AbstractDialog {
3838
private final NewControllerValidator validator;
@@ -255,8 +255,7 @@ protected void onCancel() {
255255
dispose();
256256
}
257257

258-
private ArrayList<String> getAreaList()
259-
{
258+
private ArrayList<String> getAreaList() {
260259
return new ArrayList<>(
261260
Arrays.asList(
262261
Package.Areas.frontend.toString(),

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

Lines changed: 6 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.CreateAPluginDialog;
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 CreateAPluginDialogValidator {
@@ -38,6 +38,9 @@ public static CreateAPluginDialogValidator getInstance(CreateAPluginDialog dialo
3838
return INSTANCE;
3939
}
4040

41+
/**
42+
* Create a plugin dialog validator.
43+
*/
4144
public CreateAPluginDialogValidator() {
4245
this.validatorBundle = new ValidatorBundle();
4346
this.commonBundle = new CommonBundle();
@@ -50,8 +53,7 @@ public CreateAPluginDialogValidator() {
5053
*
5154
* @return Boolean
5255
*/
53-
public boolean validate(Project project)
54-
{
56+
public boolean validate(Project project) {
5557
String errorTitle = commonBundle.message("common.error");
5658
String pluginClassName = dialog.getPluginClassName();
5759

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

Lines changed: 6 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.CreateAnObserverDialog;
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 CreateAnObserverDialogValidator {
@@ -37,6 +37,9 @@ public static CreateAnObserverDialogValidator getInstance(CreateAnObserverDialog
3737
return INSTANCE;
3838
}
3939

40+
/**
41+
* Create an observer dialog validator.
42+
*/
4043
public CreateAnObserverDialogValidator() {
4144
this.validatorBundle = new ValidatorBundle();
4245
this.commonBundle = new CommonBundle();
@@ -49,8 +52,7 @@ public CreateAnObserverDialogValidator() {
4952
*
5053
* @return Boolean
5154
*/
52-
public boolean validate(Project project)
53-
{
55+
public boolean validate(Project project) {
5456
String errorTitle = commonBundle.message("common.error");
5557
String observerClassName = dialog.getObserverClassName();
5658

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewBlockValidator.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.NewBlockDialog;
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 NewBlockValidator getInstance(NewBlockDialog dialog) {
3434
return INSTANCE;
3535
}
3636

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

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ public static NewControllerValidator getInstance(NewControllerDialog dialog) {
3535
return INSTANCE;
3636
}
3737

38-
public NewControllerValidator()
39-
{
38+
/**
39+
* New controller validator constructor.
40+
*/
41+
public NewControllerValidator() {
4042
this.validatorBundle = new ValidatorBundle();
4143
this.commonBundle = new CommonBundle();
4244
}
@@ -46,8 +48,7 @@ public NewControllerValidator()
4648
*
4749
* @return Boolean
4850
*/
49-
public boolean validate()
50-
{
51+
public boolean validate() {
5152
String errorTitle = commonBundle.message("common.error");
5253
String actionName = dialog.getActionName();
5354

0 commit comments

Comments
 (0)