Skip to content

Commit bfd0b99

Browse files
anzinanzin
committed
1139: Fixed Static Tests
1 parent c399bd5 commit bfd0b99

File tree

4 files changed

+48
-38
lines changed

4 files changed

+48
-38
lines changed

‎src/com/magento/idea/magento2plugin/actions/context/php/NewSetupDataPatchAction.java‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.intellij.psi.PsiDirectory;
1010
import com.intellij.psi.PsiFile;
1111
import com.magento.idea.magento2plugin.actions.context.CustomGeneratorContextAction;
12-
import com.magento.idea.magento2plugin.actions.generation.dialog.NewSetupDataPatch.NewSetupDataPatchDialog;
12+
import com.magento.idea.magento2plugin.actions.generation.dialog.NewSetupDataPatchDialog;
1313
import com.magento.idea.magento2plugin.magento.packages.ComponentType;
1414
import com.magento.idea.magento2plugin.magento.packages.Package;
1515
import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
@@ -57,12 +57,24 @@ protected boolean isVisible(
5757
if (!moduleData.getType().equals(ComponentType.module)) {
5858
return false;
5959
}
60+
final String targetDirName = targetDirectory.getName();
61+
62+
if (!(ROOT_DIRECTORY.equals(targetDirName) || PATCH_DIRECTORY.equals(targetDirName)
63+
|| DATA_DIRECTORY.equals(targetDirName))
64+
) {
65+
return false;
66+
}
67+
6068
final PsiDirectory parentDirFirst = targetDirectory.getParentDirectory();
61-
final PsiDirectory parentDirSecond = parentDirFirst != null ?
62-
parentDirFirst.getParentDirectory() : null;
69+
PsiDirectory parentDirSecond = null;
70+
71+
if (parentDirFirst != null) {
72+
parentDirSecond = parentDirFirst.getParentDirectory();
73+
}
74+
6375

64-
return targetDirectory.getName().equals(ROOT_DIRECTORY) ||
65-
(parentDirFirst != null && parentDirFirst.getName().equals(ROOT_DIRECTORY)) ||
66-
(parentDirSecond != null && parentDirSecond.getName().equals(ROOT_DIRECTORY));
76+
return ROOT_DIRECTORY.equals(targetDirName)
77+
|| parentDirFirst != null && ROOT_DIRECTORY.equals(parentDirFirst.getName())
78+
|| parentDirSecond != null && ROOT_DIRECTORY.equals(parentDirSecond.getName());
6779
}
6880
}

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewSetupDataPatch/NewSetupDataPatchDialog.form‎ renamed to ‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewSetupDataPatchDialog.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.magento.idea.magento2plugin.actions.generation.dialog.NewSetupDataPatch.NewSetupDataPatchDialog">
2+
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.magento.idea.magento2plugin.actions.generation.dialog.NewSetupDataPatchDialog">
33
<grid id="1871d" binding="contentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="10" left="10" bottom="10" right="10"/>
55
<constraints>

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewSetupDataPatch/NewSetupDataPatchDialog.java‎ renamed to ‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewSetupDataPatchDialog.java‎

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

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

88
import com.intellij.openapi.project.Project;
99
import com.intellij.psi.PsiDirectory;
1010
import com.intellij.psi.PsiFile;
1111
import com.magento.idea.magento2plugin.actions.context.php.NewSetupDataPatchAction;
1212
import com.magento.idea.magento2plugin.actions.generation.ModuleSetupDataPatchData;
13-
import com.magento.idea.magento2plugin.actions.generation.dialog.AbstractDialog;
1413
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
1514
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
1615
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
1716
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
1817
import com.magento.idea.magento2plugin.actions.generation.generator.ModuleSetupDataPatchGenerator;
1918
import com.magento.idea.magento2plugin.magento.files.ModuleSetupDataPatchFile;
20-
21-
19+
import java.awt.event.ActionEvent;
20+
import java.awt.event.KeyEvent;
21+
import java.awt.event.WindowAdapter;
22+
import java.awt.event.WindowEvent;
23+
import java.util.Objects;
2224
import javax.swing.JButton;
2325
import javax.swing.JComponent;
2426
import javax.swing.JLabel;
2527
import javax.swing.JPanel;
2628
import javax.swing.JTextField;
2729
import javax.swing.KeyStroke;
28-
import java.awt.event.ActionEvent;
29-
import java.awt.event.KeyEvent;
30-
import java.awt.event.WindowAdapter;
31-
import java.awt.event.WindowEvent;
32-
import java.util.Objects;
3330

3431
public class NewSetupDataPatchDialog extends AbstractDialog {
3532

@@ -48,8 +45,8 @@ public class NewSetupDataPatchDialog extends AbstractDialog {
4845
@FieldValidation(rule = RuleRegistry.PHP_CLASS,
4946
message = {PhpClassRule.MESSAGE, CLASS_NAME})
5047
private JTextField className;
51-
private JLabel classNameLabel;
52-
private JLabel classNameErrorMessage;
48+
private JLabel classNameLabel;//NOPMD
49+
private JLabel classNameErrorMessage;//NOPMD
5350

5451

5552
/**
@@ -61,8 +58,8 @@ public class NewSetupDataPatchDialog extends AbstractDialog {
6158
public NewSetupDataPatchDialog(
6259
final Project project,
6360
final PsiDirectory directory,
64-
String modulePackage,
65-
String moduleName
61+
final String modulePackage,
62+
final String moduleName
6663
) {
6764
super();
6865

@@ -109,8 +106,8 @@ public void windowClosing(final WindowEvent event) {
109106
public static void open(
110107
final Project project,
111108
final PsiDirectory directory,
112-
String modulePackage,
113-
String moduleName
109+
final String modulePackage,
110+
final String moduleName
114111
) {
115112
final NewSetupDataPatchDialog dialog = new NewSetupDataPatchDialog(
116113
project,
@@ -149,11 +146,11 @@ public String getClassName() {
149146
}
150147

151148
private boolean validateFields() {
152-
PsiDirectory targetDirectory = getDirectory(baseDir);
149+
final PsiDirectory targetDirectory = getDirectory(baseDir);
153150

154-
if (targetDirectory.getName().equals(NewSetupDataPatchAction.DATA_DIRECTORY)) {
151+
if (NewSetupDataPatchAction.DATA_DIRECTORY.equals(targetDirectory.getName())) {
155152
final PsiFile[] files = targetDirectory.getFiles();
156-
for (PsiFile file : files) {
153+
for (final PsiFile file : files) {
157154
if (file.getName().equals(getClassName() + ModuleSetupDataPatchFile.FILE_NAME)) {
158155
showErrorMessage(
159156
fieldsValidationsList.get(0).getField(),
@@ -167,34 +164,35 @@ private boolean validateFields() {
167164
return validateFormFields();
168165
}
169166

170-
private PsiDirectory getDirectory(PsiDirectory targetDirectory){
171-
if(baseDir.getName().equals(NewSetupDataPatchAction.ROOT_DIRECTORY)) {
172-
PsiDirectory subDirectoryPatch =
173-
baseDir.findSubdirectory(NewSetupDataPatchAction.PATCH_DIRECTORY);
167+
private PsiDirectory getDirectory(final PsiDirectory targetDirectory) {
168+
if (NewSetupDataPatchAction.ROOT_DIRECTORY.equals(baseDir.getName())) {
169+
final PsiDirectory subDirectoryPatch = baseDir.findSubdirectory(
170+
NewSetupDataPatchAction.PATCH_DIRECTORY
171+
);
174172

175173
if (subDirectoryPatch != null) {
176174
return subDirectoryPatch.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
177175
}
178176
}
179-
if(baseDir.getName().equals(NewSetupDataPatchAction.PATCH_DIRECTORY)) {
177+
if (NewSetupDataPatchAction.PATCH_DIRECTORY.equals(baseDir.getName())) {
180178
return baseDir.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
181179
}
182180

183181
return targetDirectory;
184182
}
185183

186-
private PsiDirectory createDirectory(PsiDirectory targetDirectory) {
187-
if(targetDirectory.getName().equals(NewSetupDataPatchAction.ROOT_DIRECTORY)){
188-
PsiDirectory subDirectoryPatch = targetDirectory.findSubdirectory(
184+
private PsiDirectory createDirectory(final PsiDirectory targetDirectory) {
185+
if (NewSetupDataPatchAction.ROOT_DIRECTORY.equals(targetDirectory.getName())) {
186+
final PsiDirectory subDirectoryPatch = targetDirectory.findSubdirectory(
189187
NewSetupDataPatchAction.PATCH_DIRECTORY
190188
);
191189

192-
if(subDirectoryPatch == null) {
190+
if (subDirectoryPatch == null) {
193191
return targetDirectory.createSubdirectory(
194192
NewSetupDataPatchAction.PATCH_DIRECTORY
195193
).createSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
196194
}
197-
PsiDirectory subDirectoryData = subDirectoryPatch.findSubdirectory(
195+
final PsiDirectory subDirectoryData = subDirectoryPatch.findSubdirectory(
198196
NewSetupDataPatchAction.DATA_DIRECTORY
199197
);
200198

@@ -204,8 +202,8 @@ private PsiDirectory createDirectory(PsiDirectory targetDirectory) {
204202
)
205203
);
206204
}
207-
if(targetDirectory.getName().equals(NewSetupDataPatchAction.PATCH_DIRECTORY)){
208-
PsiDirectory subDirectoryData = targetDirectory.findSubdirectory(
205+
if (NewSetupDataPatchAction.PATCH_DIRECTORY.equals(targetDirectory.getName())) {
206+
final PsiDirectory subDirectoryData = targetDirectory.findSubdirectory(
209207
NewSetupDataPatchAction.DATA_DIRECTORY
210208
);
211209

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import com.magento.idea.magento2plugin.actions.generation.ModuleSetupDataPatchData;
1111
import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
1212
import com.magento.idea.magento2plugin.magento.files.ModuleSetupDataPatchFile;
13-
import org.jetbrains.annotations.NotNull;
1413
import java.util.Properties;
14+
import org.jetbrains.annotations.NotNull;
1515

1616
public class ModuleSetupDataPatchGenerator extends FileGenerator {
1717

0 commit comments

Comments
 (0)