Fixed PMD issues

Author: drpayyne

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

@@ -9,22 +9,20 @@
 import com.jetbrains.php.lang.PhpLanguage;
 
 public class BlockPhp implements ModuleFileInterface {
-    public static String TEMPLATE = "Magento Regular Class";
-    public static String DEFAULT_DIR = "Block";
-    public static String STOREFRONT_BLOCK_FQN = "Magento\\Framework\\View\\Element\\Template";
-    public static String STOREFRONT_BLOCK_NAME = "Template";
+    public static final String TEMPLATE = "Magento Regular Class";
+    public static final String DEFAULT_DIR = "Block";
+    public static final String STOREFRONT_BLOCK_FQN = "Magento\\Framework\\View\\Element\\Template";
+    public static final String STOREFRONT_BLOCK_NAME = "Template";
 
-    private static BlockPhp INSTANCE = null;
+    private static final BlockPhp INSTANCE = new BlockPhp();
     private String fileName;
 
     /**
      * Getter for singleton instance of class.
      */
-    public static BlockPhp getInstance(String className) {
-        if (null == INSTANCE) {
-            INSTANCE = new BlockPhp();
-        }
-        INSTANCE.setFileName(className.concat(".php"));
+    public static BlockPhp getInstance(final String className) {
+        INSTANCE.fileName = className.concat(".php");
+
         return INSTANCE;
     }
 
@@ -42,8 +40,4 @@ public String getTemplate() {
     public Language getLanguage() {
         return PhpLanguage.INSTANCE;
     }
-
-    private void setFileName(String filename) {
-        this.fileName = filename;
-    }
 }

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

@@ -9,19 +9,16 @@
 import com.intellij.lang.Language;
 
 public class ComposerJson implements ModuleFileInterface {
-    public static String FILE_NAME = "composer.json";
-    public static String TEMPLATE = "Magento Composer JSON";
-    public static String DEFAULT_DEPENDENCY = "\"magento/framework\": \"*\"";
-    public static String NO_DEPENDENCY_LABEL = "None";
-    private static ComposerJson INSTANCE = null;
+    public static final String FILE_NAME = "composer.json";
+    public static final String TEMPLATE = "Magento Composer JSON";
+    public static final String DEFAULT_DEPENDENCY = "\"magento/framework\": \"*\"";
+    public static final String NO_DEPENDENCY_LABEL = "None";
+    private static final ComposerJson INSTANCE = new ComposerJson();
 
     /**
      * Getter for singleton instance of class.
      */
     public static ComposerJson getInstance() {
-        if (null == INSTANCE) {
-            INSTANCE = new ComposerJson();
-        }
         return INSTANCE;
     }
 

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

@@ -9,10 +9,10 @@
 import com.jetbrains.php.lang.PhpLanguage;
 
 public class CronjobTemplate implements ModuleFileInterface {
-    private String fileName;
+    private String fileName;// NOPMD
 
-    public CronjobTemplate(String className) {
-        fileName = className.concat(".php");
+    public CronjobTemplate(final String className) {
+        this.fileName = className.concat(".php");
     }
 
     @Override

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

@@ -9,17 +9,18 @@
 import com.intellij.lang.xml.XMLLanguage;
 
 public class CrontabXmlTemplate implements ModuleFileInterface {
-    public static String FILE_NAME = "crontab.xml";
-    public static String TEMPLATE = "Magento Cron Tab XML";
+    public static final String FILE_NAME = "crontab.xml";
+    public static final String TEMPLATE = "Magento Cron Tab XML";
 
     // code templates
-    public static String TEMPLATE_CRONJOB_REGISTRATION = "Magento Crontab Cronjob Registration";
+    public static final String TEMPLATE_CRONJOB_REGISTRATION
+            = "Magento Crontab Cronjob Registration";
 
     // XML definitions
-    public static String CRON_GROUP_TAG = "group";
-    public static String CRON_GROUP_NAME_ATTRIBUTE = "id";
-    public static String CRON_JOB_TAG = "job";
-    public static String CRON_JOB_NAME_ATTRIBUTE = "name";
+    public static final String CRON_GROUP_TAG = "group";
+    public static final String CRON_GROUP_NAME_ATTRIBUTE = "id";
+    public static final String CRON_JOB_TAG = "job";
+    public static final String CRON_JOB_NAME_ATTRIBUTE = "name";
 
     @Override
     public String getFileName() {

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

@@ -9,26 +9,23 @@
 import com.intellij.lang.xml.XMLLanguage;
 
 public class ModuleEventsXml implements ModuleFileInterface {
-    public static String FILE_NAME = "events.xml";
-    public static String TEMPLATE = "Magento Events XML";
+    public static final String FILE_NAME = "events.xml";
+    public static final String TEMPLATE = "Magento Events XML";
 
     //code templates
-    public static String TEMPLATE_OBSERVER = "Magento Module Events Xml Observer";
+    public static final String TEMPLATE_OBSERVER = "Magento Module Events Xml Observer";
 
     //tags
-    public static String OBSERVER_TAG = "observer";
-    public static String INSTANCE_ATTRIBUTE = "instance";
-    public static String EVENT_TAG = "event";
+    public static final String OBSERVER_TAG = "observer";
+    public static final String INSTANCE_ATTRIBUTE = "instance";
+    public static final String EVENT_TAG = "event";
 
-    private static ModuleEventsXml INSTANCE = null;
+    private static final ModuleEventsXml INSTANCE = new ModuleEventsXml();
 
     /**
      * Getter for singleton instance of class.
      */
     public static ModuleEventsXml getInstance() {
-        if (null == INSTANCE) {
-            INSTANCE = new ModuleEventsXml();
-        }
         return INSTANCE;
     }
 

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

@@ -9,18 +9,15 @@
 import com.intellij.lang.xml.XMLLanguage;
 
 public class ModuleXml implements ModuleFileInterface {
-    public static String FILE_NAME = "module.xml";
-    public static String MODULE_ATTR_NAME = "name";
-    public static String TEMPLATE = "Magento Module XML";
-    private static ModuleXml INSTANCE = null;
+    public static final String FILE_NAME = "module.xml";
+    public static final String MODULE_ATTR_NAME = "name";
+    public static final String TEMPLATE = "Magento Module XML";
+    private static final ModuleXml INSTANCE = new ModuleXml();
 
     /**
      * Getter for singleton instance of class.
      */
     public static ModuleXml getInstance() {
-        if (null == INSTANCE) {
-            INSTANCE = new ModuleXml();
-        }
         return INSTANCE;
     }
 

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

@@ -9,19 +9,16 @@
 import com.jetbrains.php.lang.PhpLanguage;
 
 public class PhpPreference implements ModuleFileInterface {
-    public static String TEMPLATE = "Magento Preference Class";
-
-    private static PhpPreference INSTANCE = null;
+    public static final String TEMPLATE = "Magento Preference Class";
     private String fileName;
+    private static final PhpPreference INSTANCE = new PhpPreference();
 
     /**
      * Getter for singleton instance of class.
      */
-    public static PhpPreference getInstance(String className) {
-        if (null == INSTANCE) {
-            INSTANCE = new PhpPreference();
-        }
-        INSTANCE.setFileName(className.concat(".php"));
+    public static PhpPreference getInstance(final String className) {
+        INSTANCE.fileName = className.concat(".php");
+
         return INSTANCE;
     }
 
@@ -39,8 +36,4 @@ public String getTemplate() {
     public Language getLanguage() {
         return PhpLanguage.INSTANCE;
     }
-
-    private void setFileName(String filename) {
-        this.fileName = filename;
-    }
 }

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

@@ -9,18 +9,15 @@
 import com.jetbrains.php.lang.PhpLanguage;
 
 public class RegistrationPhp implements ModuleFileInterface {
-    public static String FILE_NAME = "registration.php";
-    public static String TEMPLATE = "Magento Registration PHP";
-    public static String REGISTER_METHOD_NAME = "register";
-    private static RegistrationPhp INSTANCE = null;
+    public static final String FILE_NAME = "registration.php";
+    public static final String TEMPLATE = "Magento Registration PHP";
+    public static final String REGISTER_METHOD_NAME = "register";
+    private static final RegistrationPhp INSTANCE = new RegistrationPhp();
 
     /**
      * Getter for singleton instance of class.
      */
     public static RegistrationPhp getInstance() {
-        if (null == INSTANCE) {
-            INSTANCE = new RegistrationPhp();
-        }
         return INSTANCE;
     }
 

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

@@ -9,23 +9,21 @@
 import com.jetbrains.php.lang.PhpLanguage;
 
 public class ViewModelPhp implements ModuleFileInterface {
-    public static String TEMPLATE = "Magento Regular Class";
-    public static String DEFAULT_DIR = "ViewModel";
-    public static String INTERFACE_FQN
+    public static final String TEMPLATE = "Magento Regular Class";
+    public static final String DEFAULT_DIR = "ViewModel";
+    public static final String INTERFACE_FQN
             = "Magento\\Framework\\View\\Element\\Block\\ArgumentInterface";
-    public static String INTERFACE_NAME = "ArgumentInterface";
+    public static final String INTERFACE_NAME = "ArgumentInterface";
 
-    private static ViewModelPhp INSTANCE = null;
+    private static final ViewModelPhp INSTANCE = new ViewModelPhp();
     private String fileName;
 
     /**
      * Getter for singleton instance of class.
      */
-    public static ViewModelPhp getInstance(String className) {
-        if (null == INSTANCE) {
-            INSTANCE = new ViewModelPhp();
-        }
-        INSTANCE.setFileName(className.concat(".php"));
+    public static ViewModelPhp getInstance(final String className) {
+        INSTANCE.fileName = className.concat(".php");
+
         return INSTANCE;
     }
 
@@ -43,8 +41,4 @@ public String getTemplate() {
     public Language getLanguage() {
         return PhpLanguage.INSTANCE;
     }
-
-    private void setFileName(String filename) {
-        this.fileName = filename;
-    }
 }