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/15 09:29:07 UTC
svn commit: r964330 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation...
Author: gpetracek
Date: Thu Jul 15 07:29:07 2010
New Revision: 964330
URL: http://svn.apache.org/viewvc?rev=964330&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 minor refactoring
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/EditableWindowContext.java
- copied, changed from r964253, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/DeactivationAwareWindowContext.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/DeactivationAwareWindowContext.java
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/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.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
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.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=964330&r1=964329&r2=964330&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 Thu Jul 15 07:29:07 2010
@@ -37,22 +37,6 @@ public interface WindowContext extends A
Long getId();
/**
- * TODO move down
- * @param conversationGroup group of the conversation in question
- * @param qualifiers optional qualifiers for the conversation
- * @return a new conversation for the given group
- */
- Conversation createConversation(Class conversationGroup, Annotation... qualifiers);
-
- /**
- * TODO move down
- * @param conversationGroup group of the conversation in question
- * @param qualifiers optional qualifiers for the conversation
- * @return a new conversation for the given group
- */
- Conversation getConversation(Class conversationGroup, Annotation... qualifiers);
-
- /**
* @param conversationGroup group of the conversation in question
* @param qualifiers optional qualifiers for the conversation
* @return the removed conversation - null otherwise
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.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/DefaultWindowContextManager.java?rev=964330&r1=964329&r2=964330&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextManager.java Thu Jul 15 07:29:07 2010
@@ -30,7 +30,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils;
import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.resolveWindowContextId;
import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.restoreInformationOfRequest;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.DeactivationAwareWindowContext;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.EditableWindowContext;
import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
@@ -117,7 +117,7 @@ public class DefaultWindowContextManager
for (WindowContext windowContext : this.windowContextMap.values())
{
for (Conversation conversation :
- ((DeactivationAwareWindowContext)windowContext).getConversations().values())
+ ((EditableWindowContext)windowContext).getConversations().values())
{
//TODO
if (!((EditableConversation)conversation).isActive())
@@ -127,7 +127,7 @@ public class DefaultWindowContextManager
}
//TODO
- ((DeactivationAwareWindowContext)windowContext).removeInactiveConversations();
+ ((EditableWindowContext)windowContext).removeInactiveConversations();
}
}
@@ -168,7 +168,7 @@ public class DefaultWindowContextManager
conversationGroup = ConversationUtils.convertViewAccessScope(bean, conversationGroup, qualifiers);
- return windowContextManager.getCurrentWindowContext()
+ return ((EditableWindowContext)windowContextManager.getCurrentWindowContext())
.getConversation(conversationGroup, qualifiers.toArray(new Annotation[qualifiers.size()]));
}
};
@@ -236,7 +236,7 @@ public class DefaultWindowContextManager
public void resetWindowContext(WindowContext windowContext)
{
- for (Conversation conversation : ((DeactivationAwareWindowContext)windowContext).getConversations().values())
+ for (Conversation conversation : ((EditableWindowContext)windowContext).getConversations().values())
{
conversation.restart();
}
@@ -254,7 +254,7 @@ public class DefaultWindowContextManager
public void resetConversations(WindowContext windowContext)
{
- for (Conversation conversation : ((DeactivationAwareWindowContext)windowContext).getConversations().values())
+ for (Conversation conversation : ((EditableWindowContext)windowContext).getConversations().values())
{
//TODO
((EditableConversation)conversation).deactivate();
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=964330&r1=964329&r2=964330&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 Thu Jul 15 07:29:07 2010
@@ -24,6 +24,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.EditableConversation;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.EditableWindowContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -97,7 +98,7 @@ class GroupedConversationContextAdapter
conversationGroup = ConversationUtils.convertViewAccessScope(bean, conversationGroup, qualifiers);
- return windowContextManager.getCurrentWindowContext()
+ return ((EditableWindowContext)windowContextManager.getCurrentWindowContext())
.getConversation(conversationGroup, qualifiers.toArray(new Annotation[qualifiers.size()]));
}
}
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.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/JsfWindowContext.java?rev=964330&r1=964329&r2=964330&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java Thu Jul 15 07:29:07 2010
@@ -22,7 +22,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContextConfig;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.EditableConversation;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.DeactivationAwareWindowContext;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.EditableWindowContext;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.ConversationKey;
import java.util.Collections;
@@ -38,7 +38,7 @@ import java.lang.annotation.Annotation;
*
* @author Gerhard Petracek
*/
-public class JsfWindowContext implements WindowContext, DeactivationAwareWindowContext
+public class JsfWindowContext implements WindowContext, EditableWindowContext
{
private static final long serialVersionUID = 5272798129165017829L;
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/EditableWindowContext.java (from r964253, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/DeactivationAwareWindowContext.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/spi/EditableWindowContext.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/EditableWindowContext.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/DeactivationAwareWindowContext.java&r1=964253&r2=964330&rev=964330&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/DeactivationAwareWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/EditableWindowContext.java Thu Jul 15 07:29:07 2010
@@ -21,11 +21,12 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
import java.util.Map;
+import java.lang.annotation.Annotation;
/**
* @author Gerhard Petracek
*/
-public interface DeactivationAwareWindowContext
+public interface EditableWindowContext
{
void removeInactiveConversations();
@@ -35,4 +36,17 @@ public interface DeactivationAwareWindow
*/
Map<ConversationKey /*conversation group*/, Conversation> getConversations();
+ /**
+ * @param conversationGroup group of the conversation in question
+ * @param qualifiers optional qualifiers for the conversation
+ * @return a new conversation for the given group
+ */
+ Conversation createConversation(Class conversationGroup, Annotation... qualifiers);
+
+ /**
+ * @param conversationGroup group of the conversation in question
+ * @param qualifiers optional qualifiers for the conversation
+ * @return a new conversation for the given group
+ */
+ Conversation getConversation(Class conversationGroup, Annotation... qualifiers);
}