Skip to content

Commit a100e1f

Browse files
committed
Fixed CheckStyle issues
1 parent 68cc913 commit a100e1f

File tree

2 files changed

+38
-12
lines changed

2 files changed

+38
-12
lines changed

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

Lines changed: 4 additions & 0 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.data;
67

78
import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -16,6 +17,9 @@ public class PreferenceFileData {
1617
private boolean inheritClass;
1718
private boolean isInterface;
1819

20+
/**
21+
* Constructor.
22+
*/
1923
public PreferenceFileData(
2024
String preferenceDirectory,
2125
String preferenceClassName,

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

Lines changed: 34 additions & 12 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;
67

78
import com.intellij.openapi.project.Project;
@@ -13,15 +14,15 @@
1314
import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
1415
import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
1516
import com.magento.idea.magento2plugin.bundles.CommonBundle;
17+
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
1618
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
1719
import com.magento.idea.magento2plugin.magento.files.PhpPreference;
20+
import com.magento.idea.magento2plugin.magento.packages.File;
1821
import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
1922
import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
20-
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
21-
import org.jetbrains.annotations.NotNull;
22-
import javax.swing.*;
23-
import com.magento.idea.magento2plugin.magento.packages.File;
2423
import java.util.Properties;
24+
import javax.swing.JOptionPane;
25+
import org.jetbrains.annotations.NotNull;
2526

2627
public class PreferenceClassGenerator extends FileGenerator {
2728
private PreferenceFileData preferenceFileData;
@@ -32,7 +33,10 @@ public class PreferenceClassGenerator extends FileGenerator {
3233
private final FileFromTemplateGenerator fileFromTemplateGenerator;
3334
private final GetFirstClassOfFile getFirstClassOfFile;
3435

35-
public PreferenceClassGenerator(@NotNull PreferenceFileData preferenceFileData, Project project) {
36+
public PreferenceClassGenerator(
37+
@NotNull PreferenceFileData preferenceFileData,
38+
Project project
39+
) {
3640
super(project);
3741
this.directoryGenerator = DirectoryGenerator.getInstance();
3842
this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
@@ -44,15 +48,25 @@ public PreferenceClassGenerator(@NotNull PreferenceFileData preferenceFileData,
4448
}
4549

4650
public PsiFile generate(String actionName) {
47-
PhpClass pluginClass = GetPhpClassByFQN.getInstance(project).execute(preferenceFileData.getPreferenceFqn());
51+
PhpClass pluginClass = GetPhpClassByFQN.getInstance(project).execute(
52+
preferenceFileData.getPreferenceFqn()
53+
);
4854

4955
if (pluginClass == null) {
5056
pluginClass = createPluginClass(actionName);
5157
}
5258

5359
if (pluginClass == null) {
54-
String errorMessage = validatorBundle.message("validator.file.cantBeCreated", "Preference Class");
55-
JOptionPane.showMessageDialog(null, errorMessage, commonBundle.message("common.error"), JOptionPane.ERROR_MESSAGE);
60+
String errorMessage = validatorBundle.message(
61+
"validator.file.cantBeCreated",
62+
"Preference Class"
63+
);
64+
JOptionPane.showMessageDialog(
65+
null,
66+
errorMessage,
67+
commonBundle.message("common.error"),
68+
JOptionPane.ERROR_MESSAGE
69+
);
5670

5771
return null;
5872
}
@@ -61,14 +75,22 @@ public PsiFile generate(String actionName) {
6175
}
6276

6377
private PhpClass createPluginClass(String actionName) {
64-
PsiDirectory parentDirectory = ModuleIndex.getInstance(project).getModuleDirectoryByModuleName(getPreferenceModule());
65-
String[] pluginDirectories = preferenceFileData.getPreferenceDirectory().split(File.separator);
78+
PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
79+
.getModuleDirectoryByModuleName(getPreferenceModule());
80+
String[] pluginDirectories = preferenceFileData.getPreferenceDirectory()
81+
.split(File.separator);
6682
for (String pluginDirectory: pluginDirectories) {
67-
parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, pluginDirectory);
83+
parentDirectory = directoryGenerator
84+
.findOrCreateSubdirectory(parentDirectory, pluginDirectory);
6885
}
6986

7087
Properties attributes = getAttributes();
71-
PsiFile pluginFile = fileFromTemplateGenerator.generate(PhpPreference.getInstance(preferenceFileData.getPreferenceClassName()), attributes, parentDirectory, actionName);
88+
PsiFile pluginFile = fileFromTemplateGenerator.generate(
89+
PhpPreference.getInstance(preferenceFileData.getPreferenceClassName()),
90+
attributes,
91+
parentDirectory,
92+
actionName
93+
);
7294
if (pluginFile == null) {
7395
return null;
7496
}

0 commit comments

Comments
 (0)