You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/06/28 13:06:04 UTC
git commit: DELTASPIKE-212 ProcessAnnotatedType
Updated Branches:
refs/heads/master 43636643b -> 599ddeb4e
DELTASPIKE-212 ProcessAnnotatedType<Object> -> ProcessAnnotatedType
the <Object> generic information does not cover <? extends Object>!
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/599ddeb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/599ddeb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/599ddeb4
Branch: refs/heads/master
Commit: 599ddeb4eeeca60c73a6238fd91db38a54c53b30
Parents: 4363664
Author: Mark Struberg <st...@apache.org>
Authored: Thu Jun 28 13:04:44 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Jun 28 13:04:44 2012 +0200
----------------------------------------------------------------------
.../impl/exclude/extension/ExcludeExtension.java | 20 +++++++-------
.../core/impl/message/MessageBundleExtension.java | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/599ddeb4/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 459f91c..fc6a3bb 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -79,7 +79,7 @@ public class ExcludeExtension implements Extension, Deactivatable
* @param processAnnotatedType observed event
*/
@SuppressWarnings("UnusedDeclaration")
- protected void vetoBeans(@Observes ProcessAnnotatedType<Object> processAnnotatedType, BeanManager beanManager)
+ protected void vetoBeans(@Observes ProcessAnnotatedType processAnnotatedType, BeanManager beanManager)
{
initActivation();
@@ -118,7 +118,7 @@ public class ExcludeExtension implements Extension, Deactivatable
return;
}
- Exclude exclude = processAnnotatedType.getAnnotatedType().getJavaClass().getAnnotation(Exclude.class);
+ Exclude exclude = (Exclude) processAnnotatedType.getAnnotatedType().getJavaClass().getAnnotation(Exclude.class);
if (!evalExcludeWithoutCondition(processAnnotatedType, exclude))
{
@@ -138,7 +138,7 @@ public class ExcludeExtension implements Extension, Deactivatable
evalExcludeWithExpression(processAnnotatedType, exclude);
}
- protected void vetoCustomProjectStageBeans(ProcessAnnotatedType<Object> processAnnotatedType)
+ protected void vetoCustomProjectStageBeans(ProcessAnnotatedType processAnnotatedType)
{
//currently there is a veto for all project-stage implementations,
//but we still need @Typed() for the provided implementations in case of the deactivation of this behaviour
@@ -150,7 +150,7 @@ public class ExcludeExtension implements Extension, Deactivatable
- private void activateGlobalAlternativesWeld(ProcessAnnotatedType<Object> processAnnotatedType,
+ private void activateGlobalAlternativesWeld(ProcessAnnotatedType processAnnotatedType,
BeanManager beanManager)
{
Class<Object> currentBean = processAnnotatedType.getAnnotatedType().getJavaClass();
@@ -229,7 +229,7 @@ public class ExcludeExtension implements Extension, Deactivatable
//see OWB-643
//just #veto the original implementation and remove @Alternative from the ProcessAnnotatedType of
// the configured alternative doesn't work with OWB (due to OWB-643)
- private void activateGlobalAlternativesOwb(ProcessAnnotatedType<Object> processAnnotatedType,
+ private void activateGlobalAlternativesOwb(ProcessAnnotatedType processAnnotatedType,
BeanManager beanManager)
{
//the current bean is the bean with a potential global alternative
@@ -400,7 +400,7 @@ public class ExcludeExtension implements Extension, Deactivatable
return result;
}
- private boolean evalExcludeWithoutCondition(ProcessAnnotatedType<Object> processAnnotatedType, Exclude exclude)
+ private boolean evalExcludeWithoutCondition(ProcessAnnotatedType processAnnotatedType, Exclude exclude)
{
if (exclude.ifProjectStage().length == 0 && exclude.exceptIfProjectStage().length == 0 &&
"".equals(exclude.onExpression()))
@@ -411,7 +411,7 @@ public class ExcludeExtension implements Extension, Deactivatable
return true;
}
- private boolean evalExcludeInProjectStage(ProcessAnnotatedType<Object> processAnnotatedType, Exclude exclude,
+ private boolean evalExcludeInProjectStage(ProcessAnnotatedType processAnnotatedType, Exclude exclude,
ProjectStage currentlyConfiguredProjectStage)
{
Class<? extends ProjectStage>[] activatedIn = exclude.ifProjectStage();
@@ -429,7 +429,7 @@ public class ExcludeExtension implements Extension, Deactivatable
return true;
}
- private boolean evalExcludeNotInProjectStage(ProcessAnnotatedType<Object> processAnnotatedType, Exclude exclude,
+ private boolean evalExcludeNotInProjectStage(ProcessAnnotatedType processAnnotatedType, Exclude exclude,
ProjectStage currentlyConfiguredProjectStage)
{
Class<? extends ProjectStage>[] notIn = exclude.exceptIfProjectStage();
@@ -447,7 +447,7 @@ public class ExcludeExtension implements Extension, Deactivatable
return true;
}
- private void evalExcludeWithExpression(ProcessAnnotatedType<Object> processAnnotatedType, Exclude exclude)
+ private void evalExcludeWithExpression(ProcessAnnotatedType processAnnotatedType, Exclude exclude)
{
if ("".equals(exclude.onExpression()))
{
@@ -503,7 +503,7 @@ public class ExcludeExtension implements Extension, Deactivatable
return expressionInterpreter.evaluate(expressions);
}
- private void veto(ProcessAnnotatedType<?> processAnnotatedType, String vetoType)
+ private void veto(ProcessAnnotatedType processAnnotatedType, String vetoType)
{
processAnnotatedType.veto();
LOG.finer(vetoType + " based veto for bean with type: " +
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/599ddeb4/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
index 7be398e..264bb55 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
@@ -67,7 +67,7 @@ public class MessageBundleExtension implements Extension, Deactivatable
}
@SuppressWarnings("UnusedDeclaration")
- protected void detectInterfaces(@Observes ProcessAnnotatedType<?> processAnnotatedType)
+ protected void detectInterfaces(@Observes ProcessAnnotatedType processAnnotatedType)
{
if (!isActivated)
{