Skip to content

Commit c27e398

Browse files
author
Vitaliy Boyko
committed
Static fixes
1 parent 9d6cebb commit c27e398

14 files changed

+149
-48
lines changed

src/com/magento/idea/magento2plugin/actions/generation/data/CategoryFormXmlData.java

+8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ public class CategoryFormXmlData {
1414
private final String attributeInput;
1515
private final int sortOrder;
1616

17+
/**
18+
* Category Form data class.
19+
*
20+
* @param fieldSetName name of the fieldset
21+
* @param fieldName field name
22+
* @param attributeInput attribute input
23+
* @param sortOrder sort order
24+
*/
1725
public CategoryFormXmlData(
1826
@NotNull final String fieldSetName,
1927
@NotNull final String fieldName,

src/com/magento/idea/magento2plugin/actions/generation/data/EavEntityDataInterface.java

+5
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.data;
27

38
import java.util.Map;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public OptionsPanelVisibilityChangeListener(
3030
public void itemStateChanged(final ItemEvent itemEvent) {
3131
final String selectedSource = itemEvent.getItem().toString();
3232

33-
final ComboBoxItemData selectedInputItem = (ComboBoxItemData) inputComboBox.getSelectedItem();
33+
final ComboBoxItemData selectedInputItem =
34+
(ComboBoxItemData) inputComboBox.getSelectedItem();
3435
final String selectedInput = selectedInputItem == null ? "" : selectedInputItem.toString();
3536

3637
final boolean isAttributeWithoutSource =

src/com/magento/idea/magento2plugin/actions/generation/eavattribute/NewCategoryEavAttributeAction.java

+5
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.eavattribute;
27

38
import com.intellij.openapi.project.Project;

src/com/magento/idea/magento2plugin/actions/generation/generator/CategoryFormXmlGenerator.java

+23-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
import com.intellij.psi.xml.XmlFile;
1717
import com.intellij.psi.xml.XmlTag;
1818
import com.magento.idea.magento2plugin.actions.generation.data.CategoryFormXmlData;
19-
import com.magento.idea.magento2plugin.actions.generation.generator.util.*;
19+
import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
20+
import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
21+
import com.magento.idea.magento2plugin.actions.generation.generator.util.GetCodeTemplateUtil;
22+
import com.magento.idea.magento2plugin.actions.generation.generator.util.XmlFilePositionUtil;
2023
import com.magento.idea.magento2plugin.bundles.CommonBundle;
2124
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
2225
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
@@ -45,6 +48,13 @@ public class CategoryFormXmlGenerator extends FileGenerator {
4548
private final CommonBundle commonBundle;
4649
private boolean allowedFieldsetNodeInclude = true;
4750

51+
/**
52+
* Category form XML Generator.
53+
*
54+
* @param categoryFormXmlData Category form data class
55+
* @param project Project
56+
* @param moduleName module name
57+
*/
4858
public CategoryFormXmlGenerator(
4959
final @NotNull CategoryFormXmlData categoryFormXmlData,
5060
final @NotNull Project project,
@@ -141,11 +151,11 @@ private PsiDirectory getFileDirectory() {
141151
new ModuleIndex(project).getModuleDirectoryByModuleName(moduleName);
142152

143153
for (final String handlerDirectory: CategoryFormXmlFile.DIRECTORY.split(File.separator)) {
144-
directory = directoryGenerator.findOrCreateSubdirectory(
145-
directory,
146-
handlerDirectory
147-
);
148-
}
154+
directory = directoryGenerator.findOrCreateSubdirectory(
155+
directory,
156+
handlerDirectory
157+
);
158+
}
149159
return directory;
150160
}
151161

@@ -190,9 +200,14 @@ private List<XmlTag> findFieldsetTagsInRoot(final XmlTag rootTag) {
190200
}
191201

192202
@Nullable
193-
private XmlTag findMatchedFieldsetByName(final List<XmlTag> fieldsetList, final String fieldsetName) {
203+
private XmlTag findMatchedFieldsetByName(
204+
final List<XmlTag> fieldsetList,
205+
final String fieldsetName
206+
) {
194207
for (final XmlTag fieldset: fieldsetList) {
195-
final String attributeValue = fieldset.getAttributeValue(CategoryFormXmlFile.XML_ATTR_FIELDSET_NAME);
208+
final String attributeValue = fieldset.getAttributeValue(
209+
CategoryFormXmlFile.XML_ATTR_FIELDSET_NAME
210+
);
196211
if (attributeValue != null && attributeValue.equals(fieldsetName)) {
197212
return fieldset;
198213
}

src/com/magento/idea/magento2plugin/actions/generation/generator/util/GetAttributeOptionPropertiesUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.jetbrains.annotations.NotNull;
1212

1313
public final class GetAttributeOptionPropertiesUtil {
14-
public final static String OPTION_VALUE = "Value";
15-
public final static String OPTION_SORT_ORDER = "Sort Order";
14+
public static final String OPTION_VALUE = "Value";
15+
public static final String OPTION_SORT_ORDER = "Sort Order";
1616

1717
private GetAttributeOptionPropertiesUtil() {}
1818

src/com/magento/idea/magento2plugin/actions/generation/generator/util/eav/AttributeMapperInterface.java

+5
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.generator.util.eav;
27

38
import com.magento.idea.magento2plugin.actions.generation.data.EavEntityDataInterface;

src/com/magento/idea/magento2plugin/magento/packages/uicomponent/AvailableSourcesByInput.java

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ public AvailableSourcesByInput(@NotNull final String input) {
1919
this.input = input;
2020
}
2121

22+
/**
23+
* Source items getter.
24+
*
25+
* @return List
26+
*/
2227
public List<ComboBoxItemData> getItems() {
2328
final List<ComboBoxItemData> items = new ArrayList<>();
2429
final ComboBoxItemData generateSourceItem = new ComboBoxItemData(

src/com/magento/idea/magento2plugin/reference/js/JsReferenceContributor.java

+12-6
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,40 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.reference.js;
67

8+
import static com.intellij.patterns.StandardPatterns.string;
9+
710
import com.intellij.lang.javascript.patterns.JSPatterns;
8-
import com.intellij.psi.*;
11+
import com.intellij.psi.PsiReferenceContributor;
12+
import com.intellij.psi.PsiReferenceRegistrar;
913
import com.magento.idea.magento2plugin.reference.provider.FilePathReferenceProvider;
1014
import com.magento.idea.magento2plugin.reference.provider.ModuleNameReferenceProvider;
1115
import com.magento.idea.magento2plugin.reference.provider.RequireJsPreferenceReferenceProvider;
1216
import com.magento.idea.magento2plugin.util.RegExUtil;
1317
import org.jetbrains.annotations.NotNull;
1418

15-
import static com.intellij.patterns.StandardPatterns.string;
16-
1719
public class JsReferenceContributor extends PsiReferenceContributor {
1820
@Override
19-
public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) {
21+
public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) {
2022
registrar.registerReferenceProvider(
2123
JSPatterns.jsLiteralExpression()
2224
.withText(string().matches(".*" + RegExUtil.Magento.MODULE_NAME + ".*")),
2325
new ModuleNameReferenceProvider()
2426
);
2527

2628
registrar.registerReferenceProvider(
27-
JSPatterns.jsLiteralExpression().withText(string().matches(".*\\W" + RegExUtil.FILE_PATH + ".*")),
29+
JSPatterns.jsLiteralExpression().withText(
30+
string().matches(".*\\W" + RegExUtil.FILE_PATH + ".*")
31+
),
2832
new FilePathReferenceProvider()
2933
);
3034

3135
registrar.registerReferenceProvider(
32-
JSPatterns.jsLiteralExpression().withText(string().matches(".*\\W" + RegExUtil.FILE_PATH + ".*")),
36+
JSPatterns.jsLiteralExpression().withText(
37+
string().matches(".*\\W" + RegExUtil.FILE_PATH + ".*")
38+
),
3339
new RequireJsPreferenceReferenceProvider()
3440
);
3541
}

src/com/magento/idea/magento2plugin/stubs/indexes/xml/ProductTypeIndex.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
import com.intellij.psi.xml.XmlDocument;
1111
import com.intellij.psi.xml.XmlFile;
1212
import com.intellij.psi.xml.XmlTag;
13-
import com.intellij.util.indexing.*;
13+
import com.intellij.util.indexing.DataIndexer;
14+
import com.intellij.util.indexing.FileBasedIndex;
15+
import com.intellij.util.indexing.FileContent;
16+
import com.intellij.util.indexing.ID;
17+
import com.intellij.util.indexing.ScalarIndexExtension;
1418
import com.intellij.util.io.EnumeratorStringDescriptor;
1519
import com.intellij.util.io.KeyDescriptor;
1620
import com.magento.idea.magento2plugin.magento.files.ProductTypeXml;
@@ -20,7 +24,7 @@
2024
import org.jetbrains.annotations.NotNull;
2125

2226
public class ProductTypeIndex extends ScalarIndexExtension<String> {
23-
private final static String TEST_DIRECTORY_PATTERN = ".*\\/[Tt]ests?\\/?.*";
27+
private static final String TEST_DIRECTORY_PATTERN = ".*\\/[Tt]ests?\\/?.*";
2428
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
2529
public static final ID<String, Void> KEY = ID.create(
2630
"com.magento.idea.magento2plugin.stubs.indexes.product_types");
@@ -69,7 +73,9 @@ DataIndexer<String, Void, FileContent> getIndexer() {
6973

7074
private void parseRootTag(final Map<String, Void> map, final XmlTag xmlRootTag) {
7175
for (final XmlTag productTypeTag : xmlRootTag.findSubTags(ProductTypeXml.XML_TAG_TYPE)) {
72-
final String productTypeName = productTypeTag.getAttributeValue(ProductTypeXml.XML_ATTRIBUTE_NAME);
76+
final String productTypeName = productTypeTag.getAttributeValue(
77+
ProductTypeXml.XML_ATTRIBUTE_NAME
78+
);
7379
map.put(productTypeName, null);
7480
}
7581
}
@@ -86,6 +92,7 @@ public int getVersion() {
8692
}
8793

8894
@Override
95+
@SuppressWarnings({"PMD.LiteralsFirstInComparisons"})
8996
public FileBasedIndex.InputFilter getInputFilter() {
9097
return file ->
9198
file.getFileType() == XmlFileType.INSTANCE

src/com/magento/idea/magento2plugin/util/magento/GetProductTypesListUtil.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@
1212
import java.util.List;
1313
import java.util.stream.Collectors;
1414

15-
public final class GetProductTypesListUtil
16-
{
15+
public final class GetProductTypesListUtil {
16+
1717
private GetProductTypesListUtil() {}
1818

19+
/**
20+
* Product types util.
21+
*
22+
* @param project Project
23+
* @return List
24+
*/
1925
public static List<String> execute(final Project project) {
2026
final Collection<String> productTypesList =
2127
FileBasedIndex.getInstance().getAllKeys(ProductTypeIndex.KEY, project);

tests/com/magento/idea/magento2plugin/actions/generation/generator/CategoryAttributePropertySetupPatchGeneratorTest.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
public class CategoryAttributePropertySetupPatchGeneratorTest extends BaseGeneratorTestCase {
1616

17-
private final static String MODULE_NAME = "Foo_Bar";
17+
private static final String MODULE_NAME = "Foo_Bar";
1818

19+
/**
20+
* Tests the generated patch file.
21+
*/
1922
public void testGenerateFile() {
2023
final Project project = myFixture.getProject();
2124

@@ -41,9 +44,16 @@ public void testGenerateFile() {
4144
final String filePatch = this.getFixturePath("AddTestAttributeCategoryAttribute.php");
4245
final PsiFile expectedFile = myFixture.configureByFile(filePatch);
4346

44-
assertGeneratedFileIsCorrect(expectedFile, "src/app/code/Foo/Bar/Setup/Patch/Data", dataPatchFile);
47+
assertGeneratedFileIsCorrect(
48+
expectedFile,
49+
"src/app/code/Foo/Bar/Setup/Patch/Data",
50+
dataPatchFile
51+
);
4552
}
4653

54+
/**
55+
* Tests the generated form file.
56+
*/
4757
public void testGenerateFormFile() {
4858
final Project project = myFixture.getProject();
4959

@@ -75,6 +85,10 @@ public void testGenerateFormFile() {
7585
final String fileCategoryForm = this.getFixturePath("category_form.xml");
7686
final PsiFile expectedCategoryFile = myFixture.configureByFile(fileCategoryForm);
7787

78-
assertGeneratedFileIsCorrect(expectedCategoryFile, "src/app/code/Foo/Bar/view/adminhtml/ui_component", categoryForm);
88+
assertGeneratedFileIsCorrect(
89+
expectedCategoryFile,
90+
"src/app/code/Foo/Bar/view/adminhtml/ui_component",
91+
categoryForm
92+
);
7993
}
8094
}

0 commit comments

Comments
 (0)