fixing static tests

Author: Serhiy Zhovnir

src/com/magento/idea/magento2plugin/actions/generation/NewEmailTemplateAction.java

@@ -6,11 +6,15 @@
 package com.magento.idea.magento2plugin.actions.generation;
 
 import com.intellij.ide.IdeView;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewEmailTemplateDialog;
+import com.magento.idea.magento2plugin.MagentoIcons;
 
 @SuppressWarnings({"PMD.OnlyOneReturn", "PMD.FieldNamingConventions"})
 public class NewEmailTemplateAction extends AnAction {

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

@@ -7,7 +7,6 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import com.magento.idea.magento2plugin.actions.generation.NewEmailTemplateAction;
 import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplateHtmlData;
 import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplatesXmlData;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
@@ -16,23 +15,24 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleEmailTemplateHtmlGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleEmailTemplatesXmlGenerator;
+import com.magento.idea.magento2plugin.actions.generation.NewEmailTemplateAction;
 import com.magento.idea.magento2plugin.magento.files.EmailTemplateHtml;
 import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import javax.swing.JPanel;
-import javax.swing.JComponent;
-import javax.swing.JButton;
-import javax.swing.KeyStroke;
-import javax.swing.JTextField;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
 
 public class NewEmailTemplateDialog extends AbstractDialog {
     private final String moduleName;
@@ -60,6 +60,12 @@ public class NewEmailTemplateDialog extends AbstractDialog {
     private FilteredComboBox templateType;
     private JTextField subject;
 
+    /**
+     * New email template dialog.
+     *
+     * @param project Project
+     * @param directory Directory
+     */
     public NewEmailTemplateDialog(final Project project, final PsiDirectory directory) {
         setContentPane(contentPane);
         setModal(true);
@@ -79,11 +85,15 @@ public void windowClosing(final WindowEvent e) {
         });
 
         // call onCancel() on ESCAPE
-        contentPane.registerKeyboardAction(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onCancel();
-            }
-        }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        contentPane.registerKeyboardAction(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        onCancel();
+                    }
+                },
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+        );
     }
 
     /**

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

@@ -8,9 +8,9 @@
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlFile;
@@ -23,10 +23,10 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.magento.files.EmailTemplatesXml;
 import com.magento.idea.magento2plugin.util.xml.XmlPsiTreeUtil;
-import javax.swing.JOptionPane;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Properties;
+import javax.swing.JOptionPane;
 
 @SuppressWarnings({"PMD.AvoidPrintStackTrace"})
 public class ModuleEmailTemplatesXmlGenerator extends FileGenerator {

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

@@ -39,7 +39,11 @@ public void testGenerateEmailTemplateHtml() {
                 area
         );
 
-        assertGeneratedFileIsCorrect(expectedFile, getExpectedDirectory(area), emailTemplateXmlFile);
+        assertGeneratedFileIsCorrect(
+                expectedFile,
+                getExpectedDirectory(area),
+                emailTemplateXmlFile
+        );
     }
 
     /**
@@ -62,7 +66,11 @@ public void testGenerateEmailTemplateText() {
                 area
         );
 
-        assertGeneratedFileIsCorrect(expectedFile, getExpectedDirectory(area), emailTemplateXmlFile);
+        assertGeneratedFileIsCorrect(
+                expectedFile,
+                getExpectedDirectory(area),
+                emailTemplateXmlFile
+        );
     }
 
     /**