Fix static tests

Author: Serhiy Zhovnir

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

@@ -8,7 +8,7 @@
 @SuppressWarnings({"PMD.DataClass"})
 public class EmailTemplatesXmlData {
     private final String module;
-    private final String id;
+    private final String emailTemplateId;
     private final String label;
     private final String templateFileName;
     private final String type;
@@ -18,22 +18,22 @@ public class EmailTemplatesXmlData {
      * Email templates data constructor.
      *
      * @param module String
-     * @param id String
+     * @param emailTemplateId String
      * @param label String
      * @param templateFileName String
      * @param type String
      * @param area String
      */
     public EmailTemplatesXmlData(
             final String module,
-            final String id,
+            final String emailTemplateId,
             final String label,
             final String templateFileName,
             final String type,
             final String area
     ) {
         this.module = module;
-        this.id = id;
+        this.emailTemplateId = emailTemplateId;
         this.label = label;
         this.templateFileName = templateFileName;
         this.type = type;
@@ -55,7 +55,7 @@ public String getTemplateFileName() {
      * @return String
      */
     public String getId() {
-        return id;
+        return emailTemplateId;
     }
 
     /**

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.java

@@ -39,16 +39,16 @@ public class NewEmailTemplateDialog extends AbstractDialog {
     private final String moduleName;
     private final Project project;
     private final NewEmailTemplateDialogValidator validator;
-    private static final String ID = "id";
+    private static final String EMAIL_TEMPLATE_ID = "id";
     private static final String LABEL = "label";
     private static final String FILENAME = "file name";
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
-            message = {NotEmptyRule.MESSAGE, ID})
+            message = {NotEmptyRule.MESSAGE, EMAIL_TEMPLATE_ID})
     @FieldValidation(rule = RuleRegistry.IDENTIFIER,
-            message = {IdentifierRule.MESSAGE, ID})
+            message = {IdentifierRule.MESSAGE, EMAIL_TEMPLATE_ID})
     private JTextField identifier;
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, LABEL})
@@ -69,6 +69,7 @@ public class NewEmailTemplateDialog extends AbstractDialog {
      * @param directory Directory
      */
     public NewEmailTemplateDialog(final Project project, final PsiDirectory directory) {
+        super();
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
@@ -82,15 +83,15 @@ public NewEmailTemplateDialog(final Project project, final PsiDirectory director
         // call onCancel() when cross is clicked
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
-            public void windowClosing(final WindowEvent e) {
+            public void windowClosing(final WindowEvent windowEvent) {
                 onCancel();
             }
         });
 
         // call onCancel() on ESCAPE
         contentPane.registerKeyboardAction(
                 new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
+                    public void actionPerformed(ActionEvent actionEvent) {
                         onCancel();
                     }
                 },
@@ -230,6 +231,7 @@ protected void onCancel() {
         dispose();
     }
 
+    @SuppressWarnings({"PMD.UnusedPrivateMethod"})
     private void createUIComponents() {
         this.area = new FilteredComboBox(getAreaList());
         this.templateType = new FilteredComboBox(getTypeList());

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

@@ -132,7 +132,7 @@ private boolean isTemplateTagAlreadyExists(final EmailTemplatesXmlData emailTemp
     private boolean isTemplateFileAlreadyExists(
             final EmailTemplateHtmlData emailTemplateData
     ) {
-        PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
+        final PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
                 emailTemplateData.getFileName(),
                 getArea(emailTemplateData.getArea()),
                 emailTemplateData.getModule(),

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

@@ -51,8 +51,8 @@ public ModuleEmailTemplateHtmlGenerator(
      * @param actionName Action name
      * @return PsiFile
      */
-    public PsiFile generate(String actionName) {
-        PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
+    public PsiFile generate(final String actionName) {
+        final PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
                 this.emailTemplateData.getFileName(),
                 getArea(this.emailTemplateData.getArea()),
                 this.emailTemplateData.getModule(),
@@ -92,7 +92,7 @@ public PsiFile generate(String actionName) {
     }
 
     @Override
-    protected void fillAttributes(Properties attributes) {
+    protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("SUBJECT", emailTemplateData.getSubject());
         attributes.setProperty("TYPE", emailTemplateData.getType());
 

src/com/magento/idea/magento2plugin/magento/files/EmailTemplateHtml.java

@@ -13,7 +13,7 @@ public class EmailTemplateHtml implements ModuleFileInterface {
     public static final String HTML_TYPE = "html";
     public static final String TEXT_TYPE = "text";
     public static final String HTML_FILE_EXTENSION = "html";
-    private static EmailTemplateHtml INSTANCE = null;
+    private static EmailTemplateHtml instance = null;
     private String fileName;
 
     /**
@@ -22,13 +22,13 @@ public class EmailTemplateHtml implements ModuleFileInterface {
      * @return EmailTemplatesXml
      */
     public static EmailTemplateHtml getInstance(final String fileName) {
-        if (null == INSTANCE) {
-            INSTANCE = new EmailTemplateHtml();
+        if (null == instance) { //NOPMD
+            instance = new EmailTemplateHtml();
         }
 
-        INSTANCE.setFileName(fileName);
+        instance.setFileName(fileName);
 
-        return INSTANCE;
+        return instance;
     }
 
     @Override

src/com/magento/idea/magento2plugin/magento/files/EmailTemplatesXml.java

@@ -19,19 +19,19 @@ public class EmailTemplatesXml implements ModuleFileInterface {
     public static final String TEMPLATE_TAG = "template";
     public static final String TEMPLATE_ID_ATTRIBUTE = "id";
 
-    private static EmailTemplatesXml INSTANCE = null;
+    private static EmailTemplatesXml instance = null;
 
     /**
      * Returns a new instance of the class.
      *
      * @return EmailTemplatesXml
      */
     public static EmailTemplatesXml getInstance() {
-        if (null == INSTANCE) {
-            INSTANCE = new EmailTemplatesXml();
+        if (null == instance) { //NOPMD
+            instance = new EmailTemplatesXml();
         }
 
-        return INSTANCE;
+        return instance;
     }
 
     @Override

tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGeneratorTest.java

@@ -83,15 +83,15 @@ public void testAddTwoEmailTemplatesToEmailTemplatesXmlFile() {
     /**
      * Add email template XML.
      *
-     * @param id Email Template ID
+     * @param emailTemplateId Email Template ID
      * @param label Email Template Label
      * @param filename Email Template Filename
      * @param type Email Type
      * @param area Area
      * @return PsiFile
      */
     private PsiFile addEmailTemplateXml(
-            final String id,
+            final String emailTemplateId,
             final String label,
             final String filename,
             final String type,
@@ -100,7 +100,7 @@ private PsiFile addEmailTemplateXml(
         final Project project = myFixture.getProject();
         final EmailTemplatesXmlData emailTemplatesData = new EmailTemplatesXmlData(
                 MODULE_NAME,
-                id,
+                emailTemplateId,
                 label,
                 filename,
                 type,