svn commit: r832791 - /myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java

[ma...@apache.org]

Author: matzew
Date: Wed Nov  4 16:39:27 2009
New Revision: 832791

URL: http://svn.apache.org/viewvc?rev=832791&view=rev
Log:
TRINIDAD-1598 - Trinidad2 - Make dialog compatible with JSF 2.0

Thanks to Martin and Max for the combined work on the patch

Modified:
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?rev=832791&r1=832790&r2=832791&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Wed Nov  4 16:39:27 2009
@@ -42,6 +42,8 @@
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 
+import javax.faces.view.ViewDeclarationLanguage;
+
 import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
@@ -81,6 +83,19 @@
   {
     return _delegate;
   }
+  
+  public ViewDeclarationLanguage getViewDeclarationLanguage(FacesContext context,
+                                                            String viewId)
+  {
+    // InternalViews will not use ViewDeclarationLanguage processors,
+    // since they do essentially the same job themselves.
+    InternalView internal = _getInternalView(context, viewId);
+    if (internal != null)
+    {
+      return null;
+    }
+    return _delegate.getViewDeclarationLanguage(context, viewId);
+  }
 
   @Override
   public UIViewRoot createView(FacesContext context, String viewId)