Skip to content

Commit cb5454a

Browse files
879: Code refactoring
1 parent 16d6c80 commit cb5454a

File tree

2 files changed

+32
-29
lines changed

2 files changed

+32
-29
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.magento.idea.magento2plugin.actions.generation.dialog.NewUiComponentFormDialog;
1818

1919
public class NewUiComponentFormAction extends AnAction {
20+
2021
public static final String ACTION_NAME = "Magento 2 UI Component Form";
2122
public static final String ACTION_DESCRIPTION = "Create a new Magento 2 UI Component Form";
2223

@@ -35,17 +36,16 @@ public void actionPerformed(final AnActionEvent event) {
3536
if (view == null) {
3637
return;
3738
}
38-
3939
final Project project = CommonDataKeys.PROJECT.getData(dataContext);
40+
4041
if (project == null) {
4142
return;
4243
}
43-
4444
final PsiDirectory directory = view.getOrChooseDirectory();
45+
4546
if (directory == null) {
4647
return;
4748
}
48-
4949
NewUiComponentFormDialog.open(project, directory);
5050
}
5151

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

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import javax.swing.KeyStroke;
7272
import javax.swing.table.DefaultTableModel;
7373
import javax.swing.table.TableColumn;
74+
import org.jetbrains.annotations.NotNull;
7475

7576
@SuppressWarnings({
7677
"PMD.TooManyFields",
@@ -80,6 +81,25 @@
8081
"PMD.GodClass"
8182
})
8283
public class NewUiComponentFormDialog extends AbstractDialog {
84+
85+
private static final String VIEW_ACTION_NAME = "View Action Name";
86+
private static final String SUBMIT_ACTION_NAME = "Submit Action Name";
87+
private static final String DATA_PROVIDER_CLASS_NAME = "Data Provider Class Name";
88+
private static final String DATA_PROVIDER_DIRECTORY = "Data Provider Directory";
89+
90+
private static final String CLASS_COLUMN = "Class";
91+
private static final String DIRECTORY_COLUMN = "Directory";
92+
private static final String TYPE_COLUMN = "Type";
93+
private static final String LABEL_COLUMN = "Label";
94+
private static final String SORT_ORDER_COLUMN = "Sort Order";
95+
private static final String ACTION_COLUMN = "Action";
96+
private static final String DELETE_COLUMN = "Delete";
97+
private static final String NAME_COLUMN = "Name";
98+
private static final String FIELDSET_COLUMN = "Fieldset";
99+
private static final String FORM_ELEMENT_TYPE_COLUMN = "Form Element Type";
100+
private static final String DATA_TYPE_COLUMN = "Data Type";
101+
private static final String SOURCE_COLUMN = "Source";
102+
83103
private final FormButtonsValidator formButtonsValidator;
84104
private final FormFieldsetsValidator formFieldsetsValidator;
85105
private final FormFieldsValidator formFieldsValidator;
@@ -90,11 +110,6 @@ public class NewUiComponentFormDialog extends AbstractDialog {
90110
private JButton buttonCancel;
91111
private FilteredComboBox formAreaSelect;
92112

93-
private static final String VIEW_ACTION_NAME = "View Action Name";
94-
private static final String SUBMIT_ACTION_NAME = "Submit Action Name";
95-
private static final String DATA_PROVIDER_CLASS_NAME = "Data Provider Class Name";
96-
private static final String DATA_PROVIDER_DIRECTORY = "Data Provider Directory";
97-
98113
@FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, "Name"})
99114
@FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE, "Name"})
100115
private JTextField formName;
@@ -181,26 +196,16 @@ public class NewUiComponentFormDialog extends AbstractDialog {
181196
private JLabel dataProviderClassNameLabel;//NOPMD
182197
private JLabel dataProviderDirectoryLabel;//NOPMD
183198

184-
private static final String CLASS_COLUMN = "Class";
185-
private static final String DIRECTORY_COLUMN = "Directory";
186-
private static final String TYPE_COLUMN = "Type";
187-
private static final String LABEL_COLUMN = "Label";
188-
private static final String SORT_ORDER_COLUMN = "Sort Order";
189-
private static final String ACTION_COLUMN = "Action";
190-
private static final String DELETE_COLUMN = "Delete";
191-
private static final String NAME_COLUMN = "Name";
192-
private static final String FIELDSET_COLUMN = "Fieldset";
193-
private static final String FORM_ELEMENT_TYPE_COLUMN = "Form Element Type";
194-
private static final String DATA_TYPE_COLUMN = "Data Type";
195-
private static final String SOURCE_COLUMN = "Source";
196-
197199
/**
198200
* Open new dialog for adding new controller.
199201
*
200202
* @param project Project
201203
* @param directory PsiDirectory
202204
*/
203-
public NewUiComponentFormDialog(final Project project, final PsiDirectory directory) {
205+
public NewUiComponentFormDialog(
206+
final @NotNull Project project,
207+
final @NotNull PsiDirectory directory
208+
) {
204209
super();
205210
this.project = project;
206211
formButtonsValidator = new FormButtonsValidator(this);
@@ -396,7 +401,10 @@ public String getArea() {
396401
* @param project Project
397402
* @param directory PsiDirectory
398403
*/
399-
public static void open(final Project project, final PsiDirectory directory) {
404+
public static void open(
405+
final @NotNull Project project,
406+
final @NotNull PsiDirectory directory
407+
) {
400408
final NewUiComponentFormDialog dialog = new NewUiComponentFormDialog(project, directory);
401409
dialog.pack();
402410
dialog.centerDialog(dialog);
@@ -424,8 +432,8 @@ private void onOK() {
424432
generateLayoutFile();
425433
generateFormFile();
426434
generateAclXmlFile();
435+
exit();
427436
}
428-
exit();
429437
}
430438

431439
/**
@@ -536,11 +544,6 @@ private void generateAclXmlFile() {
536544
), getModuleName(), project).generate(NewUiComponentFormAction.ACTION_NAME, false);
537545
}
538546

539-
@Override
540-
protected void onCancel() {
541-
dispose();
542-
}
543-
544547
private List<String> getAreaList() {
545548
return new ArrayList<>(
546549
Arrays.asList(

0 commit comments

Comments
 (0)