myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1056806 - in /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl: config/view/ config/view/spi/ scope/conversation/
Date Sat, 08 Jan 2011 21:30:50 GMT
Author: gpetracek
Date: Sat Jan  8 21:30:49 2011
New Revision: 1056806

URL: http://svn.apache.org/viewvc?rev=1056806&view=rev
Log:
cleanup

Removed:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigDefinitionEntry.java
Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDefinitionEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDefinitionEntry.java?rev=1056806&r1=1056805&r2=1056806&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDefinitionEntry.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDefinitionEntry.java
Sat Jan  8 21:30:49 2011
@@ -37,6 +37,8 @@ import java.util.Collections;
  */
 class DefaultViewConfigDefinitionEntry implements ViewConfigEntry
 {
+    private static final long serialVersionUID = -8387356240329549455L;
+
     final static String ROOT_PATH = "/";
     final static String DEFAULT_PAGE_NAME = "";
     final static String DEFAULT_EXTENSION = Page.Extension.XHTML;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java?rev=1056806&r1=1056805&r2=1056806&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
Sat Jan  8 21:30:49 2011
@@ -43,8 +43,12 @@ import static org.apache.myfaces.extensi
  */
 public class DefaultViewConfigEntry implements ViewConfigEntry
 {
-        private final String viewId;
+    private static final long serialVersionUID = 4707048794409336152L;
+
+    private final String viewId;
+
     private final Class<? extends ViewConfig> viewDefinitionClass;
+
     private final Page.NavigationMode navigationMode;
 
     private List<PageBeanConfigEntry> beanDefinition;
@@ -62,12 +66,12 @@ public class DefaultViewConfigEntry impl
     private BeanManager beanManager;
 
     public DefaultViewConfigEntry(String viewId,
-                           Class<? extends ViewConfig> viewDefinitionClass,
-                           Page.NavigationMode navigationMode,
-                           Page.ViewParameter viewParameter,
-                           List<Class<? extends AccessDecisionVoter>> accessDecisionVoters,
-                           Class<? extends ViewConfig> errorView,
-                           List<Annotation> metaDataList)
+                                  Class<? extends ViewConfig> viewDefinitionClass,
+                                  Page.NavigationMode navigationMode,
+                                  Page.ViewParameter viewParameter,
+                                  List<Class<? extends AccessDecisionVoter>>
accessDecisionVoters,
+                                  Class<? extends ViewConfig> errorView,
+                                  List<Annotation> metaDataList)
     {
         this.viewId = viewId;
         this.viewDefinitionClass = viewDefinitionClass;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java?rev=1056806&r1=1056805&r2=1056806&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigEntry.java
Sat Jan  8 21:30:49 2011
@@ -22,13 +22,14 @@ import org.apache.myfaces.extensions.cdi
 import org.apache.myfaces.extensions.cdi.core.api.security.AccessDecisionVoter;
 import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
 
+import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.util.List;
 
 /**
  * @author Gerhard Petracek
  */
-public interface ViewConfigEntry
+public interface ViewConfigEntry extends Serializable
 {
     String getViewId();
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java?rev=1056806&r1=1056805&r2=1056806&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
Sat Jan  8 21:30:49 2011
@@ -37,12 +37,16 @@ public class InjectableConversation impl
 {
     private static final long serialVersionUID = 7754789230388003028L;
 
-    protected final Bean<?> bean;
-    protected final EditableWindowContext editableWindowContext;
+    protected final Class conversationGroup;
+
+    protected final Set<Annotation> qualifiers;
+
+    protected transient EditableWindowContext editableWindowContext;
 
     protected InjectableConversation(Bean<?> bean, WindowContextManager windowContextManager)
     {
-        this.bean = bean;
+        this.conversationGroup = ConversationUtils.getConversationGroup(bean);
+        this.qualifiers = bean.getQualifiers();
         this.editableWindowContext = (EditableWindowContext) windowContextManager.getCurrentWindowContext();
     }
 
@@ -83,11 +87,12 @@ public class InjectableConversation impl
 
     protected EditableConversation findConversation()
     {
-        Class conversationGroup = ConversationUtils.getConversationGroup(this.bean);
-
-        Set<Annotation> qualifiers = this.bean.getQualifiers();
-
-        return this.editableWindowContext.getConversation(conversationGroup,
-                                                          qualifiers.toArray(new Annotation[qualifiers.size()]));
+        if(this.editableWindowContext == null)
+        {
+            this.editableWindowContext = (EditableWindowContext) ConversationUtils
+                    .getWindowContextManager().getCurrentWindowContext();
+        }
+        return this.editableWindowContext.getConversation(this.conversationGroup,
+                                                          this.qualifiers.toArray(new Annotation[qualifiers.size()]));
     }
 }



Mime
View raw message