71
71
import javax .swing .KeyStroke ;
72
72
import javax .swing .table .DefaultTableModel ;
73
73
import javax .swing .table .TableColumn ;
74
+ import org .jetbrains .annotations .NotNull ;
74
75
75
76
@ SuppressWarnings ({
76
77
"PMD.TooManyFields" ,
80
81
"PMD.GodClass"
81
82
})
82
83
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
+
83
103
private final FormButtonsValidator formButtonsValidator ;
84
104
private final FormFieldsetsValidator formFieldsetsValidator ;
85
105
private final FormFieldsValidator formFieldsValidator ;
@@ -90,11 +110,6 @@ public class NewUiComponentFormDialog extends AbstractDialog {
90
110
private JButton buttonCancel ;
91
111
private FilteredComboBox formAreaSelect ;
92
112
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
-
98
113
@ FieldValidation (rule = RuleRegistry .NOT_EMPTY , message = {NotEmptyRule .MESSAGE , "Name" })
99
114
@ FieldValidation (rule = RuleRegistry .IDENTIFIER , message = {IdentifierRule .MESSAGE , "Name" })
100
115
private JTextField formName ;
@@ -181,26 +196,16 @@ public class NewUiComponentFormDialog extends AbstractDialog {
181
196
private JLabel dataProviderClassNameLabel ;//NOPMD
182
197
private JLabel dataProviderDirectoryLabel ;//NOPMD
183
198
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
-
197
199
/**
198
200
* Open new dialog for adding new controller.
199
201
*
200
202
* @param project Project
201
203
* @param directory PsiDirectory
202
204
*/
203
- public NewUiComponentFormDialog (final Project project , final PsiDirectory directory ) {
205
+ public NewUiComponentFormDialog (
206
+ final @ NotNull Project project ,
207
+ final @ NotNull PsiDirectory directory
208
+ ) {
204
209
super ();
205
210
this .project = project ;
206
211
formButtonsValidator = new FormButtonsValidator (this );
@@ -396,7 +401,10 @@ public String getArea() {
396
401
* @param project Project
397
402
* @param directory PsiDirectory
398
403
*/
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
+ ) {
400
408
final NewUiComponentFormDialog dialog = new NewUiComponentFormDialog (project , directory );
401
409
dialog .pack ();
402
410
dialog .centerDialog (dialog );
@@ -424,8 +432,8 @@ private void onOK() {
424
432
generateLayoutFile ();
425
433
generateFormFile ();
426
434
generateAclXmlFile ();
435
+ exit ();
427
436
}
428
- exit ();
429
437
}
430
438
431
439
/**
@@ -536,11 +544,6 @@ private void generateAclXmlFile() {
536
544
), getModuleName (), project ).generate (NewUiComponentFormAction .ACTION_NAME , false );
537
545
}
538
546
539
- @ Override
540
- protected void onCancel () {
541
- dispose ();
542
- }
543
-
544
547
private List <String > getAreaList () {
545
548
return new ArrayList <>(
546
549
Arrays .asList (
0 commit comments