From fd12a4b348bb6ba0a9cc0c9286106e8386b96b60 Mon Sep 17 00:00:00 2001 From: Dancovich Date: Wed, 18 Sep 2013 19:43:36 -0300 Subject: [PATCH] Adicionado @Alternative para impedir IDE de acusar multiplos candidatos a produtor das implementações de CustomContext. --- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java | 3 +++ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java | 2 ++ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java | 2 ++ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java | 2 ++ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java | 3 +++ impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java | 2 ++ 6 files changed, 14 insertions(+), 0 deletions(-) diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java index dc05db9..a45e647 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java @@ -48,6 +48,8 @@ */ package br.gov.frameworkdemoiselle.internal.context; +import javax.enterprise.inject.Alternative; + import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.annotation.StaticScoped; import br.gov.frameworkdemoiselle.context.StaticContext; @@ -61,6 +63,7 @@ import br.gov.frameworkdemoiselle.context.StaticContext; * */ @Priority(Priority.MIN_PRIORITY) +@Alternative public class StaticContextImpl extends AbstractStaticContext implements StaticContext { public StaticContextImpl() { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java index d5041de..13501e9 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java @@ -49,6 +49,7 @@ package br.gov.frameworkdemoiselle.internal.context; import javax.enterprise.context.ConversationScoped; +import javax.enterprise.inject.Alternative; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.context.ConversationContext; @@ -64,6 +65,7 @@ import br.gov.frameworkdemoiselle.context.ConversationContext; * */ @Priority(Priority.MIN_PRIORITY) +@Alternative public class TemporaryConversationContextImpl extends AbstractStaticContext implements ConversationContext { public TemporaryConversationContextImpl() { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java index 857bf64..48d2d6c 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java @@ -49,6 +49,7 @@ package br.gov.frameworkdemoiselle.internal.context; import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Alternative; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.context.RequestContext; @@ -64,6 +65,7 @@ import br.gov.frameworkdemoiselle.context.RequestContext; * */ @Priority(Priority.MIN_PRIORITY) +@Alternative public class TemporaryRequestContextImpl extends AbstractThreadLocalContext implements RequestContext { public TemporaryRequestContextImpl() { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java index 990ac91..f141960 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java @@ -49,6 +49,7 @@ package br.gov.frameworkdemoiselle.internal.context; import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Alternative; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.context.SessionContext; @@ -65,6 +66,7 @@ import br.gov.frameworkdemoiselle.context.SessionContext; * */ @Priority(Priority.MIN_PRIORITY) +@Alternative public class TemporarySessionContextImpl extends AbstractStaticContext implements SessionContext { public TemporarySessionContextImpl() { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java index 7465798..b8166d2 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java @@ -48,6 +48,8 @@ */ package br.gov.frameworkdemoiselle.internal.context; +import javax.enterprise.inject.Alternative; + import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.annotation.ViewScoped; import br.gov.frameworkdemoiselle.context.ViewContext; @@ -63,6 +65,7 @@ import br.gov.frameworkdemoiselle.context.ViewContext; * */ @Priority(Priority.MIN_PRIORITY) +@Alternative public class TemporaryViewContextImpl extends AbstractThreadLocalContext implements ViewContext { public TemporaryViewContextImpl() { diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java index fb3d992..3910557 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java @@ -38,6 +38,7 @@ package br.gov.frameworkdemoiselle.internal.context; import java.util.Map; +import javax.enterprise.inject.Alternative; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; @@ -56,6 +57,7 @@ import br.gov.frameworkdemoiselle.util.Faces; * */ @Priority(Priority.L2_PRIORITY) +@Alternative public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext { public FacesViewContextImpl() { -- libgit2 0.21.2