Skip to content

Commit 975f19a

Browse files
author
Vitaliy Boyko
committed
89: static fixes
1 parent 16312a1 commit 975f19a

29 files changed

+837
-509
lines changed

‎gradle-tasks/pmd/ruleset.xml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</rule>
2525
<rule ref="category/java/design.xml">
2626
<exclude name="LawOfDemeter"/>
27+
<exclude name="DataClass"/>
2728
</rule>
2829
<rule ref="category/java/documentation.xml">
2930
<exclude name="CommentRequired" />

‎resources/fileTemplates/internal/Magento Module Layout Xml.xml.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
22
<body>
33
</body>
4-
</page>
4+
</page>

‎resources/fileTemplates/internal/Magento Routes Xml.xml.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
33
<router id="${ROUTER_ID}">
44
</router>
5-
</config>
5+
</config>

‎src/com/magento/idea/magento2plugin/actions/generation/data/LayoutXmlData.java

+17-13
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,30 @@
66
package com.magento.idea.magento2plugin.actions.generation.data;
77

88
public class LayoutXmlData {
9-
private String area;
10-
private String route;
11-
private String moduleName;
12-
private String controllerName;
13-
private String actionName;
14-
private String formName;
9+
private final String area;
10+
private final String route;
11+
private final String moduleName;
12+
private final String controllerName;
13+
private final String actionName;
14+
private final String formName;
1515

1616
/**
17-
* Routes XML Data.
17+
* Layout XML data.
1818
*
1919
* @param area String
2020
* @param route String
21+
* @param moduleName String
22+
* @param controllerName String
23+
* @param actionName String
24+
* @param formName String
2125
*/
2226
public LayoutXmlData(
23-
String area,
24-
String route,
25-
String moduleName,
26-
String controllerName,
27-
String actionName,
28-
String formName
27+
final String area,
28+
final String route,
29+
final String moduleName,
30+
final String controllerName,
31+
final String actionName,
32+
final String formName
2933
) {
3034
this.area = area;
3135
this.route = route;

‎src/com/magento/idea/magento2plugin/actions/generation/data/RoutesXmlData.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55

66
package com.magento.idea.magento2plugin.actions.generation.data;
77

8-
import com.jetbrains.php.lang.psi.elements.PhpClass;
9-
108
public class RoutesXmlData {
11-
private String area;
12-
private String route;
13-
private String moduleName;
9+
10+
private final String area;
11+
private final String route;
12+
private final String moduleName;
1413

1514
/**
1615
* Routes XML Data.
1716
*
1817
* @param area String
1918
* @param route String
19+
* @param moduleName String
2020
*/
2121
public RoutesXmlData(
22-
String area,
23-
String route,
24-
String moduleName
22+
final String area,
23+
final String route,
24+
final String moduleName
2525
) {
2626
this.area = area;
2727
this.route = route;

‎src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentFormButtonData.java

+31-18
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,39 @@
66
package com.magento.idea.magento2plugin.actions.generation.data;
77

88
public class UiComponentFormButtonData {
9-
private String buttonDirectory;
10-
private String buttonClassName;
11-
private String buttonModule;
12-
private String buttonType;
13-
private String namespace;
14-
private String buttonLabel;
15-
private String buttonSortOrder;
16-
private String formName;
17-
private String fqn;
9+
private final String buttonDirectory;
10+
private final String buttonClassName;
11+
private final String buttonModule;
12+
private final String buttonType;
13+
private final String namespace;
14+
private final String buttonLabel;
15+
private final String buttonSortOrder;
16+
private final String formName;
17+
private final String fqn;
1818

19+
/**
20+
* UI component form button data.
21+
*
22+
* @param buttonDirectory String
23+
* @param buttonClassName String
24+
* @param buttonModule String
25+
* @param buttonType String
26+
* @param namespace String
27+
* @param buttonLabel String
28+
* @param buttonSortOrder String
29+
* @param formName String
30+
* @param fqn String
31+
*/
1932
public UiComponentFormButtonData(
20-
String buttonDirectory,
21-
String buttonClassName,
22-
String buttonModule,
23-
String buttonType,
24-
String namespace,
25-
String buttonLabel,
26-
String buttonSortOrder,
27-
String formName,
28-
String fqn
33+
final String buttonDirectory,
34+
final String buttonClassName,
35+
final String buttonModule,
36+
final String buttonType,
37+
final String namespace,
38+
final String buttonLabel,
39+
final String buttonSortOrder,
40+
final String formName,
41+
final String fqn
2942
) {
3043
this.buttonDirectory = buttonDirectory;
3144
this.buttonClassName = buttonClassName;

‎src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentFormFieldData.java

+25-14
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,33 @@
77

88
public class UiComponentFormFieldData {
99

10-
private String name;
11-
private String label;
12-
private String sortOrder;
13-
private String fieldset;
14-
private String formElementType;
15-
private String dataType;
16-
private String source;
10+
private final String name;
11+
private final String label;
12+
private final String sortOrder;
13+
private final String fieldset;
14+
private final String formElementType;
15+
private final String dataType;
16+
private final String source;
1717

18+
/**
19+
* Form field data.
20+
*
21+
* @param name String
22+
* @param label String
23+
* @param sortOrder String
24+
* @param fieldset String
25+
* @param formElementType String
26+
* @param dataType String
27+
* @param source String
28+
*/
1829
public UiComponentFormFieldData(
19-
String name,
20-
String label,
21-
String sortOrder,
22-
String fieldset,
23-
String formElementType,
24-
String dataType,
25-
String source
30+
final String name,
31+
final String label,
32+
final String sortOrder,
33+
final String fieldset,
34+
final String formElementType,
35+
final String dataType,
36+
final String source
2637
) {
2738
this.name = name;
2839
this.label = label;

‎src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentFormFieldsetData.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,18 @@
77

88
public class UiComponentFormFieldsetData {
99

10-
private String label;
11-
private String sortOrder;
10+
private final String label;
11+
private final String sortOrder;
1212

13+
/**
14+
* Fieldset data.
15+
*
16+
* @param label String
17+
* @param sortOrder String
18+
*/
1319
public UiComponentFormFieldsetData(
14-
String label,
15-
String sortOrder
20+
final String label,
21+
final String sortOrder
1622
) {
1723
this.label = label;
1824
this.sortOrder = sortOrder;

‎src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentFormFileData.java

+48-24
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,48 @@
55

66
package com.magento.idea.magento2plugin.actions.generation.data;
77

8-
import java.util.ArrayList;
8+
import java.util.List;
99

10-
@SuppressWarnings({"PMD.DataClass"})
1110
public class UiComponentFormFileData {
1211
private final String formName;
1312
private final String formArea;
1413
private final String moduleName;
1514
private final String label;
16-
private final ArrayList<UiComponentFormButtonData> buttons;
17-
private final ArrayList<UiComponentFormFieldsetData> fieldsets;
18-
private final ArrayList<UiComponentFormFieldData> fields;
19-
private String route;
20-
private String submitControllerName;
21-
private String submitActionName;
22-
private String dataProviderFqn;
15+
private final List<UiComponentFormButtonData> buttons;
16+
private final List<UiComponentFormFieldsetData> fieldsets;
17+
private final List<UiComponentFormFieldData> fields;
18+
private final String route;
19+
private final String submitControllerName;
20+
private final String submitActionName;
21+
private final String dataProviderFqn;
2322

2423
/**
2524
* UI Form data file constructor.
2625
*
2726
* @param formName String
2827
* @param formArea String
2928
* @param moduleName String
30-
* @param buttons ArrayList<UiComponentFormButtonData>
31-
* @param fieldsets ArrayList<UiComponentFormFieldsetData>
32-
* @param fields ArrayList<UiComponentFormFieldData>
29+
* @param buttons List[UiComponentFormButtonData]
30+
* @param fieldsets List[UiComponentFormFieldsetData]
31+
* @param fields List[UiComponentFormFieldData]
32+
* @param route String
33+
* @param submitControllerName String
34+
* @param submitActionName String
35+
* @param dataProviderFqn String
3336
*/
37+
@SuppressWarnings({"PMD.ExcessiveParameterList"})
3438
public UiComponentFormFileData(
3539
final String formName,
3640
final String formArea,
3741
final String moduleName,
3842
final String label,
39-
final ArrayList<UiComponentFormButtonData> buttons,
40-
final ArrayList<UiComponentFormFieldsetData> fieldsets,
41-
final ArrayList<UiComponentFormFieldData> fields,
43+
final List<UiComponentFormButtonData> buttons,
44+
final List<UiComponentFormFieldsetData> fieldsets,
45+
final List<UiComponentFormFieldData> fields,
4246
final String route,
43-
String submitControllerName,
44-
String submitActionName,
45-
String dataProviderFqn
47+
final String submitControllerName,
48+
final String submitActionName,
49+
final String dataProviderFqn
4650
) {
4751
this.formName = formName;
4852
this.formArea = formArea;
@@ -96,42 +100,62 @@ public String getLabel() {
96100
/**
97101
* Get buttons.
98102
*
99-
* @return ArrayList<UiComponentFormButtonData>
103+
* @return List[UiComponentFormButtonData]
100104
*/
101-
public ArrayList<UiComponentFormButtonData> getButtons() {
105+
public List<UiComponentFormButtonData> getButtons() {
102106
return buttons;
103107
}
104108

105109
/**
106110
* Get fieldsets.
107111
*
108-
* @return ArrayList<UiComponentFormFieldsetData>
112+
* @return List[UiComponentFormFieldsetData]
109113
*/
110-
public ArrayList<UiComponentFormFieldsetData> getFieldsets() {
114+
public List<UiComponentFormFieldsetData> getFieldsets() {
111115
return fieldsets;
112116
}
113117

114118
/**
115119
* Get fields.
116120
*
117-
* @return ArrayList<UiComponentFormFieldData>
121+
* @return List[UiComponentFormFieldData]
118122
*/
119-
public ArrayList<UiComponentFormFieldData> getFields() {
123+
public List<UiComponentFormFieldData> getFields() {
120124
return fields;
121125
}
122126

127+
/**
128+
* Get route.
129+
*
130+
* @return String
131+
*/
123132
public String getRoute() {
124133
return route;
125134
}
126135

136+
/**
137+
* Get submit action name.
138+
*
139+
* @return String
140+
*/
127141
public String getSubmitControllerName() {
128142
return submitControllerName;
129143
}
130144

145+
/**
146+
* Get submit action name.
147+
*
148+
* @return String
149+
*/
131150
public String getSubmitActionName() {
132151
return submitActionName;
133152
}
134153

154+
/**
155+
* Get data provider FQN.
156+
*
157+
* @return String
158+
*/
135159
public String getDataProviderFqn() {
136160
return dataProviderFqn;
137161
}

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form

+9-3
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@
197197
<preferred-size width="150" height="-1"/>
198198
</grid>
199199
</constraints>
200-
<properties/>
200+
<properties>
201+
<text value="Save"/>
202+
</properties>
201203
</component>
202204
<component id="5065a" class="javax.swing.JLabel" binding="saveControllerLabel">
203205
<constraints>
@@ -249,7 +251,9 @@
249251
<preferred-size width="150" height="-1"/>
250252
</grid>
251253
</constraints>
252-
<properties/>
254+
<properties>
255+
<text value="Edit"/>
256+
</properties>
253257
</component>
254258
<component id="e2e73" class="javax.swing.JLabel" binding="actionNameLabel">
255259
<constraints>
@@ -312,7 +316,9 @@
312316
<preferred-size width="150" height="-1"/>
313317
</grid>
314318
</constraints>
315-
<properties/>
319+
<properties>
320+
<text value="Ui/Component/Form"/>
321+
</properties>
316322
</component>
317323
</children>
318324
</grid>

0 commit comments

Comments
 (0)