svn commit: r1073069 - /myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java

[ja...@apache.org]

Author: jakobk
Date: Mon Feb 21 17:06:29 2011
New Revision: 1073069

URL: http://svn.apache.org/viewvc?rev=1073069&view=rev
Log:
EXTCDI-145 Use RenderKitWrapper (JSF 2.0) for InterceptedRenderKit (thanks to Martin Kočí for this patch)

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java?rev=1073069&r1=1073068&r2=1073069&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java Mon Feb 21 17:06:29 2011
@@ -18,23 +18,17 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf2.impl.scope.conversation;
 
-import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils
-        .addWindowContextIdHolderComponent;
-
-import javax.faces.render.RenderKit;
-import javax.faces.render.ClientBehaviorRenderer;
-import javax.faces.render.Renderer;
-import javax.faces.render.ResponseStateManager;
-import javax.faces.context.ResponseStream;
 import javax.faces.context.ResponseWriter;
-import java.io.OutputStream;
+import javax.faces.render.RenderKit;
+import javax.faces.render.RenderKitWrapper;
 import java.io.Writer;
-import java.util.Iterator;
+
+import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.addWindowContextIdHolderComponent;
 
 /**
  * @author Gerhard Petracek
  */
-class InterceptedRenderKit extends RenderKit
+class InterceptedRenderKit extends RenderKitWrapper
 {
     private final RenderKit wrapped;
 
@@ -43,21 +37,6 @@ class InterceptedRenderKit extends Rende
         this.wrapped = wrapped;
     }
 
-    public void addClientBehaviorRenderer(String s, ClientBehaviorRenderer clientBehaviorRenderer)
-    {
-        wrapped.addClientBehaviorRenderer(s, clientBehaviorRenderer);
-    }
-
-    public void addRenderer(String s, String s1, Renderer renderer)
-    {
-        wrapped.addRenderer(s, s1, renderer);
-    }
-
-    public ResponseStream createResponseStream(OutputStream outputStream)
-    {
-        return wrapped.createResponseStream(outputStream);
-    }
-
     public ResponseWriter createResponseWriter(Writer writer, String s, String s1)
     {
         addWindowContextIdHolderComponent();
@@ -65,33 +44,10 @@ class InterceptedRenderKit extends Rende
         return this.wrapped.createResponseWriter(writer, s, s1);
     }
 
-    public ClientBehaviorRenderer getClientBehaviorRenderer(String s)
-    {
-        return wrapped.getClientBehaviorRenderer(s);
-    }
-
-    public Iterator<String> getClientBehaviorRendererTypes()
-    {
-        return wrapped.getClientBehaviorRendererTypes();
-    }
-
-    public Iterator<String> getComponentFamilies()
-    {
-        return wrapped.getComponentFamilies();
-    }
-
-    public Renderer getRenderer(String s, String s1)
-    {
-        return wrapped.getRenderer(s, s1);
-    }
-
-    public Iterator<String> getRendererTypes(String s)
-    {
-        return wrapped.getRendererTypes(s);
-    }
-
-    public ResponseStateManager getResponseStateManager()
+    @Override
+    public RenderKit getWrapped()
     {
-        return wrapped.getResponseStateManager();
+        return wrapped;
     }
+    
 }