Skip to content

Commit 4417342

Browse files
author
Vitaliy Boyko
committed
Static fixes
1 parent 9282a84 commit 4417342

File tree

6 files changed

+73
-23
lines changed

6 files changed

+73
-23
lines changed

‎src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverEventsXmlGenerator.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ public class ObserverEventsXmlGenerator extends FileGenerator {
3333
* @param observerEventsXmlData ObserverEventsXmlData
3434
* @param project Project
3535
*/
36-
public ObserverEventsXmlGenerator(final ObserverEventsXmlData observerEventsXmlData, final Project project) {
36+
public ObserverEventsXmlGenerator(
37+
final ObserverEventsXmlData observerEventsXmlData,
38+
final Project project
39+
) {
3740
super(project);
3841
this.observerEventsXmlData = observerEventsXmlData;
3942
this.project = project;
@@ -60,18 +63,23 @@ public PsiFile generate(final String actionName) {
6063
WriteCommandAction.runWriteCommandAction(project, () -> {
6164
final StringBuffer textBuf = new StringBuffer();
6265
try {
63-
textBuf.append(getCodeTemplate.execute(ModuleEventsXml.TEMPLATE_OBSERVER, getAttributes()));
66+
textBuf.append(getCodeTemplate.execute(
67+
ModuleEventsXml.TEMPLATE_OBSERVER,
68+
getAttributes())
69+
);
6470
} catch (IOException event) {
6571
return;
6672
}
6773

6874
final int insertPos = positionUtil.getRootInsertPosition((XmlFile) eventsXmlFile);
6975
if (textBuf.length() > 0 && insertPos >= 0) {
70-
final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
76+
final PsiDocumentManager psiDocumentManager =
77+
PsiDocumentManager.getInstance(project);
7178
final Document document = psiDocumentManager.getDocument(eventsXmlFile);
7279
document.insertString(insertPos, textBuf);
7380
final int endPos = insertPos + textBuf.length() + 1;
74-
CodeStyleManager.getInstance(project).reformatText(eventsXmlFile, insertPos, endPos);
81+
CodeStyleManager.getInstance(project)
82+
.reformatText(eventsXmlFile, insertPos, endPos);
7583
psiDocumentManager.commitDocument(document);
7684
}
7785
});

‎src/com/magento/idea/magento2plugin/actions/generation/generator/PluginDiXmlGenerator.java‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import com.intellij.psi.PsiFile;
1313
import com.intellij.psi.codeStyle.CodeStyleManager;
1414
import com.intellij.psi.util.PsiTreeUtil;
15-
import com.intellij.psi.xml.*;
15+
import com.intellij.psi.xml.XmlAttribute;
16+
import com.intellij.psi.xml.XmlAttributeValue;
17+
import com.intellij.psi.xml.XmlFile;
18+
import com.intellij.psi.xml.XmlTag;
1619
import com.jetbrains.php.lang.PhpLangUtil;
1720
import com.magento.idea.magento2plugin.actions.generation.data.PluginDiXmlData;
1821
import com.magento.idea.magento2plugin.actions.generation.generator.util.FindOrCreateDiXml;
@@ -36,10 +39,13 @@ public class PluginDiXmlGenerator extends FileGenerator {
3639
/**
3740
* Constructor.
3841
*
39-
* @param pluginFileData
40-
* @param project
42+
* @param pluginFileData PluginDiXmlData
43+
* @param project Project
4144
*/
42-
public PluginDiXmlGenerator(final @NotNull PluginDiXmlData pluginFileData, final Project project) {
45+
public PluginDiXmlGenerator(
46+
final @NotNull PluginDiXmlData pluginFileData,
47+
final Project project
48+
) {
4349
super(project);
4450
this.pluginFileData = pluginFileData;
4551
this.project = project;
@@ -56,7 +62,11 @@ public PluginDiXmlGenerator(final @NotNull PluginDiXmlData pluginFileData, final
5662
*/
5763
@Override
5864
public PsiFile generate(final String actionName) {
59-
final PsiFile diXmlFile = findOrCreateDiXml.execute(actionName, pluginFileData.getPluginModule(), pluginFileData.getArea());
65+
final PsiFile diXmlFile = findOrCreateDiXml.execute(
66+
actionName,
67+
pluginFileData.getPluginModule(),
68+
pluginFileData.getArea()
69+
);
6070
final XmlAttributeValue typeAttributeValue = getTypeAttributeValue((XmlFile) diXmlFile);
6171
boolean isPluginDeclared = false;
6272
this.isTypeDeclared = false;
@@ -70,16 +80,23 @@ public PsiFile generate(final String actionName) {
7080
WriteCommandAction.runWriteCommandAction(project, () -> {
7181
final StringBuffer textBuf = new StringBuffer();
7282
try {
73-
textBuf.append(getCodeTemplate.execute(ModuleDiXml.TEMPLATE_PLUGIN, getAttributes()));
83+
textBuf.append(getCodeTemplate.execute(
84+
ModuleDiXml.TEMPLATE_PLUGIN,
85+
getAttributes())
86+
);
7487
} catch (IOException e) {
7588
return;
7689
}
7790

7891
final int insertPos = isTypeDeclared
79-
? positionUtil.getEndPositionOfTag(PsiTreeUtil.getParentOfType(typeAttributeValue, XmlTag.class))
92+
? positionUtil.getEndPositionOfTag(PsiTreeUtil.getParentOfType(
93+
typeAttributeValue,
94+
XmlTag.class
95+
))
8096
: positionUtil.getRootInsertPosition((XmlFile) diXmlFile);
8197
if (textBuf.length() > 0 && insertPos >= 0) {
82-
final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
98+
final PsiDocumentManager psiDocumentManager =
99+
PsiDocumentManager.getInstance(project);
83100
final Document document = psiDocumentManager.getDocument(diXmlFile);
84101
document.insertString(insertPos, textBuf);
85102
final int endPos = insertPos + textBuf.length() + 1;
@@ -101,7 +118,10 @@ private boolean isPluginDeclared(final XmlAttributeValue typeAttributeValue) {
101118
if (!child.getName().equals(ModuleDiXml.PLUGIN_TAG_NAME)) {
102119
continue;
103120
}
104-
final XmlAttribute[] xmlAttributes = PsiTreeUtil.getChildrenOfType(child, XmlAttribute.class);
121+
final XmlAttribute[] xmlAttributes = PsiTreeUtil.getChildrenOfType(
122+
child,
123+
XmlAttribute.class
124+
);
105125
for (final XmlAttribute xmlAttribute: xmlAttributes) {
106126
if (!xmlAttribute.getName().equals(ModuleDiXml.PLUGIN_TYPE_ATTRIBUTE)) {
107127
continue;
@@ -117,7 +137,12 @@ private boolean isPluginDeclared(final XmlAttributeValue typeAttributeValue) {
117137
}
118138

119139
private XmlAttributeValue getTypeAttributeValue(final XmlFile diXml) {
120-
final Collection<XmlAttributeValue> pluginTypes = XmlPsiTreeUtil.findAttributeValueElements(diXml, ModuleDiXml.PLUGIN_TYPE_TAG, ModuleDiXml.PLUGIN_TYPE_ATTR_NAME);
140+
final Collection<XmlAttributeValue> pluginTypes =
141+
XmlPsiTreeUtil.findAttributeValueElements(
142+
diXml,
143+
ModuleDiXml.PLUGIN_TYPE_TAG,
144+
ModuleDiXml.PLUGIN_TYPE_ATTR_NAME
145+
);
121146
final String pluginClassFqn = pluginFileData.getTargetClass().getPresentableFQN();
122147
for (final XmlAttributeValue pluginType: pluginTypes) {
123148
if (PhpLangUtil.toPresentableFQN(pluginType.getValue()).equals(pluginClassFqn)) {

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.actions.generation.generator.util;
67

78
import com.intellij.openapi.project.Project;
@@ -32,16 +33,19 @@ public FindOrCreateDiXml(final Project project) {
3233
*/
3334
public PsiFile execute(final String actionName, final String moduleName, final String area) {
3435
final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
35-
final FileFromTemplateGenerator fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
36+
final FileFromTemplateGenerator fileFromTemplateGenerator =
37+
FileFromTemplateGenerator.getInstance(project);
3638

37-
PsiDirectory parentDirectory = ModuleIndex.getInstance(project).getModuleDirectoryByModuleName(moduleName);
39+
PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
40+
.getModuleDirectoryByModuleName(moduleName);
3841
final ArrayList<String> fileDirectories = new ArrayList<>();
3942
fileDirectories.add(Package.moduleBaseAreaDir);
4043
if (!getArea(area).equals(Areas.base)) {
4144
fileDirectories.add(getArea(area).toString());
4245
}
4346
for (final String fileDirectory: fileDirectories) {
44-
parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, fileDirectory);
47+
parentDirectory = directoryGenerator
48+
.findOrCreateSubdirectory(parentDirectory, fileDirectory);
4549
}
4650
final ModuleDiXml moduleDiXml = new ModuleDiXml();
4751
PsiFile diXml = FileBasedIndexUtil.findModuleConfigFile(
@@ -51,7 +55,12 @@ public PsiFile execute(final String actionName, final String moduleName, final S
5155
project
5256
);
5357
if (diXml == null) {
54-
diXml = fileFromTemplateGenerator.generate(moduleDiXml, new Properties(), parentDirectory, actionName);
58+
diXml = fileFromTemplateGenerator.generate(
59+
moduleDiXml,
60+
new Properties(),
61+
parentDirectory,
62+
actionName
63+
);
5564
}
5665
return diXml;
5766
}

‎src/com/magento/idea/magento2plugin/magento/packages/Package.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.magento.idea.magento2plugin.magento.packages;
77

8-
public class Package {//NOPMD
8+
public class Package { //NOPMD
99
public static String packagesRoot = "app/code";
1010
public static String libWebRoot = "lib/web";
1111
public static String frameworkRootComposer = "vendor/magento/framework";

‎src/com/magento/idea/magento2plugin/util/magento/MagentoBasePathUtil.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ public static boolean isMagentoFolderValid(final String path) {
2828
}
2929
final VirtualFile file = LocalFileSystem.getInstance().findFileByPath(path);
3030
if (file != null && file.isDirectory()) {
31-
return VfsUtil.findRelativeFile(file, Package.frameworkRootComposer.split(File.separator)) != null
32-
|| VfsUtil.findRelativeFile(file, Package.frameworkRootGit.split(File.separator)) != null;
31+
return VfsUtil.findRelativeFile(
32+
file,
33+
Package.frameworkRootComposer.split(File.separator)
34+
) != null
35+
|| VfsUtil.findRelativeFile(
36+
file,
37+
Package.frameworkRootGit.split(File.separator)) != null;
3338
}
3439
return false;
3540
}

‎src/com/magento/idea/magento2plugin/util/magento/MagentoVersion.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
@@ -46,7 +46,10 @@ public static String get(final Project project, final String magentoPath) {
4646

4747
if (composerFile instanceof JsonFile) {
4848
final JsonFile composerJsonFile = (JsonFile) composerFile;
49-
final JsonObject jsonObject = PsiTreeUtil.getChildOfType(composerJsonFile, JsonObject.class);
49+
final JsonObject jsonObject = PsiTreeUtil.getChildOfType(
50+
composerJsonFile,
51+
JsonObject.class
52+
);
5053

5154
if (jsonObject == null) {
5255
return DEFAULT_VERSION;

0 commit comments

Comments
 (0)