1139: Fixed static tests

Author: anzin

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

@@ -28,19 +28,19 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.stubs.indexes.EventNameIndex;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.Collection;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.Collection;
 
 @SuppressWarnings({
         "PMD.TooManyFields",
@@ -226,7 +226,6 @@ private void createUIComponents() {
 
     private boolean validateFields() {
         final PsiFile[] directoryFiles = getDirectoryFiles(baseDir);
-        final String directory = getDirectoryStructure();
 
         if (directoryFiles != null) {
             for (final PsiFile file : directoryFiles) {
@@ -243,7 +242,9 @@ private boolean validateFields() {
                 }
             }
         }
-        if (!directory.isEmpty() && !DirectoryRule.getInstance().check(directory)) {
+        if (!getDirectoryStructure().isEmpty()
+                && !DirectoryRule.getInstance().check(getDirectoryStructure())
+        ) {
             showErrorMessage(
                     this.getClass().getDeclaredFields()[11],
                     "The Directory Path field does not contain a valid directory."
@@ -261,7 +262,7 @@ private PsiFile[] getDirectoryFiles(final PsiDirectory targetDirectory) {
         if (!getDirectoryStructure().isEmpty()) {
             final String[] directories = getDirectoryStructure().split(Package.V_FILE_SEPARATOR);
 
-            for(final String dir : directories) {
+            for (final String dir : directories) {
                 final PsiDirectory subdirectory = directory.findSubdirectory(dir);
 
                 if (subdirectory == null) {
@@ -286,7 +287,7 @@ private String getObserverClassFqn() {
         String folderFqn = NewObserverAction.ROOT_DIRECTORY;
 
         if (!folderStructureFqn.isEmpty()) {
-            folderFqn +=  Package.fqnSeparator.concat(folderStructureFqn);
+            folderFqn =  folderFqn.concat(Package.fqnSeparator).concat(folderStructureFqn);
         }
 
         return getModuleName().concat(Package.fqnSeparator).concat(folderFqn);

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

@@ -33,7 +33,7 @@ public static String resolveClassNameFromInput(final String input) {
         if (input.length() <= FILE_SUFFIX.length()) {
             return input + FILE_SUFFIX;
         }
-        String suffix = input.substring(input.length() - FILE_SUFFIX.length());
+        final String suffix = input.substring(input.length() - FILE_SUFFIX.length());
 
         if (FILE_SUFFIX.equals(suffix)) {
             return input;