[richfaces-svn-commits] JBoss Rich Faces SVN: r16677 - in root: cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors and 8 other directories.

Friday, 26 March 2010


Author: alexsmirnov
Date: 2010-03-26 19:48:22 -0400 (Fri, 26 Mar 2010)
New Revision: 16677

Modified:
  
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java
   root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java
  
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java
  
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/BehaviorProcessorTest.java
  
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
  
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java
  
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java
   root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java
Log:
CODING IN PROGRESS - issue RF-8523: Refactor CDK annotations 
https://jira.jboss.org/jira/browse/RF-8523

Modified:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java
===================================================================
---
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -53,24 +53,10 @@
 
     public TagType type() default TagType.All;
 
-    public String handlerName() default "";
+    public String handler() default "";
 
-    public Class<? extends TagHandler> handler() default DEFAULT.class;
+    public String baseClass() default "";
 
-    public Class<? extends TagHandler> baseHandler() default DEFAULT.class;
-
-    /**
-     * Used in {@link Tag} to signal that tag uses the default handler.
-     */
-    public static final class DEFAULT extends TagHandler {
-
-        public DEFAULT(TagConfig config) {
-            super(config);
-        }
-
-        @Override
-        public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
-            // do nothing
-        }
-    }
+    public boolean generate() default false;
+    
 }

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -27,7 +27,6 @@
 
 public abstract class ProcessorBase  {
 
-    private static final String TAG_HANDLER_DEFULT_CLASS =
Tag.DEFAULT.class.getName().replace('$', '.');
 
     @Inject
     private Provider<SourceUtils> sourceUtils;
@@ -53,12 +52,12 @@
         
         TagModel tagModel = new TagModel();
         tagModel.setName(name);
-        tagModel.setTargetClass(ClassName.parseName(tag.handlerName()));
+        tagModel.setTargetClass(ClassName.parseName(tag.handler()));
         tagModel.setType(tag.type());
-        // TODO - set base class name,
+        tagModel.setBaseClass(ClassName.parseName(tag.baseClass()));
         // TODO - move refference integrity to model.
         tagModel.setModel(model);
-        model.setTag(tagModel);
+        model.getTags().add(tagModel);
     }
 
     protected void setIcon(DescriptionGroup component, Icon icon) {

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -56,12 +56,11 @@
     }
 
     private void generateTagHandler(ModelElementBase model) {
-        TagModel tag = model.getTag();
-        if (tag == null || !tag.isGenerate()) {
-            return;
+        for (TagModel tag : model.getTags()) {
+            if (tag.isGenerate()) {
+                generateTagHandler(tag);
+            }
         }
-
-        generateTagHandler(tag);
     }
 
     private void generateTagHandler(TagModel model) {

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -25,6 +25,7 @@
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
+import org.richfaces.cdk.annotations.TagType;
 import org.richfaces.cdk.model.BeanModelBase;
 import org.richfaces.cdk.model.BehaviorModel;
 import org.richfaces.cdk.model.BehaviorRenderer;
@@ -74,13 +75,19 @@
     }
 
     public void visitComponent(ComponentModel model) {
-        Element tag = createTag(getComponentTagName(model)); // TODO change to tag name!
-        Element component = tag.addElement(COMPONENT);
-        component.addElement(COMPONENT_TYPE).addText(model.getType().getType());
-        component.addElement("renderer-type").addText(model.getType().getType()
+ "JsfRenderer");
-
-        addTagHandler(component, model.getTag());
-        appendAttributs(tag, model);
+        for (TagModel tagModel : model.getTags()) {
+            if (TagType.Facelets.equals(tagModel.getType())) {
+                Element tag = createTag(tagModel.getName());
+                Element component = tag.addElement(COMPONENT);
+                component.addElement(COMPONENT_TYPE).addText(model.getType().getType());
+                RendererModel renderer = model.getRenderer();
+                if (null != renderer) {
+                   
component.addElement("renderer-type").addText(renderer.getType().getType());
+                }
+                addTagHandler(component, tagModel);
+                appendAttributs(tag, model);
+            }
+        }
     }
 
     private void addTagHandler(Element parent, TagModel tag) {
@@ -89,30 +96,19 @@
         }
     }
 
-    private String getComponentTagName(ComponentModel model) {
-        return getTagName(model);
-    }
 
-    private String getTagName(ModelElementBase model) {
-        TagModel tag = model.getTag();
-        if (tag != null) {
-            return tag.getName();
-        }
 
-        return "";
-    }
 
-
     public void visitConverter(ConverterModel model) {
-        TagModel tagModel = model.getTag();
-        if (null != tagModel) {
-            Element tag = createTag(tagModel.getName());
-            Element converter = tag.addElement("converter");
-            converter.addElement("converter-id", model.getId().toString());
-
-            addTagHandler(converter, model.getTag());
-            appendAttributs(tag, model);
-        }    
+        for (TagModel tagModel : model.getTags()) {
+            if (TagType.Facelets.equals(tagModel.getType())) {
+                Element tag = createTag(tagModel.getName());
+                Element converter = tag.addElement("converter");
+                converter.addElement("converter-id",
model.getId().toString());
+                addTagHandler(converter, tagModel);
+                appendAttributs(tag, model);
+            }
+        }
     }
 
     /**
@@ -132,12 +128,15 @@
      *
      * */
     public void visitValidator(ValidatorModel model) {
-        Element tag = createTag(getTagName(model));
-        Element validator = tag.addElement("validator");
-        validator.addElement("validator-id", model.getId().toString());
-
-        addTagHandler(validator, model.getTag());
-        appendAttributs(tag, model);
+        for (TagModel tagModel : model.getTags()) {
+            if (TagType.Facelets.equals(tagModel.getType())) {
+                Element tag = createTag(tagModel.getName());
+                Element validator = tag.addElement("validator");
+                validator.addElement("validator-id",
model.getId().toString());
+                addTagHandler(validator, tagModel);
+                appendAttributs(tag, model);
+            }
+        }
     }
 
 
@@ -179,12 +178,15 @@
     }
 
     public void visitBehavior(BehaviorModel model) {
-        Element tag = createTag(getTagName(model));
-        Element validator = tag.addElement("behavior");
-        validator.addElement("behavior-id").addText(model.getId().toString());
-
-        addTagHandler(validator, model.getTag());
-        appendAttributs(tag, model);
+        for (TagModel tagModel : model.getTags()) {
+            if (TagType.Facelets.equals(tagModel.getType())) {
+                Element tag = createTag(tagModel.getName());
+                Element behavior = tag.addElement("behavior");
+               
behavior.addElement("behavior-id").addText(model.getId().toString());
+                addTagHandler(behavior, tagModel);
+                appendAttributs(tag, model);
+            }
+        }
     }
 
     public void visitFacet(FacetModel model) {

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -36,6 +36,8 @@
 
     private String family;
 
+    private RendererModel renderer;
+
     public ComponentModel(FacesId key) {
         this.setId(key);
     }
@@ -59,7 +61,6 @@
         ComponentLibrary.merge(getAttributes(), otherComponent.getAttributes());
         ComponentLibrary.merge(getFacets(), otherComponent.getFacets());
         ComponentLibrary.merge(getEvents(), otherComponent.getEvents());
-//        ComponentLibrary.merge(getRenderers(), otherComponent.getRenderers());
         ComponentLibrary.merge(this, otherComponent);
         this.setGenerate(this.isGenerate() || otherComponent.isGenerate());
     }
@@ -176,7 +177,15 @@
      * TODO - synchronize renderers collection with library ?
      * @return the renderers
      */
-//    public Collection<RendererModel> getRenderers() {
-//        return renderers;
-//    }
+    public RendererModel getRenderer() {
+        return renderer;
+    }
+
+    /**
+     * <p class="changed_added_4_0"></p>
+     * @param renderer the renderer to set
+     */
+    public void setRenderer(RendererModel renderer) {
+        this.renderer = renderer;
+    }
 }

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -14,14 +14,15 @@
 
     private ClassName baseClass;
 
-    private TagModel tag;
+    private final ModelCollection<TagModel> tags =
ModelCollection.<TagModel>create();
 
-    public TagModel getTag() {
-        return tag;
-    }
 
-    public void setTag(TagModel tag) {
-        this.tag = tag;
+    /**
+     * <p class="changed_added_4_0"></p>
+     * @return the tags
+     */
+    public ModelCollection<TagModel> getTags() {
+        return this.tags;
     }
 
     public FacesId getId() {

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagModel.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -26,6 +26,7 @@
 package org.richfaces.cdk.model;
 
 import org.richfaces.cdk.annotations.TagType;
+import org.richfaces.cdk.util.ComparatorUtils;
 
 import java.io.Serializable;
 
@@ -34,7 +35,7 @@
  * @author asmirnov(a)exadel.com
  *
  */
-public class TagModel implements Named , Serializable {
+public class TagModel implements Named , ModelElement<TagModel> {
 
     private static final long serialVersionUID = 3875718626199223087L;
 
@@ -98,6 +99,7 @@
      * <p class="changed_added_4_0"></p>
      * @return the targetClass
      */
+    @Merge
     public ClassName getTargetClass() {
         return this.targetClass;
     }
@@ -116,6 +118,7 @@
      * <p class="changed_added_4_0"></p>
      * @return the baseClass
      */
+    @Merge
     public ClassName getBaseClass() {
         return this.baseClass;
     }
@@ -146,5 +149,20 @@
     public void setGenerate(boolean generate) {
         this.generate = generate;
     }
+
+    @Override
+    public void merge(TagModel other) {
+        ComponentLibrary.merge(this, other);        
+    }
+
+    @Override
+    public boolean same(TagModel other) {
+        return ComparatorUtils.nullSafeEquals(this.getName(), other.getName()) &&
ComparatorUtils.nullSafeEquals(this.getType(), other.getType());
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);        
+    }
     
 }

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -37,6 +37,7 @@
 import org.richfaces.cdk.model.PropertyBase;
 import org.richfaces.cdk.model.RenderKitModel;
 import org.richfaces.cdk.model.RendererModel;
+import org.richfaces.cdk.model.RendererModel.Type;
 import org.richfaces.cdk.templatecompiler.builder.model.JavaClass;
 import org.richfaces.cdk.templatecompiler.model.Template;
 
@@ -78,19 +79,14 @@
     }
     
     private ComponentModel findComponentByRenderer(RendererModel renderer) {
-        String rendererFamily = renderer.getFamily();
-        if (rendererFamily == null) {
-            return null;
-        }
-
+        Type rendererType = renderer.getType();
         Collection<ComponentModel> components = library.getComponents();
-        if (components == null) {
-            return null;
-        }
-        
-        for (ComponentModel component : components) {
-            if (rendererFamily.equals(component.getFamily())) {
-                return component;
+        if (components != null) {
+            for (ComponentModel component : components) {
+                RendererModel rendererModel = component.getRenderer();
+                if (rendererModel != null &&
rendererType.equals(rendererModel.getType())) {
+                    return component;
+                }
             }
         }
 

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -48,20 +48,17 @@
         return ComponentModel.class;
     }
 
+    @Override
+    protected void postMarshal(ComponentModel model, ComponentBean bean) {
+        super.postMarshal(model, bean);
+        if(null != model.getRenderer()){
+           
bean.getExtension().setRendererType(model.getRenderer().getType().getType());
+        }
+    }
 
     @Override
     protected void postUnmarshal(ComponentBean bean, ComponentModel model) {
         super.postUnmarshal(bean, model);
-        // Copy properties/attributes
-
-/*
-        Collection<RendererModel> renderers = model.getRenderers();
-        ComponentBean.ComponentExtension extension = bean.getExtension();
-        if (renderers != null && extension != null) {
-            for (String renderType : extension.getRendererTypes()) {
-                renderers.add(new RendererModel(new RendererModel.Type(renderType)));
-            }
-        }
-*/
+        // TODO set renderer from type.
     }
 }

Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -31,6 +31,7 @@
 import org.richfaces.cdk.model.FacetModel;
 import org.richfaces.cdk.model.Property;
 import org.richfaces.cdk.model.AttributeModel;
+import org.richfaces.cdk.model.TagModel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
@@ -141,8 +142,9 @@
     }
 
     public static class ComponentExtension extends ExtensionBeanBase {
-        private List<String> rendererTypes = Lists.newArrayList();
+        private String rendererType ;
         private List<EventModel> events = Lists.newArrayList();
+        private List<TagModel> tags = Lists.newArrayList();
         private String family;
         /**
          * <p class="changed_added_4_0"></p>
@@ -166,11 +168,11 @@
         /**
          * <p class="changed_added_4_0"></p>
          *
-         * @param rendererTypes the rendererTypes to set
+         * @param rendererType the rendererTypes to set
          */
         @XmlElement(name = "renderer-type", namespace =
ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
-        public void setRendererTypes(List<String> rendererTypes) {
-            this.rendererTypes = rendererTypes;
+        public void setRendererType(String rendererType) {
+            this.rendererType = rendererType;
         }
 
         /**
@@ -178,8 +180,8 @@
          *
          * @return the rendererTypes
          */
-        public List<String> getRendererTypes() {
-            return rendererTypes;
+        public String getRendererType() {
+            return rendererType;
         }
 
         /**
@@ -201,6 +203,23 @@
         public void setEvents(List<EventModel> events) {
             this.events = events;
         }
+
+        /**
+         * <p class="changed_added_4_0"></p>
+         * @return the tags
+         */
+        @XmlElement(name = "tag", namespace =
ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+        public List<TagModel> getTags() {
+            return this.tags;
+        }
+
+        /**
+         * <p class="changed_added_4_0"></p>
+         * @param tags the tags to set
+         */
+        public void setTags(List<TagModel> tags) {
+            this.tags = tags;
+        }
     }
 
 }

Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/BehaviorProcessorTest.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/BehaviorProcessorTest.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/BehaviorProcessorTest.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -109,7 +109,7 @@
         expect(behaviorAnnotation.attributes()).andReturn(new String[]{});
         expect(behaviorAnnotation.icon()).andReturn(null);
         expect(behaviorAnnotation.displayName()).andReturn(null);
-        expect(tag.handlerName()).andStubReturn("");
+        expect(tag.handler()).andStubReturn("");
         utils.visitSupertypes((ClassName)anyObject(),
(SuperTypeVisitor)anyObject());expectLastCall();
         expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class),
(ClassName)anyObject())).andReturn(Collections.<BeanProperty>emptySet());
         expect(utils.getDocComment((ClassName) anyObject())).andStubReturn(null);

Modified:
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -15,13 +15,14 @@
 import org.ajax4jsf.renderkit.AjaxRendererUtils;
 import org.richfaces.cdk.annotations.JsfBehavior;
 import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
 
 /**
  * @author Anton Belevich
  */
 @JsfBehavior(
         id = "org.ajax4jsf.behavior.Ajax",
-        tag = @Tag(name = "ajax", handler = AjaxHandler.class)
+        tag = @Tag(name = "ajax", handler =
"org.ajax4jsf.facelets.tag.AjaxHandler",type=TagType.Facelets)
 )
 @FacesBehavior(value = "org.ajax4jsf.behavior.Ajax")
 public class AjaxBehavior extends javax.faces.component.behavior.AjaxBehavior implements
AjaxClientBehavior {

Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -47,7 +47,9 @@
  *
  */
 @JsfComponent(
-    tag = @Tag(name = "mediaOutput", handlerName =
"org.richfaces.taghandler.html.PushMediaOutput")
+    type = "org.richfaces.MediaOutput",
+    tag = @Tag(name = "mediaOutput", handler =
"org.richfaces.taghandler.html.PushMediaOutput"),
+    generate = ""
 )
 public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent2
{
 

Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -37,7 +37,7 @@
  *
  */
 @JsfComponent(
-        tag = @Tag(handlerName =
"org.richfaces.taghandler.html.OutputPanelTagHandler"),
+        tag = @Tag(handler =
"org.richfaces.taghandler.html.OutputPanelTagHandler"),
         generate = "org.richfaces.component.html.HtmlOutputPanel"
 )
 public abstract class AbstractOutputPanel extends UIPanel implements AjaxOutput {

Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java	2010-03-26
20:32:24 UTC (rev 16676)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java	2010-03-26
23:48:22 UTC (rev 16677)
@@ -46,7 +46,8 @@
  */
 @JsfComponent(
     type = "org.richfaces.Push",
-    tag = @Tag(name = "push", handlerName =
"org.richfaces.taghandler.html.PushTagHandler")
+    tag = @Tag(name = "push", handler =
"org.richfaces.taghandler.html.PushTagHandler"),
+    generate = ""
 )
 public abstract class AbstractPush extends UICommand {
 


    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[richfaces-svn-commits] JBoss Rich Faces SVN: r16677 - in root: cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors and 8 other directories.