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/07/12 19:11:04 UTC
svn commit: r963351 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/
jee-modules/jsf-module...
Author: gpetracek
Date: Mon Jul 12 17:11:03 2010
New Revision: 963351
URL: http://svn.apache.org/viewvc?rev=963351&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 cleanup
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationKey.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java?rev=963351&r1=963350&r2=963351&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java Mon Jul 12 17:11:03 2010
@@ -40,8 +40,7 @@ public interface WindowContext extends A
* invalidate all conversations immediately
* attention: window scoped beans won't get destroyed.
* currently there is no api for it.
- * (if it is needed you have to call {@link #endConversation} in combination with the
- * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowGroup})
+ * (if it is needed you have to call {@link #endConversation} in combination with the {@link WindowScoped})
*/
void endConversations();
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java?rev=963351&r1=963350&r2=963351&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java Mon Jul 12 17:11:03 2010
@@ -62,7 +62,7 @@ public abstract class AbstractConversati
{
if (component instanceof Bean)
{
- WindowContextManager conversationManager = resolveConversationManager();
+ WindowContextManager conversationManager = resolveWindowContextManager();
Bean<T> bean = ((Bean<T>) component);
@@ -88,9 +88,9 @@ public abstract class AbstractConversati
if (component instanceof Bean)
{
Bean<T> bean = ((Bean<T>) component);
- WindowContextManager conversationManager = resolveConversationManager();
+ WindowContextManager windowContextManager = resolveWindowContextManager();
- T foundBeanInstance = resolveBeanInstance(conversationManager, bean);
+ T foundBeanInstance = resolveBeanInstance(windowContextManager, bean);
if (foundBeanInstance != null)
{
@@ -107,18 +107,18 @@ public abstract class AbstractConversati
* @return an instance of a custom (the default)
* {@link org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager}
*/
- private WindowContextManager resolveConversationManager()
+ private WindowContextManager resolveWindowContextManager()
{
- Bean<WindowContextManager> conversationManagerBean = resolveConversationManagerBean();
- return CodiUtils.getOrCreateScopedInstanceOfBean(conversationManagerBean);
+ Bean<WindowContextManager> windowContextManagerBean = resolveWindowContextManagerBean();
+ return CodiUtils.getOrCreateScopedInstanceOfBean(windowContextManagerBean);
//TODO cleanup:
- //return (ConversationManager)this.beanManager.getReference(
- //conversationManagerBean, ConversationManager.class,
- //getConversationManagerCreationalContextFor(conversationManagerBean));
+ //return (WindowContextManager)this.beanManager.getReference(
+ //windowContextManagerBean, ConversationManager.class,
+ //getConversationManagerCreationalContextFor(windowContextManagerBean));
}
- protected abstract Bean<WindowContextManager> resolveConversationManagerBean();
+ protected abstract Bean<WindowContextManager> resolveWindowContextManagerBean();
/**
* @param conversationManager the current
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationKey.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationKey.java?rev=963351&r1=963350&r2=963351&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationKey.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationKey.java Mon Jul 12 17:11:03 2010
@@ -22,6 +22,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.tools.annotate.DefaultAnnotation;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import javax.enterprise.inject.Default;
import java.lang.annotation.Annotation;
@@ -29,6 +30,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Iterator;
/**
* @author Gerhard Petracek
@@ -46,8 +48,10 @@ class DefaultConversationKey implements
private final Class<?> groupKey;
private final Set<Annotation> qualifiers = new HashSet<Annotation>();
+ //TODO remove as soon as the new version is tested
+ //old version
//workaround
- private static final ViewAccessScoped VIEW_ACCESS_SCOPED = DefaultAnnotation.of(ViewAccessScoped.class);
+ //private static final ViewAccessScoped VIEW_ACCESS_SCOPED = DefaultAnnotation.of(ViewAccessScoped.class);
//workaround
private boolean viewAccessScopedAnnotationPresent;
@@ -58,12 +62,37 @@ class DefaultConversationKey implements
this.qualifiers.addAll(Arrays.asList(qualifiers));
+ Iterator<Annotation> qualifierIterator = this.qualifiers.iterator();
+
+ Annotation qualifier;
+
//TODO maybe we have to add a real qualifier instead
+ while(qualifierIterator.hasNext())
+ {
+ qualifier = qualifierIterator.next();
+
+ if(ViewAccessScoped.class.isAssignableFrom(qualifier.annotationType()))
+ {
+ qualifierIterator.remove();
+ this.viewAccessScopedAnnotationPresent = true;
+ }
+ else if(ConversationGroup.class.isAssignableFrom(qualifier.annotationType()))
+ {
+ //TODO test with injection into other beans
+ qualifierIterator.remove();
+ }
+
+ }
+
+ /*
+ //TODO remove as soon as the new version is tested
+ //old version
if(this.qualifiers.contains(VIEW_ACCESS_SCOPED))
{
this.qualifiers.remove(VIEW_ACCESS_SCOPED);
this.viewAccessScopedAnnotationPresent = true;
}
+ */
//for easier manual usage of the WindowContextManager
if(this.qualifiers.isEmpty())
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java?rev=963351&r1=963350&r2=963351&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java Mon Jul 12 17:11:03 2010
@@ -64,7 +64,7 @@ public class GroupedConversationContextA
* with the qualifier {@link org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf} or
* the descriptor of the default implementation provided by this module
*/
- protected Bean<WindowContextManager> resolveConversationManagerBean()
+ protected Bean<WindowContextManager> resolveWindowContextManagerBean()
{
return ConversationUtils.resolveConversationManagerBean();
}