Skip to content

Commit 7c8e56a

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

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

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

+7-7
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;
@@ -54,15 +54,15 @@ protected boolean isVisible(
5454
final PsiDirectory targetDirectory,
5555
final PsiFile targetFile
5656
) {
57-
if (!moduleData.getType().equals(ComponentType.module)) {
57+
if (!moduleData.getType().equals(ComponentType.module)){
5858
return false;
5959
}
6060
final PsiDirectory parentDirFirst = targetDirectory.getParentDirectory();
61-
final PsiDirectory parentDirSecond = parentDirFirst != null ?
62-
parentDirFirst.getParentDirectory() : null;
61+
final PsiDirectory parentDirSecond = parentDirFirst != null
62+
? parentDirFirst.getParentDirectory() : null;
6363

64-
return targetDirectory.getName().equals(ROOT_DIRECTORY) ||
65-
(parentDirFirst != null && parentDirFirst.getName().equals(ROOT_DIRECTORY)) ||
66-
(parentDirSecond != null && parentDirSecond.getName().equals(ROOT_DIRECTORY));
64+
return targetDirectory.getName().equals(ROOT_DIRECTORY)
65+
|| (parentDirFirst != null && parentDirFirst.getName().equals(ROOT_DIRECTORY))
66+
|| (parentDirSecond != null && parentDirSecond.getName().equals(ROOT_DIRECTORY));
6767
}
6868
}

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

+1-1
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 ‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewSetupDataPatchDialog.java

+11-12
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,31 @@
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;
2019

21-
2220
import javax.swing.JButton;
2321
import javax.swing.JComponent;
2422
import javax.swing.JLabel;
2523
import javax.swing.JPanel;
2624
import javax.swing.JTextField;
27-
import javax.swing.KeyStroke;
2825
import java.awt.event.ActionEvent;
2926
import java.awt.event.KeyEvent;
3027
import java.awt.event.WindowAdapter;
3128
import java.awt.event.WindowEvent;
3229
import java.util.Objects;
30+
import javax.swing.KeyStroke;
3331

3432
public class NewSetupDataPatchDialog extends AbstractDialog {
3533

@@ -151,7 +149,7 @@ public String getClassName() {
151149
private boolean validateFields() {
152150
PsiDirectory targetDirectory = getDirectory(baseDir);
153151

154-
if (targetDirectory.getName().equals(NewSetupDataPatchAction.DATA_DIRECTORY)) {
152+
if (targetDirectory.getName().equals(NewSetupDataPatchAction.DATA_DIRECTORY)){
155153
final PsiFile[] files = targetDirectory.getFiles();
156154
for (PsiFile file : files) {
157155
if (file.getName().equals(getClassName() + ModuleSetupDataPatchFile.FILE_NAME)) {
@@ -168,28 +166,29 @@ private boolean validateFields() {
168166
}
169167

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

175174
if (subDirectoryPatch != null) {
176175
return subDirectoryPatch.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
177176
}
178177
}
179-
if(baseDir.getName().equals(NewSetupDataPatchAction.PATCH_DIRECTORY)) {
178+
if (baseDir.getName().equals(NewSetupDataPatchAction.PATCH_DIRECTORY)) {
180179
return baseDir.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
181180
}
182181

183182
return targetDirectory;
184183
}
185184

186185
private PsiDirectory createDirectory(PsiDirectory targetDirectory) {
187-
if(targetDirectory.getName().equals(NewSetupDataPatchAction.ROOT_DIRECTORY)){
186+
if (targetDirectory.getName().equals(NewSetupDataPatchAction.ROOT_DIRECTORY)){
188187
PsiDirectory subDirectoryPatch = targetDirectory.findSubdirectory(
189188
NewSetupDataPatchAction.PATCH_DIRECTORY
190189
);
191190

192-
if(subDirectoryPatch == null) {
191+
if (subDirectoryPatch == null){
193192
return targetDirectory.createSubdirectory(
194193
NewSetupDataPatchAction.PATCH_DIRECTORY
195194
).createSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
@@ -204,7 +203,7 @@ private PsiDirectory createDirectory(PsiDirectory targetDirectory) {
204203
)
205204
);
206205
}
207-
if(targetDirectory.getName().equals(NewSetupDataPatchAction.PATCH_DIRECTORY)){
206+
if (targetDirectory.getName().equals(NewSetupDataPatchAction.PATCH_DIRECTORY)){
208207
PsiDirectory subDirectoryData = targetDirectory.findSubdirectory(
209208
NewSetupDataPatchAction.DATA_DIRECTORY
210209
);

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

+1-1
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)