FORGE-2319: No need to check if facet is installed before firing event

forge · Jun 17, 2015 · 082a390 · 082a390
1 parent e48fb1f
commit 082a390
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/facets/impl/src/main/java/org/jboss/forge/addon/facets/FacetFactoryImpl.java b/facets/impl/src/main/java/org/jboss/forge/addon/facets/FacetFactoryImpl.java
@@ -214,13 +214,8 @@ public boolean accept(FACETTYPE type)
       else if (FacetInspector.isConstraintSatisfied(faceted, requiredFacets) && filter.accept(facet))
          try
          {
-            boolean installed = facet.isInstalled();
             result = ((MutableFaceted<FACETTYPE>) faceted).install(facet);
-            // Fire only if Facet#install() was called
-            if (!installed && facet.isInstalled())
-            {
-               fireFacetInstalled(facet);
-            }
+            fireFacetInstalled(facet);
          }
          catch (Exception e)
          {

diff --git a/facets/impl/src/main/java/org/jboss/forge/addon/facets/events/FacetInstalledImpl.java b/facets/impl/src/main/java/org/jboss/forge/addon/facets/events/FacetInstalledImpl.java
@@ -20,4 +20,10 @@ public FacetInstalledImpl(Facet<?> facet)
    {
       super(facet);
    }
+
+   @Override
+   public String toString()
+   {
+      return "FacetInstalled [" + getFacet() + "]";
+   }
 }
diff --git a/facets/tests/src/test/java/test/org/jboss/forge/addon/facets/events/FacetInstalledTest.java b/facets/tests/src/test/java/test/org/jboss/forge/addon/facets/events/FacetInstalledTest.java
@@ -82,7 +82,7 @@ public void processEvent(FacetEvent event)
    }
 
    @Test
-   public void testAlreadyInstallFacetsShouldNotFireEvents()
+   public void testFacetAlreadyInstalledShouldNotFireEvents()
    {
       final List<FacetEvent> facetEvents = new ArrayList<>();
       ListenerRegistration<FacetListener> registration = facetFactory