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 2011/04/01 17:16:32 UTC
svn commit: r1087742 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module:
api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/
impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/
impl/src/test/java/org/a...
Author: gpetracek
Date: Fri Apr 1 15:16:31 2011
New Revision: 1087742
URL: http://svn.apache.org/viewvc?rev=1087742&view=rev
Log:
EXTCDI-150 minor refactoring
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
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/ViewConfigExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java?rev=1087742&r1=1087741&r2=1087742&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java Fri Apr 1 15:16:31 2011
@@ -64,5 +64,5 @@ public interface ViewConfigDescriptor
* Page-bean descriptors for the page represented by the current entry.
* @return descriptors which represent the page-beans for the current page
*/
- List<PageBeanDescriptor> getPageBeanConfigs();
+ List<PageBeanDescriptor> getPageBeanDescriptors();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.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/DefaultViewConfigDescriptor.java?rev=1087742&r1=1087741&r2=1087742&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java Fri Apr 1 15:16:31 2011
@@ -143,7 +143,7 @@ public class DefaultViewConfigDescriptor
/**
* {@inheritDoc}
*/
- public List<PageBeanDescriptor> getPageBeanConfigs()
+ public List<PageBeanDescriptor> getPageBeanDescriptors()
{
return pageBeanDescriptors;
}
@@ -153,7 +153,7 @@ public class DefaultViewConfigDescriptor
*/
public void invokeInitViewMethods()
{
- for(PageBeanDescriptor beanEntry : getPageBeanConfigs())
+ for(PageBeanDescriptor beanEntry : getPageBeanDescriptors())
{
if(beanEntry instanceof LifecycleAwarePageBeanDescriptor)
{
@@ -167,7 +167,7 @@ public class DefaultViewConfigDescriptor
*/
public void invokePrePageActionMethods()
{
- for(PageBeanDescriptor beanEntry : getPageBeanConfigs())
+ for(PageBeanDescriptor beanEntry : getPageBeanDescriptors())
{
if(beanEntry instanceof LifecycleAwarePageBeanDescriptor)
{
@@ -181,7 +181,7 @@ public class DefaultViewConfigDescriptor
*/
public void invokePreRenderViewMethods()
{
- for(PageBeanDescriptor beanEntry : getPageBeanConfigs())
+ for(PageBeanDescriptor beanEntry : getPageBeanDescriptors())
{
if(beanEntry instanceof LifecycleAwarePageBeanDescriptor)
{
@@ -195,7 +195,7 @@ public class DefaultViewConfigDescriptor
*/
public void invokePostRenderViewMethods()
{
- for(PageBeanDescriptor beanEntry : getPageBeanConfigs())
+ for(PageBeanDescriptor beanEntry : getPageBeanDescriptors())
{
if(beanEntry instanceof LifecycleAwarePageBeanDescriptor)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.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/ExtractedViewConfigDefinitionEntry.java?rev=1087742&r1=1087741&r2=1087742&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java Fri Apr 1 15:16:31 2011
@@ -397,7 +397,7 @@ class ExtractedViewConfigDefinitionEntry
/**
* not available
*/
- public List<PageBeanDescriptor> getPageBeanConfigs()
+ public List<PageBeanDescriptor> getPageBeanDescriptors()
{
throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
}
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=1087742&r1=1087741&r2=1087742&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 Fri Apr 1 15:16:31 2011
@@ -175,7 +175,7 @@ public final class PhasesLifecycleCallba
return;
}
- List<PageBeanDescriptor> beanEntries = viewDefinitionEntry.getPageBeanConfigs();
+ List<PageBeanDescriptor> beanEntries = viewDefinitionEntry.getPageBeanDescriptors();
Object bean;
RequestLifecycleCallbackEntry 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=1087742&r1=1087741&r2=1087742&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 Fri Apr 1 15:16:31 2011
@@ -48,7 +48,7 @@ public class PreRenderViewBeanLoader
return;
}
- List<PageBeanDescriptor> beanEntries = viewDefinitionEntry.getPageBeanConfigs();
+ List<PageBeanDescriptor> beanEntries = viewDefinitionEntry.getPageBeanDescriptors();
for(PageBeanDescriptor beanEntry : beanEntries)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.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/ViewConfigExtension.java?rev=1087742&r1=1087741&r2=1087742&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java Fri Apr 1 15:16:31 2011
@@ -145,7 +145,7 @@ public class ViewConfigExtension impleme
//-> we just have to use the page bean of the existing entry
//here we have a simple-entry! (which just contains page-bean definitions)
- for(PageBeanDescriptor pageBeanDescriptor : existingDescriptor.getPageBeanConfigs())
+ for(PageBeanDescriptor pageBeanDescriptor : existingDescriptor.getPageBeanDescriptors())
{
//add page-beans to the real entry
if(newEntry instanceof EditableViewConfigDescriptor)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java?rev=1087742&r1=1087741&r2=1087742&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java Fri Apr 1 15:16:31 2011
@@ -262,13 +262,13 @@ public class ViewConfigTest
ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithViewController.Page1.class);
- List<PageBeanDescriptor> pageBeanDescriptors = viewConfig.getPageBeanConfigs();
+ List<PageBeanDescriptor> pageBeanDescriptors = viewConfig.getPageBeanDescriptors();
assertEquals(pageBeanDescriptors.size(), 1);
assertTrue(pageBeanDescriptors.iterator().next().getBeanClass().equals(TestPageBean2.class));
viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithViewController.Page2.class);
- pageBeanDescriptors = viewConfig.getPageBeanConfigs();
+ pageBeanDescriptors = viewConfig.getPageBeanDescriptors();
assertEquals(pageBeanDescriptors.size(), 2);
for(PageBeanDescriptor pageBeanDescriptor : pageBeanDescriptors)
@@ -299,7 +299,7 @@ public class ViewConfigTest
"org.apache.myfaces.extensions.cdi.jsf.test.impl.config.view.inline.pages.order.TestAccessDecisionVoter3");
PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfig(RegistrationStep01PageBean.class)
- .getPageBeanConfigs().iterator().next();
+ .getPageBeanDescriptors().iterator().next();
assertEquals(pageBeanDescriptor.getBeanClass(), RegistrationStep01PageBean.class);
assertEquals(((LifecycleAwarePageBeanDescriptor) pageBeanDescriptor).getPreRenderViewMethods().size(), 1);
@@ -326,7 +326,7 @@ public class ViewConfigTest
"org.apache.myfaces.extensions.cdi.jsf.test.impl.config.view.inline.pages.order.TestAccessDecisionVoter3");
PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfig(RegistrationStep01PageBean.class)
- .getPageBeanConfigs().iterator().next();
+ .getPageBeanDescriptors().iterator().next();
assertEquals(pageBeanDescriptor.getBeanClass(), RegistrationStep01PageBean.class);
assertEquals(((LifecycleAwarePageBeanDescriptor)pageBeanDescriptor).getPreRenderViewMethods().size(), 1);
@@ -353,7 +353,7 @@ public class ViewConfigTest
"org.apache.myfaces.extensions.cdi.jsf.test.impl.config.view.inline.pages.order.TestAccessDecisionVoter3");
PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfig(RegistrationStep01PageBean.class)
- .getPageBeanConfigs().iterator().next();
+ .getPageBeanDescriptors().iterator().next();
assertEquals(pageBeanDescriptor.getBeanClass(), RegistrationStep01PageBean.class);
assertEquals(((LifecycleAwarePageBeanDescriptor)pageBeanDescriptor).getPreRenderViewMethods().size(), 1);