myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1004681 - /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/
Date Tue, 05 Oct 2010 15:50:19 GMT
Author: gpetracek
Date: Tue Oct  5 15:50:18 2010
New Revision: 1004681

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

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.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/PhasesLifecycleCallbackPhaseListener.java?rev=1004681&r1=1004680&r2=1004681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
Tue Oct  5 15:50:18 2010
@@ -160,7 +160,7 @@ public final class PhasesLifecycleCallba
             return;
         }
 
-        List<PageBeanConfigEntry> beanEntries = viewDefinitionEntry.getBeanDefinitions();
+        List<PageBeanConfigEntry> beanEntries = viewDefinitionEntry.getPageBeanDefinitions();
 
         Object bean;
         PhasesLifecycleCallbackEntry phasesLifecycleCallbackEntry;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.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/PreRenderViewBeanLoader.java?rev=1004681&r1=1004680&r2=1004681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java
Tue Oct  5 15:50:18 2010
@@ -44,7 +44,7 @@ final class PreRenderViewBeanLoader
             return;
         }
 
-        List<PageBeanConfigEntry> beanEntries = viewDefinitionEntry.getBeanDefinitions();
+        List<PageBeanConfigEntry> beanEntries = viewDefinitionEntry.getPageBeanDefinitions();
 
         for(PageBeanConfigEntry beanEntry : beanEntries)
         {

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.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/ViewConfigCache.java?rev=1004681&r1=1004680&r2=1004681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
Tue Oct  5 15:50:18 2010
@@ -37,7 +37,8 @@ public class ViewConfigCache
         if(getViewIdToViewDefinitionEntryMapping().containsKey(viewId))
         {
             throw new IllegalArgumentException(viewId + " is already mapped to "
-                    + viewId + " -> a further view definition (" +
+                    + viewId + " via " + getViewIdToViewDefinitionEntryMapping().get(viewId).getViewDefinitionClass()
+                    + " -> a further view definition (" +
                     viewDefinitionEntry.getViewDefinitionClass().getName() + ") is invalid");
         }
         getViewIdToViewDefinitionEntryMapping().put(viewId, viewDefinitionEntry);

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/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/ViewConfigEntry.java?rev=1004681&r1=1004680&r2=1004681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java
Tue Oct  5 15:50:18 2010
@@ -98,14 +98,14 @@ public class ViewConfigEntry
         return navigationMode;
     }
 
-    List<PageBeanConfigEntry> getBeanDefinitions()
+    List<PageBeanConfigEntry> getPageBeanDefinitions()
     {
         return beanDefinition;
     }
 
     public void invokeInitViewMethods()
     {
-        for(PageBeanConfigEntry beanEntry : getBeanDefinitions())
+        for(PageBeanConfigEntry beanEntry : getPageBeanDefinitions())
         {
             processCallbacks(beanEntry, beanEntry.getInitViewMethods());
         }
@@ -113,7 +113,7 @@ public class ViewConfigEntry
 
     public void invokePrePageActionMethods()
     {
-        for(PageBeanConfigEntry beanEntry : getBeanDefinitions())
+        for(PageBeanConfigEntry beanEntry : getPageBeanDefinitions())
         {
             processCallbacks(beanEntry, beanEntry.getPrePageActionMethods());
         }
@@ -121,7 +121,7 @@ public class ViewConfigEntry
 
     void invokePreRenderViewMethods()
     {
-        for(PageBeanConfigEntry beanEntry : getBeanDefinitions())
+        for(PageBeanConfigEntry beanEntry : getPageBeanDefinitions())
         {
             processCallbacks(beanEntry, beanEntry.getPreRenderViewMethods());
         }



Mime
View raw message