Author: Alex.Kolonitsky Date: 2010-03-18 11:41:26 -0400 (Thu, 18 Mar 2010) New Revision: 16614 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java Log: RF-8232 Tags support remove visitor fix checkstyle errors Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-03-18 15:40:46 UTC (rev 16613) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-03-18 15:41:26 UTC (rev 16614) @@ -25,12 +25,9 @@ package org.richfaces.cdk.model; +import javax.faces.render.RenderKitFactory; import java.util.Collection; -import javax.faces.render.RenderKitFactory; - -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com @@ -80,24 +77,18 @@ return behaviorRenderers; } - /* - * (non-Javadoc) - * @see org.richfaces.cdk.model.ModelElement#accept(org.richfaces.cdk.model.LibraryVisitor, java.lang.Object) - */ - @Override - public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { - R result = visitor.visit(this, param); - - return ComponentLibrary.accept(renderers, visitor, param, result); - } - public void accept(Visitor visitor) { visitor.visitRenderKit(this); + + renderers.accept(visitor); + behaviorRenderers.accept(visitor); } @Override public void merge(RenderKitModel other) { - ComponentLibrary.merge(renderers,other.renderers); + ComponentLibrary.merge(renderers, other.renderers); + ComponentLibrary.merge(behaviorRenderers, other.behaviorRenderers); + ComponentLibrary.merge(this, other); }