svn commit: r963492 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ je...

[gp...@apache.org]

Author: gpetracek
Date: Mon Jul 12 21:29:32 2010
New Revision: 963492

URL: http://svn.apache.org/viewvc?rev=963492&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 minor improvements

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/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.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=963492&r1=963491&r2=963492&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 21:29:32 2010
@@ -37,15 +37,6 @@ public interface WindowContext extends A
     Long getId();
 
     /**
-     * TODO add: endContext to reset the window scope
-     * 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 WindowScoped})
-     */
-    void endConversations();
-
-    /**
      * @param conversationGroup group of the conversation in question
      * @param qualifiers optional qualifiers for the conversation
      * @return a new conversation for the given group
@@ -71,7 +62,16 @@ public interface WindowContext extends A
      * @param conversationGroup group of the conversation in question
      * @return the removed conversation - null otherwise
      */
-    Set<Conversation> endConversations(Class conversationGroup);
+    Set<Conversation> endConversationGroup(Class conversationGroup);
+
+    /**
+     * TODO add: endContext to reset the window scope
+     * 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 WindowScoped})
+     */
+    void endConversations();
 
     /**
      * @return configuration of the current context

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java?rev=963492&r1=963491&r2=963492&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean1.java Mon Jul 12 21:29:32 2010
@@ -51,7 +51,7 @@ public class ConversationDemoBean1 imple
 
     public void endGroup1()
     {
-        this.windowContext.endConversations(ConversationGroup1.class);
+        this.windowContext.endConversationGroup(ConversationGroup1.class);
     }
 
     public String getValue()

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=963492&r1=963491&r2=963492&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 Mon Jul 12 21:29:32 2010
@@ -97,7 +97,7 @@ public class JsfWindowContext implements
         return endAndRemoveConversation(conversationKey, conversation);
     }
 
-    public Set<Conversation> endConversations(Class conversationGroupKey)
+    public Set<Conversation> endConversationGroup(Class conversationGroupKey)
     {
         Set<Conversation> removedConversations = new HashSet<Conversation>();
         for(Map.Entry<ConversationKey, Conversation> conversationEntry : this.groupedConversations.entrySet())