Skip to content

Commit f272abf

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

File tree

3 files changed

+41
-34
lines changed

3 files changed

+41
-34
lines changed

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
package com.magento.idea.magento2plugin.actions.generation.dialog;
6+
package com.magento.idea.magento2plugin.actions.generation.dialog;//NOPMD
77

88
import com.intellij.openapi.project.Project;
99
import com.intellij.psi.PsiDirectory;
@@ -44,7 +44,7 @@
4444
import org.jetbrains.annotations.NotNull;
4545

4646
@SuppressWarnings({"PMD.TooManyFields", "PMD.DataClass", "PMD.UnusedPrivateMethod"})
47-
public class NewModuleDialog extends AbstractDialog implements ListSelectionListener {
47+
public class NewModuleDialog extends AbstractDialog implements ListSelectionListener {//NOPMD
4848
@NotNull
4949
private final Project project;
5050
@NotNull
@@ -100,25 +100,29 @@ public NewModuleDialog(
100100
moduleLicenseCustom.setText(Settings.getDefaultLicenseName(project));
101101

102102
buttonOK.addActionListener(new ActionListener() {
103+
@Override
103104
public void actionPerformed(final ActionEvent event) {
104105
onOK();
105106
}
106107
});
107108

108109
buttonCancel.addActionListener(new ActionListener() {
110+
@Override
109111
public void actionPerformed(final ActionEvent event) {
110112
onCancel();
111113
}
112114
});
113115

114116
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
115117
addWindowListener(new WindowAdapter() {
118+
@Override
116119
public void windowClosing(final WindowEvent event) {
117120
onCancel();
118121
}
119122
});
120123

121124
contentPane.registerKeyboardAction(new ActionListener() {
125+
@Override
122126
public void actionPerformed(final ActionEvent event) {
123127
onCancel();
124128
}

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
package com.magento.idea.magento2plugin.actions.generation.dialog;
6+
package com.magento.idea.magento2plugin.actions.generation.dialog;//NOPMD
77

88
import com.intellij.openapi.project.Project;
99
import com.intellij.psi.PsiFile;
@@ -40,7 +40,7 @@
4040
import org.jetbrains.annotations.NotNull;
4141

4242
@SuppressWarnings({"PMD.TooManyFields", "PMD.DataClass", "PMD.UnusedPrivateMethod"})
43-
public class OverrideClassByAPreferenceDialog extends AbstractDialog {
43+
public class OverrideClassByAPreferenceDialog extends AbstractDialog {//NOPMD
4444
@NotNull
4545
private final Project project;
4646
private final PhpClass targetClass;
@@ -92,25 +92,29 @@ public OverrideClassByAPreferenceDialog(
9292
suggestPreferenceDirectory(targetClass);
9393

9494
buttonOK.addActionListener(new ActionListener() {
95+
@Override
9596
public void actionPerformed(final ActionEvent event) {
9697
onOK();
9798
}
9899
});
99100

100101
buttonCancel.addActionListener(new ActionListener() {
102+
@Override
101103
public void actionPerformed(final ActionEvent event) {
102104
onCancel();
103105
}
104106
});
105107

106108
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
107109
addWindowListener(new WindowAdapter() {
110+
@Override
108111
public void windowClosing(final WindowEvent event) {
109112
onCancel();
110113
}
111114
});
112115

113116
contentPane.registerKeyboardAction(new ActionListener() {
117+
@Override
114118
public void actionPerformed(final ActionEvent event) {
115119
onCancel();
116120
}

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

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,21 @@ public class ObserverClassGenerator extends FileGenerator {
3636
private final DirectoryGenerator directoryGenerator;
3737
private final FileFromTemplateGenerator fileFromTemplateGenerator;
3838
private final GetFirstClassOfFile getFirstClassOfFile;
39-
private ObserverFileData observerFileData;
40-
private Project project;
41-
private ValidatorBundle validatorBundle;
42-
private CommonBundle commonBundle;
39+
private final ObserverFileData observerFileData;
40+
private final Project project;
41+
private final ValidatorBundle validatorBundle;
42+
private final CommonBundle commonBundle;
4343

4444
/**
4545
* Constructor.
4646
*
4747
* @param observerFileData ObserverFileData
4848
* @param project Project
4949
*/
50-
public ObserverClassGenerator(ObserverFileData observerFileData, Project project) {
50+
public ObserverClassGenerator(
51+
final ObserverFileData observerFileData,
52+
final Project project
53+
) {
5154
super(project);
5255
this.observerFileData = observerFileData;
5356
this.project = project;
@@ -60,7 +63,7 @@ public ObserverClassGenerator(ObserverFileData observerFileData, Project project
6063
}
6164

6265
@Override
63-
public PsiFile generate(String actionName) {
66+
public PsiFile generate(final String actionName) {
6467
WriteCommandAction.runWriteCommandAction(project, () -> {
6568
PhpClass observerClass = GetPhpClassByFQN.getInstance(project).execute(
6669
observerFileData.getObserverClassFqn()
@@ -71,7 +74,7 @@ public PsiFile generate(String actionName) {
7174
}
7275

7376
if (observerClass == null) {
74-
String errorMessage = validatorBundle.message(
77+
final String errorMessage = validatorBundle.message(
7578
"validator.file.cantBeCreated",
7679
"Observer Class"
7780
);
@@ -85,39 +88,40 @@ public PsiFile generate(String actionName) {
8588
return;
8689
}
8790

88-
Properties attributes = new Properties();
91+
final Properties attributes = new Properties();
8992
attributes.setProperty("EVENT_NAME", observerFileData.getTargetEvent());
9093

91-
String methodTemplate = PhpCodeUtil.getCodeTemplate(
94+
final String methodTemplate = PhpCodeUtil.getCodeTemplate(
9295
Observer.OBSERVER_EXECUTE_TEMPLATE_NAME, attributes, project);
9396

9497

95-
PsiFile observerFile = observerClass.getContainingFile();
96-
CodeStyleSettings codeStyleSettings = new CodeStyleSettings((PhpFile) observerFile);
98+
final PsiFile observerFile = observerClass.getContainingFile();
99+
final CodeStyleSettings codeStyleSettings =
100+
new CodeStyleSettings((PhpFile) observerFile);
97101
codeStyleSettings.adjustBeforeWrite();
98102

99-
PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
100-
Document document = psiDocumentManager.getDocument(observerFile);
101-
int insertPos = getInsertPos(observerClass);
103+
final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
104+
final Document document = psiDocumentManager.getDocument(observerFile);
105+
final int insertPos = getInsertPos(observerClass);
102106
document.insertString(insertPos, methodTemplate);
103-
int endPos = insertPos + methodTemplate.length() + 1;
107+
final int endPos = insertPos + methodTemplate.length() + 1;
104108
CodeStyleManager.getInstance(project).reformatText(observerFile, insertPos, endPos);
105109
psiDocumentManager.commitDocument(document);
106110
codeStyleSettings.restore();
107111
});
108-
PhpClass observerClass = GetPhpClassByFQN.getInstance(project).execute(
112+
final PhpClass observerClass = GetPhpClassByFQN.getInstance(project).execute(
109113
observerFileData.getObserverClassFqn()
110114
);
111115
return observerClass.getContainingFile();
112116
}
113117

114-
private int getInsertPos(PhpClass observerClass) {
118+
private int getInsertPos(final PhpClass observerClass) {
115119
int insertPos = -1;
116-
LeafPsiElement[] leafElements = PsiTreeUtil.getChildrenOfType(
120+
final LeafPsiElement[] leafElements = PsiTreeUtil.getChildrenOfType(
117121
observerClass,
118122
LeafPsiElement.class
119123
);
120-
for (LeafPsiElement leafPsiElement: leafElements) {
124+
for (final LeafPsiElement leafPsiElement: leafElements) {
121125
if (!leafPsiElement.getText().equals(MagentoPhpClass.CLOSING_TAG)) {
122126
continue;
123127
}
@@ -126,20 +130,20 @@ private int getInsertPos(PhpClass observerClass) {
126130
return insertPos;
127131
}
128132

129-
private PhpClass createObserverClass(String actionName) {
133+
private PhpClass createObserverClass(final String actionName) {
130134
PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
131135
.getModuleDirectoryByModuleName(observerFileData.getObserverModule());
132-
String[] observerDirectories = observerFileData.getObserverDirectory()
136+
final String[] observerDirectories = observerFileData.getObserverDirectory()
133137
.split(File.separator);
134-
for (String observerDirectory: observerDirectories) {
138+
for (final String observerDirectory: observerDirectories) {
135139
parentDirectory = directoryGenerator.findOrCreateSubdirectory(
136140
parentDirectory,
137141
observerDirectory
138142
);
139143
}
140144

141-
Properties attributes = getAttributes();
142-
PsiFile observerFile = fileFromTemplateGenerator.generate(
145+
final Properties attributes = getAttributes();
146+
final PsiFile observerFile = fileFromTemplateGenerator.generate(
143147
new Observer(observerFileData.getObserverClassName()),
144148
attributes,
145149
parentDirectory,
@@ -152,13 +156,8 @@ private PhpClass createObserverClass(String actionName) {
152156
}
153157

154158
@Override
155-
protected void fillAttributes(Properties attributes) {
159+
protected void fillAttributes(final Properties attributes) {
156160
attributes.setProperty("NAME", observerFileData.getObserverClassName());
157161
attributes.setProperty("NAMESPACE", observerFileData.getNamespace());
158162
}
159-
160-
private boolean checkIfMethodExist(PhpClass observerClass, String methodName) {
161-
return observerClass.getMethods().stream().anyMatch((method)
162-
-> method.getName().equals(methodName));
163-
}
164163
}

0 commit comments

Comments
 (0)