Skip to content

Commit 421c3eb

Browse files
author
Serhiy Zhovnir
committed
#issue-179 Fixed issue with Null pointer
1 parent 1c66663 commit 421c3eb

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/dialog/NewEmailTemplateDialogValidator.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ public NewEmailTemplateDialogValidator(final Project project) {
4747
public boolean validate(final NewEmailTemplateDialog dialog) {
4848
final EmailTemplatesXmlData emailTemplatesXmlData = dialog.getEmailTemplateData();
4949
final String errorTitle = commonBundle.message("common.error");
50+
final EmailTemplateHtmlData emailTemplateHtmlData = dialog.getEmailTemplateHtmlData();
5051

51-
if (isTemplateTagAlreadyExists(emailTemplatesXmlData)) {
52+
if (isTemplateFileAlreadyExists(emailTemplateHtmlData)) {
53+
final String templateFileName = emailTemplatesXmlData.getTemplateFileName();
5254
final String errorMessage = this.validatorBundle.message(
5355
"validator.alreadyDeclared",
54-
String.format("%s Email Template", emailTemplatesXmlData.getId()),
56+
String.format("%s Email Template File", templateFileName),
5557
emailTemplatesXmlData.getModule()
5658
);
5759
JOptionPane.showMessageDialog(
@@ -64,13 +66,10 @@ public boolean validate(final NewEmailTemplateDialog dialog) {
6466
return false;
6567
}
6668

67-
final EmailTemplateHtmlData emailTemplateHtmlData = dialog.getEmailTemplateHtmlData();
68-
69-
if (isTemplateFileAlreadyExists(emailTemplateHtmlData)) {
70-
final String templateFileName = emailTemplatesXmlData.getTemplateFileName();
69+
if (isTemplateTagAlreadyExists(emailTemplatesXmlData)) {
7170
final String errorMessage = this.validatorBundle.message(
7271
"validator.alreadyDeclared",
73-
String.format("%s Email Template File", templateFileName),
72+
String.format("%s Email Template", emailTemplatesXmlData.getId()),
7473
emailTemplatesXmlData.getModule()
7574
);
7675
JOptionPane.showMessageDialog(
@@ -101,6 +100,11 @@ private boolean isTemplateTagAlreadyExists(final EmailTemplatesXmlData emailTemp
101100
emailTemplatesXmlData.getModule(),
102101
project
103102
);
103+
104+
if (emailTemplatesFile == null) {
105+
return false;
106+
}
107+
104108
final Collection<XmlAttributeValue> attributes = XmlPsiTreeUtil.findAttributeValueElements(
105109
emailTemplatesFile,
106110
EmailTemplatesXml.TEMPLATE_TAG,

0 commit comments

Comments
 (0)