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 2010/10/13 21:25:03 UTC
svn commit: r1022249 - in /myfaces/extensions/cdi/trunk/jee-modules:
jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/
jsf-module/impl/src/...
Author: gpetracek
Date: Wed Oct 13 19:25:03 2010
New Revision: 1022249
URL: http://svn.apache.org/viewvc?rev=1022249&view=rev
Log:
cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java?rev=1022249&r1=1022248&r2=1022249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java Wed Oct 13 19:25:03 2010
@@ -324,6 +324,7 @@ public class TransactionalInterceptor im
private Field findEntityManagerField(Class target)
{
+ //TODO support other injection types
Class currentParamClass = target;
while (currentParamClass != null && !Object.class.getName().equals(currentParamClass.getName()))
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.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/PhaseListenerExtension.java?rev=1022249&r1=1022248&r2=1022249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.java Wed Oct 13 19:25:03 2010
@@ -66,32 +66,25 @@ public class PhaseListenerExtension impl
private void addPhaseListener(Class<? extends PhaseListener> newPhaseListener)
{
- ClassLoader cl = ClassUtils.getClassLoader(null);
+ ClassLoader classLoader = getClassLoader();
- List<Class<? extends PhaseListener>> plList = phaseListeners.get(cl);
+ List<Class<? extends PhaseListener>> phaseListenerClass = phaseListeners.get(classLoader);
- if (plList == null)
+ if (phaseListenerClass == null)
{
- plList = new CopyOnWriteArrayList<Class<? extends PhaseListener>>();
- phaseListeners.put(cl, plList);
+ phaseListenerClass = new CopyOnWriteArrayList<Class<? extends PhaseListener>>();
+ phaseListeners.put(classLoader, phaseListenerClass);
}
// just add the Class of the PhaseListener and do not instantiate it now,
// because there is no FacesContext available at this point and the
// constructor of the PhaseListener could use it (possible in JSF 2.0)
- plList.add(newPhaseListener);
- }
-
- private static PhaseListener createPhaseListenerInstance(
- Class<? extends PhaseListener> phaseListenerClass)
- {
- return ClassUtils.tryToInstantiateClass(
- phaseListenerClass, PhaseListener.class);
+ phaseListenerClass.add(newPhaseListener);
}
public static List<PhaseListener> consumePhaseListeners()
{
- ClassLoader classLoader = ClassUtils.getClassLoader(null);
+ ClassLoader classLoader = getClassLoader();
List<Class<? extends PhaseListener>> foundPhaseListeners = phaseListeners.get(classLoader);
if(foundPhaseListeners != null && ! foundPhaseListeners.isEmpty())
@@ -111,4 +104,14 @@ public class PhaseListenerExtension impl
}
return Collections.emptyList();
}
+
+ private static PhaseListener createPhaseListenerInstance(Class<? extends PhaseListener> phaseListenerClass)
+ {
+ return ClassUtils.tryToInstantiateClass(phaseListenerClass, PhaseListener.class);
+ }
+
+ private static ClassLoader getClassLoader()
+ {
+ return ClassUtils.getClassLoader(null);
+ }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.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/util/ConversationUtils.java?rev=1022249&r1=1022248&r2=1022249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java Wed Oct 13 19:25:03 2010
@@ -38,6 +38,7 @@ import org.apache.myfaces.extensions.cdi
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import java.io.IOException;
@@ -286,7 +287,14 @@ public class ConversationUtils
public static WindowContextIdHolderComponent getWindowContextIdHolderComponent(FacesContext facesContext)
{
- List<UIComponent> uiComponents = facesContext.getViewRoot().getChildren();
+ UIViewRoot uiViewRoot = facesContext.getViewRoot();
+
+ if(uiViewRoot == null)
+ {
+ return null;
+ }
+
+ List<UIComponent> uiComponents = uiViewRoot.getChildren();
for (UIComponent uiComponent : uiComponents)
{
if (uiComponent instanceof WindowContextIdHolderComponent)
@@ -301,7 +309,14 @@ public class ConversationUtils
public static void addWindowContextIdHolderComponent()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
- List<UIComponent> uiComponents = facesContext.getViewRoot().getChildren();
+ UIViewRoot uiViewRoot = facesContext.getViewRoot();
+
+ if(uiViewRoot == null)
+ {
+ return;
+ }
+
+ List<UIComponent> uiComponents = uiViewRoot.getChildren();
for (UIComponent uiComponent : uiComponents)
{
if (uiComponent instanceof WindowContextIdHolderComponent)
@@ -311,7 +326,7 @@ public class ConversationUtils
}
}
- facesContext.getViewRoot().getChildren().add(createComponentWithCurrentWindowContextId());
+ uiViewRoot.getChildren().add(createComponentWithCurrentWindowContextId());
}
private static WindowContextIdHolderComponent createComponentWithCurrentWindowContextId()