Skip to content

Commit 896ea26

Browse files
Implemented CR recommendation
1 parent b8dcda7 commit 896ea26

File tree

5 files changed

+33
-6
lines changed

5 files changed

+33
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class NewProductEavAttributeDialog extends EavAttributeDialog {
9393
/**
9494
* Constructor.
9595
*
96-
* @param project Project
96+
* @param project Project
9797
* @param directory PsiDirectory
9898
*/
9999
public NewProductEavAttributeDialog(

src/com/magento/idea/magento2plugin/actions/generation/dialog/event/eavdialog/DataPatchNameAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation.dialog.event.eavdialog;
77

88
import com.intellij.ui.DocumentAdapter;
9+
import com.magento.idea.magento2plugin.actions.generation.dialog.util.EavAttributeCodeSeparatorUtil;
910
import javax.swing.JTextField;
1011
import javax.swing.event.DocumentEvent;
1112
import javax.swing.text.BadLocationException;
@@ -69,10 +70,9 @@ private void updateDataPatchFileName(final String attributeCode) {
6970
return;
7071
}
7172

72-
final String[] attributeCodeParts = attributeCode.split("_");
7373
String fileName = "";
7474

75-
for (final String fileNamePart : attributeCodeParts) {
75+
for (final String fileNamePart : EavAttributeCodeSeparatorUtil.execute(attributeCode)) {
7676
fileName = String.join("", fileName, StringUtils.capitalise(fileNamePart));
7777
}
7878

src/com/magento/idea/magento2plugin/actions/generation/dialog/event/eavdialog/SourceModelNameAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.magento.idea.magento2plugin.actions.generation.dialog.event.eavdialog;
77

88
import com.intellij.ui.DocumentAdapter;
9+
import com.magento.idea.magento2plugin.actions.generation.dialog.util.EavAttributeCodeSeparatorUtil;
910
import javax.swing.JTextField;
1011
import javax.swing.event.DocumentEvent;
1112
import javax.swing.text.BadLocationException;
@@ -42,10 +43,9 @@ private void updateSourceModelName(final String attributeCode) {
4243
return;
4344
}
4445

45-
final String[] attributeCodeParts = attributeCode.split("_");
4646
final StringBuilder sourceModelClassName = new StringBuilder();
4747

48-
for (final String codePart : attributeCodeParts) {
48+
for (final String codePart : EavAttributeCodeSeparatorUtil.execute(attributeCode)) {
4949
sourceModelClassName.append(StringUtils.capitalise(codePart));
5050
}
5151

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*
5+
*/
6+
7+
package com.magento.idea.magento2plugin.actions.generation.dialog.util;
8+
9+
import org.jetbrains.annotations.NotNull;
10+
11+
public final class EavAttributeCodeSeparatorUtil {
12+
13+
public static final String ATTRIBUTE_SEPARATOR = "_";
14+
15+
private EavAttributeCodeSeparatorUtil(){}
16+
17+
/**
18+
* Return separated attribute code.
19+
*
20+
* @param attributeCode String
21+
* @return String[]
22+
*/
23+
@NotNull
24+
public static String[] execute(final String attributeCode) {
25+
return attributeCode.split(ATTRIBUTE_SEPARATOR);
26+
}
27+
}

src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
public class NewEavAttributeGroup extends NonTrivialActionGroup {
1515

1616
/**
17-
* Group for eav attribute generation actions.
17+
* Group for Eav attribute generation actions.
1818
*/
1919
public NewEavAttributeGroup() {
2020
super();

0 commit comments

Comments
 (0)