You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/18 17:05:33 UTC
svn commit: r881817 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: application/
view/ view/facelets/
Author: lu4242
Date: Wed Nov 18 16:05:33 2009
New Revision: 881817
URL: http://svn.apache.org/viewvc?rev=881817&view=rev
Log:
MYFACES-2406 Create a view with viewId is null should be possible
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?rev=881817&r1=881816&r2=881817&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Wed Nov 18 16:05:33 2009
@@ -47,6 +47,11 @@
public String calculateViewId(FacesContext context, String viewId)
{
+ //If no viewId found, don't try to derive it, just continue.
+ if (viewId == null)
+ {
+ return null;
+ }
FacesServletMapping mapping = getFacesServletMapping(context);
if (mapping == null || mapping.isExtensionMapping())
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java?rev=881817&r1=881816&r2=881817&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java Wed Nov 18 16:05:33 2009
@@ -44,7 +44,7 @@
public UIViewRoot createView(FacesContext context, String viewId)
{
checkNull(context, "context");
- checkNull(viewId, "viewId");
+ //checkNull(viewId, "viewId");
try
{
@@ -95,7 +95,7 @@
public UIViewRoot restoreView(FacesContext context, String viewId)
{
checkNull(context, "context");
- checkNull(viewId, "viewId");
+ //checkNull(viewId, "viewId");
Application application = context.getApplication();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=881817&r1=881816&r2=881817&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java Wed Nov 18 16:05:33 2009
@@ -56,10 +56,10 @@
@Override
public ViewDeclarationLanguage getViewDeclarationLanguage(String viewId)
{
- if (viewId == null)
- {
- throw new NullPointerException("viewId");
- }
+ //if (viewId == null)
+ //{
+ // throw new NullPointerException("viewId");
+ //}
// TODO: It would be nice to be able to preinitialize the factory. However, since it requires
// access to the ExternalContext it may not be possible, depending on the loading order
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java?rev=881817&r1=881816&r2=881817&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java Wed Nov 18 16:05:33 2009
@@ -65,6 +65,10 @@
*/
public boolean handles(String viewId)
{
+ if (viewId == null)
+ {
+ return false;
+ }
// Check extension first as it's faster than mappings
if (viewId.endsWith(_extension))
{