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/10/05 20:09:27 UTC
svn commit: r1004750 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl:
config/view/ViewConfigExtension.java
navigation/ViewConfigAwareNavigationHandler.java
Author: gpetracek
Date: Tue Oct 5 18:09:26 2010
New Revision: 1004750
URL: http://svn.apache.org/viewvc?rev=1004750&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/ViewConfigExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
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=1004750&r1=1004749&r2=1004750&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 Tue Oct 5 18:09:26 2010
@@ -73,6 +73,8 @@ public class ViewConfigExtension impleme
@SuppressWarnings({"unchecked"})
Class<? extends ViewConfig> viewDefinitionClass = (Class<? extends ViewConfig>)pageDefinitionClass;
+ //we use abstract classes for nesting definitions
+ //TODO log a warning in case of project-stage dev
if(Modifier.isAbstract(viewDefinitionClass.getModifiers()))
{
return;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.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/navigation/ViewConfigAwareNavigationHandler.java?rev=1004750&r1=1004749&r2=1004750&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java Tue Oct 5 18:09:26 2010
@@ -70,7 +70,8 @@ public class ViewConfigAwareNavigationHa
if(!this.otherOutcomes.contains(outcome))
{
initBeanManager();
- if(outcome.startsWith("class ") || outcome.startsWith("interface "))
+ //it isn't possible to support interfaces due to cdi restrictions
+ if(outcome.startsWith("class "))
{
outcome = outcome.substring(6);
}