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 2014/02/28 09:54:57 UTC
svn commit: r1572887 -
/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
Author: gpetracek
Date: Fri Feb 28 08:54:57 2014
New Revision: 1572887
URL: http://svn.apache.org/r1572887
Log:
EXTCDI-297 improved compatibility
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java?rev=1572887&r1=1572886&r2=1572887&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java Fri Feb 28 08:54:57 2014
@@ -58,7 +58,7 @@ public class ActivationExtension impleme
* Check if the {@link javax.enterprise.inject.spi.AnnotatedType} is an @Alternative and
* is not disabled for the current {@link ProjectStage}.
*/
- protected void vetoAlternativeTypes(@Observes ProcessAnnotatedType<Object> processAnnotatedType)
+ protected void vetoAlternativeTypes(@Observes ProcessAnnotatedType processAnnotatedType)
{
if(!isActivated())
{
@@ -86,7 +86,7 @@ public class ActivationExtension impleme
//TODO validateCodiImplementationRules(processAnnotatedType);
}
- private void checkProjectStageActivated(ProcessAnnotatedType<Object> processAnnotatedType,
+ private void checkProjectStageActivated(ProcessAnnotatedType<?> processAnnotatedType,
ProjectStage currentlyConfiguredProjectStage)
{
if (processAnnotatedType.getAnnotatedType().getJavaClass().isAnnotationPresent(ProjectStageActivated.class))
@@ -105,7 +105,7 @@ public class ActivationExtension impleme
}
}
- private void checkExpressionActivated(ProcessAnnotatedType<Object> processAnnotatedType)
+ private void checkExpressionActivated(ProcessAnnotatedType<?> processAnnotatedType)
{
Class<?> annotatedClass = processAnnotatedType.getAnnotatedType().getJavaClass();