Removed singleton

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/indexes/EventIndex.java

@@ -21,19 +21,13 @@
 
 public class EventIndex {
 
-    private static EventIndex INSTANCE; //NOPMD
-    private Project project;
+    private final Project project;
 
     /**
      * Gets singleton instance.
      */
-    public static EventIndex getInstance(final Project project) {
-        if (null == INSTANCE) { //NOPMD
-            INSTANCE = new EventIndex();
-        }
-        INSTANCE.project = project;
-
-        return INSTANCE;
+    public EventIndex(final Project project) {
+        this.project = project;
     }
 
     /**

src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java

@@ -44,6 +44,7 @@ public class ObserverDeclarationInspection extends PhpInspection {
 
     @NotNull
     @Override
+    @SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"})
     public PsiElementVisitor buildVisitor(
             final @NotNull ProblemsHolder problemsHolder,
             final boolean isOnTheFly
@@ -66,12 +67,12 @@ public void visitFile(final PsiFile file) {
                     return;
                 }
 
-                final EventIndex eventIndex = EventIndex.getInstance(file.getProject());
+                final EventIndex eventIndex = new EventIndex(file.getProject());
                 final HashMap<String, XmlTag> targetObserversHash = new HashMap<>();
 
                 for (final XmlTag eventXmlTag: xmlTags) {
                     final HashMap<String, XmlTag> eventProblems = new HashMap<>();
-                    if (!eventXmlTag.getName().equals("event")) {
+                    if (!eventXmlTag.getName().equals(ModuleEventsXml.EVENT_TAG)) {
                         continue;
                     }
 
@@ -236,7 +237,7 @@ private List<XmlTag> fetchObserverTagsFromEventTag(final XmlTag eventXmlTag) {
                 }
 
                 for (final XmlTag observerXmlTag: observerXmlTags) {
-                    if (!observerXmlTag.getName().equals("observer")) {
+                    if (!observerXmlTag.getName().equals(ModuleEventsXml.OBSERVER_TAG)) {
                         continue;
                     }
 
@@ -257,10 +258,11 @@ private void addModuleNameWhereSameObserverUsed(
                     return;
                 }
 
-                if (!moduleDeclarationTag.getName().equals("module")) {
+                if (!moduleDeclarationTag.getName().equals(ModuleEventsXml.MODULE_TAG)) {
                     return;
                 }
-                final XmlAttribute moduleNameAttribute = moduleDeclarationTag.getAttribute("name");
+                final XmlAttribute moduleNameAttribute
+                        = moduleDeclarationTag.getAttribute(ModuleEventsXml.NAME_ATTRIBUTE);
                 if (moduleNameAttribute == null) {
                     return;
                 }

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

@@ -19,6 +19,10 @@ public class ModuleEventsXml implements ModuleFileInterface {
     public static final String OBSERVER_TAG = "observer";
     public static final String INSTANCE_ATTRIBUTE = "instance";
     public static final String EVENT_TAG = "event";
+    public static final String MODULE_TAG = "module";
+
+    //attributes
+    public static final String NAME_ATTRIBUTE = "name";
 
     private static final ModuleEventsXml INSTANCE = new ModuleEventsXml();
 

src/com/magento/idea/magento2plugin/reference/provider/EventDispatchReferenceProvider.java

@@ -29,7 +29,7 @@ public PsiReference[] getReferencesByElement(
     ) {
         final String value = StringUtil.unquoteString(element.getText());
         final List<PsiReference> psiReferences = new ArrayList<>();
-        final Collection<PsiElement> targets = EventIndex.getInstance(element.getProject())
+        final Collection<PsiElement> targets = new EventIndex(element.getProject())
                 .getEventElements(
                         value,
                         GlobalSearchScope.getScopeRestrictedByFileTypes(

src/com/magento/idea/magento2plugin/reference/provider/ObserverNameReferenceProvider.java

@@ -30,7 +30,7 @@ public class ObserverNameReferenceProvider extends PsiReferenceProvider {
 
         final String observerName = ((XmlAttributeValueImpl) element).getValue();
         final Collection<PsiElement> observers
-                = EventIndex.getInstance(element.getProject()).getObservers(
+                = new EventIndex(element.getProject()).getObservers(
                         eventName, observerName, GlobalSearchScope.allScope(element.getProject())
                 );