Skip to content

Commit 5de5394

Browse files
drpayynedrpayyne
committed
Fixed PMD issues
1 parent 227f382 commit 5de5394

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎src/com/magento/idea/magento2plugin/actions/generation/NewDataModelAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public NewDataModelAction() {
2929
}
3030

3131
@Override
32-
public void actionPerformed(@NotNull AnActionEvent event) {
32+
public void actionPerformed(@NotNull final AnActionEvent event) {
3333
final DataContext dataContext = event.getDataContext();
3434

3535
final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class DataModelGenerator extends FileGenerator {
3838
/**
3939
* Constructor.
4040
*/
41-
public DataModelGenerator(Project project, DataModelData modelData) {
41+
public DataModelGenerator(final Project project, final DataModelData modelData) {
4242
super(project);
4343

4444
this.project = project;
@@ -51,26 +51,15 @@ public DataModelGenerator(Project project, DataModelData modelData) {
5151
}
5252

5353
@Override
54-
public PsiFile generate(String actionName) {
54+
public PsiFile generate(final String actionName) {
5555
final PsiFile[] files = new PsiFile[1];
5656

5757
WriteCommandAction.runWriteCommandAction(project, () -> {
5858
PhpClass model = GetPhpClassByFQN.getInstance(project).execute(
5959
modelData.getFQN()
6060
);
6161

62-
if (model != null) {
63-
final String errorMessage = this.validatorBundle.message(
64-
"validator.file.alreadyExists",
65-
"Data Model"
66-
);
67-
JOptionPane.showMessageDialog(
68-
null,
69-
errorMessage,
70-
commonBundle.message("common.error"),
71-
JOptionPane.ERROR_MESSAGE
72-
);
73-
} else {
62+
if (model == null) {
7463
model = createModel(actionName);
7564

7665
if (model == null) {
@@ -87,14 +76,25 @@ public PsiFile generate(String actionName) {
8776
} else {
8877
files[0] = model.getContainingFile();
8978
}
79+
} else {
80+
final String errorMessage = this.validatorBundle.message(
81+
"validator.file.alreadyExists",
82+
"Data Model"
83+
);
84+
JOptionPane.showMessageDialog(
85+
null,
86+
errorMessage,
87+
commonBundle.message("common.error"),
88+
JOptionPane.ERROR_MESSAGE
89+
);
9090
}
9191
});
9292

9393
return files[0];
9494
}
9595

9696
@Override
97-
protected void fillAttributes(Properties attributes) {
97+
protected void fillAttributes(final Properties attributes) {
9898
final List<String> uses = getUses();
9999
attributes.setProperty("NAMESPACE", modelData.getNamespace());
100100
attributes.setProperty("USES", PhpClassGeneratorUtil.formatUses(uses));
@@ -117,13 +117,13 @@ private List<String> getUses() {
117117
);
118118
}
119119

120-
private PhpClass createModel(String actionName) {
120+
private PhpClass createModel(final String actionName) {
121121
PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
122122
.getModuleDirectoryByModuleName(modelData.getModuleName());
123123
final PsiFile interfaceFile;
124124
final Properties attributes = getAttributes();
125125

126-
for (String directory: DataModel.DIRECTORY.split("/")) {
126+
for (final String directory: DataModel.DIRECTORY.split("/")) {
127127
parentDirectory = directoryGenerator.findOrCreateSubdirectory(
128128
parentDirectory, directory
129129
);

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,15 @@ public DataModelInterfaceGenerator(
5151
}
5252

5353
@Override
54-
public PsiFile generate(String actionName) {
54+
public PsiFile generate(final String actionName) {
5555
final PsiFile[] files = new PsiFile[1];
5656

5757
WriteCommandAction.runWriteCommandAction(project, () -> {
5858
PhpClass modelInterface = GetPhpClassByFQN.getInstance(project).execute(
5959
interfaceData.getFQN()
6060
);
6161

62-
if (modelInterface != null) {
63-
final String errorMessage = this.validatorBundle.message(
64-
"validator.file.alreadyExists",
65-
"Data Model Interface"
66-
);
67-
JOptionPane.showMessageDialog(
68-
null,
69-
errorMessage,
70-
commonBundle.message("common.error"),
71-
JOptionPane.ERROR_MESSAGE
72-
);
73-
} else {
62+
if (modelInterface == null) {
7463
modelInterface = createInterface(actionName);
7564

7665
if (modelInterface == null) {
@@ -87,26 +76,37 @@ public PsiFile generate(String actionName) {
8776
} else {
8877
files[0] = modelInterface.getContainingFile();
8978
}
79+
} else {
80+
final String errorMessage = this.validatorBundle.message(
81+
"validator.file.alreadyExists",
82+
"Data Model Interface"
83+
);
84+
JOptionPane.showMessageDialog(
85+
null,
86+
errorMessage,
87+
commonBundle.message("common.error"),
88+
JOptionPane.ERROR_MESSAGE
89+
);
9090
}
9191
});
9292

9393
return files[0];
9494
}
9595

9696
@Override
97-
protected void fillAttributes(Properties attributes) {
97+
protected void fillAttributes(final Properties attributes) {
9898
attributes.setProperty("NAME", interfaceData.getName());
9999
attributes.setProperty("NAMESPACE", interfaceData.getNamespace());
100100
attributes.setProperty("PROPERTIES", interfaceData.getProperties());
101101
}
102102

103-
private PhpClass createInterface(String actionName) {
103+
private PhpClass createInterface(final String actionName) {
104104
PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
105105
.getModuleDirectoryByModuleName(interfaceData.getModuleName());
106106
final PsiFile interfaceFile;
107107
final Properties attributes = getAttributes();
108108

109-
for (String directory: DataModelInterface.DIRECTORY.split("/")) {
109+
for (final String directory: DataModelInterface.DIRECTORY.split("/")) {
110110
parentDirectory = directoryGenerator.findOrCreateSubdirectory(
111111
parentDirectory, directory
112112
);

0 commit comments

Comments
 (0)