You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/09/20 14:12:58 UTC
svn commit: r1173105 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/RestoreInjectionPointsObserver.java
Author: gpetracek
Date: Tue Sep 20 12:12:57 2011
New Revision: 1173105
URL: http://svn.apache.org/viewvc?rev=1173105&view=rev
Log:
EXTCDI-227 Injection in FacesConverter in composite components
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/RestoreInjectionPointsObserver.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/RestoreInjectionPointsObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/RestoreInjectionPointsObserver.java?rev=1173105&r1=1173104&r2=1173105&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/RestoreInjectionPointsObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/RestoreInjectionPointsObserver.java Tue Sep 20 12:12:57 2011
@@ -33,7 +33,7 @@ import javax.faces.component.EditableVal
import javax.faces.component.ValueHolder;
import javax.faces.validator.Validator;
import javax.faces.context.FacesContext;
-import java.util.List;
+import java.util.Collection;
/**
* see EXTCDI-127
@@ -100,7 +100,7 @@ public class RestoreInjectionPointsObser
processComponents(uiViewRoot.getChildren(), advancedQualifierRequiredForDependencyInjection);
}
- private void processComponents(List<UIComponent> uiComponents,
+ private void processComponents(Collection<UIComponent> uiComponents,
boolean advancedQualifierRequiredForDependencyInjection)
{
if(uiComponents == null)
@@ -111,6 +111,7 @@ public class RestoreInjectionPointsObser
for(UIComponent uiComponent : uiComponents)
{
inject(uiComponent, advancedQualifierRequiredForDependencyInjection);
+ processComponents(uiComponent.getFacets().values(), advancedQualifierRequiredForDependencyInjection);
processComponents(uiComponent.getChildren(), advancedQualifierRequiredForDependencyInjection);
}
}