Skip to content

Commit b6569ba

Browse files
authored
Merge pull request #574 from ProkopovVitaliy/eav-generator-refactoring
Refactored and improved EAV attribute generators
2 parents 4078a6b + 54855a9 commit b6569ba

File tree

6 files changed

+424
-193
lines changed

6 files changed

+424
-193
lines changed

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCategoryEavAttributeDialog.form

Lines changed: 132 additions & 61 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
16
package com.magento.idea.magento2plugin.actions.generation.dialog;
27

38
import com.intellij.openapi.project.Project;
@@ -17,6 +22,7 @@
1722
import javax.swing.JButton;
1823
import javax.swing.JCheckBox;
1924
import javax.swing.JComboBox;
25+
import javax.swing.JLabel;
2026
import javax.swing.JPanel;
2127
import javax.swing.JTable;
2228
import javax.swing.JTextField;
@@ -62,13 +68,20 @@ public class NewCategoryEavAttributeDialog extends EavAttributeDialog {
6268
private JPanel customSourceModelPanel;
6369
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
6470
message = {NotEmptyRule.MESSAGE, "Source Model Directory"})
65-
private JTextField sourceModelDirectoryTexField;
71+
private JTextField sourceModelDirectoryTextField;
6672
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
6773
message = {NotEmptyRule.MESSAGE, "Source Model Name"})
68-
private JTextField sourceModelNameTexField;
74+
private JTextField sourceModelNameTextField;
6975
private JTable optionsTable;
7076
private JButton addNewOptionButton;
7177
private JPanel optionsPanel;
78+
private JLabel codeTextFieldErrorMessage;
79+
private JLabel labelTextFieldErrorMessage;
80+
private JLabel dataPatchNameTextFieldErrorMessage;
81+
private JLabel groupTextFieldErrorMessage;
82+
private JLabel sourceModelDirectoryTextFieldErrorMessage;
83+
private JLabel sourceModelNameTextFieldErrorMessage;
84+
private JLabel sortOrderTextFieldErrorMessage;
7285

7386
/**
7487
* Constructor.
@@ -83,7 +96,6 @@ public NewCategoryEavAttributeDialog(
8396
final String actionName
8497
) {
8598
super(project, directory, actionName);
86-
8799
}
88100

89101
@Override
@@ -143,12 +155,12 @@ protected JComboBox<ComboBoxItemData> getAttributeSourceComboBox() {
143155

144156
@Override
145157
protected JTextField getAttributeSourceModelNameTexField() {
146-
return sourceModelNameTexField;
158+
return sourceModelNameTextField;
147159
}
148160

149161
@Override
150-
protected JTextField getSourceModelDirectoryTexField() {
151-
return sourceModelDirectoryTexField;
162+
protected JTextField getSourceModelDirectoryTextField() {
163+
return sourceModelDirectoryTextField;
152164
}
153165

154166
@Override
@@ -172,8 +184,8 @@ protected JTextField getDataPatchNameTextField() {
172184
}
173185

174186
@Override
175-
protected JTextField getSourceModelNameTexField() {
176-
return sourceModelNameTexField;
187+
protected JTextField getSourceModelNameTextField() {
188+
return sourceModelNameTextField;
177189
}
178190

179191
@Override

0 commit comments

Comments
 (0)