Author: Alex.Kolonitsky Date: 2010-03-19 10:47:30 -0400 (Fri, 19 Mar 2010) New Revision: 16635 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/TagTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ClassGeneratorModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java Log: RF-8232 Tags support fix core-ui build Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-18 18:39:27 UTC (rev 16634) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-19 14:47:30 UTC (rev 16635) @@ -17,7 +17,7 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.DescriptionGroup; import org.richfaces.cdk.model.ModelElementBase; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.TagModel; import org.richfaces.cdk.util.Strings; import org.richfaces.cdk.xmlconfig.CdkEntityResolver; @@ -140,7 +140,7 @@ modelElement.setBaseClass(ClassName.parseName(baseClass)); } - protected Collection<Property> parseProperties(String attributesConfig) { + protected Collection<PropertyBase> parseProperties(String attributesConfig) { return getFragmentParser().parseProperties(CdkEntityResolver.URN_ATTRIBUTES + attributesConfig + ".xml"); } @@ -180,13 +180,13 @@ // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { - Property attribute = component.getOrCreateAttribute(beanProperty.getName()); + PropertyBase attribute = component.getOrCreateAttribute(beanProperty.getName()); processAttribute(beanProperty, attribute); } } - private void processAttribute(BeanProperty beanProperty, Property attribute) { + private void processAttribute(BeanProperty beanProperty, PropertyBase attribute) { attribute.setType(beanProperty.getType()); Attribute attributeAnnotarion = beanProperty.getAnnotation(Attribute.class); @@ -261,7 +261,7 @@ return null; } - private void setBehaviorEvent(Property attribute, EventName eventName) { + private void setBehaviorEvent(PropertyBase attribute, EventName eventName) { if (null != eventName) { org.richfaces.cdk.model.EventName event = new org.richfaces.cdk.model.EventName(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java 2010-03-18 18:39:27 UTC (rev 16634) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java 2010-03-19 14:47:30 UTC (rev 16635) @@ -35,7 +35,7 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.EventName; import org.richfaces.cdk.model.ModelElementBase; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyBase; import java.util.ArrayList; import java.util.Collection; @@ -86,7 +86,7 @@ public TemplateModel getImportClasses() throws TemplateModelException { Set<String> result = new TreeSet<String>(); - for (Property entry : model.getAttributes()) { + for (PropertyBase entry : model.getAttributes()) { if (entry.isGenerate() && !isPredefined(entry)) { result.add(entry.getType().getName()); // System.out.println(entry.getType().getTypeParameters()); @@ -100,7 +100,7 @@ return this.wrapper.wrap(list); } - public boolean isPredefined(Property property) { + public boolean isPredefined(PropertyBase property) { return property.isPrimitive() || isFromJavaLang(property.getType()); } @@ -133,7 +133,7 @@ if (null == eventNames) { eventNames = Sets.newHashSet(); - for (Property property : model.getAttributes()) { + for (PropertyBase property : model.getAttributes()) { eventNames.addAll(property.getEventNames()); } } @@ -142,9 +142,9 @@ } private TemplateModel generatedAttributes() throws TemplateModelException { - Collection<Property> attributes = model.getAttributes(); + Collection<PropertyBase> attributes = model.getAttributes(); Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size()); - for (Property entry : attributes) { + for (PropertyBase entry : attributes) { if (entry.isGenerate()) { PropertyModel propertyModel = new PropertyModel(entry, wrapper); models.add(propertyModel); @@ -153,9 +153,9 @@ return wrapper.wrap(models); } private TemplateModel attributes() throws TemplateModelException { - Collection<Property> attributes = model.getAttributes(); + Collection<PropertyBase> attributes = model.getAttributes(); Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size()); - for (Property entry : attributes) { + for (PropertyBase entry : attributes) { models.add(new PropertyModel(entry, wrapper)); } return wrapper.wrap(models); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2010-03-18 18:39:27 UTC (rev 16634) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2010-03-19 14:47:30 UTC (rev 16635) @@ -30,7 +30,7 @@ import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.util.Strings; /** @@ -39,14 +39,14 @@ * */ public class PropertyModel extends BeanModel implements TemplateModel { - private final Property property; + private final PropertyBase property; /** * <p class="changed_added_4_0"></p> * @param object * @param wrapper */ - public PropertyModel(Property object, BeansWrapper wrapper) { + public PropertyModel(PropertyBase object, BeansWrapper wrapper) { super(object, wrapper); property = object; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/TagTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/TagTemplateModel.java 2010-03-18 18:39:27 UTC (rev 16634) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/TagTemplateModel.java 2010-03-19 14:47:30 UTC (rev 16635) @@ -119,7 +119,7 @@ if (null == eventNames) { eventNames = Sets.newHashSet(); - for (Property property : model.getModel().getAttributes()) { + for (PropertyBase property : model.getModel().getAttributes()) { eventNames.addAll(property.getEventNames()); } } @@ -128,9 +128,9 @@ } private TemplateModel generatedAttributes() throws TemplateModelException { - Collection<Property> attributes = model.getModel().getAttributes(); + Collection<PropertyBase> attributes = model.getModel().getAttributes(); Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size()); - for (Property entry : attributes) { + for (PropertyBase entry : attributes) { if (entry.isGenerate() && entry.isBindingAttribute()) { PropertyModel propertyModel = new PropertyModel(entry, wrapper); models.add(propertyModel); @@ -139,9 +139,9 @@ return wrapper.wrap(models); } private TemplateModel attributes() throws TemplateModelException { - Collection<Property> attributes = model.getModel().getAttributes(); + Collection<PropertyBase> attributes = model.getModel().getAttributes(); Collection<PropertyModel> models = new ArrayList<PropertyModel>(attributes.size()); - for (Property entry : attributes) { + for (PropertyBase entry : attributes) { models.add(new PropertyModel(entry, wrapper)); } return wrapper.wrap(models); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ClassGeneratorModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ClassGeneratorModule.java 2010-03-18 18:39:27 UTC (rev 16634) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ClassGeneratorModule.java 2010-03-19 14:47:30 UTC (rev 16635) @@ -41,7 +41,7 @@ @Override protected void configure() { Multibinder<CdkWriter> setBinder = Multibinder.newSetBinder(binder(), CdkWriter.class); - setBinder.addBinding().to(ComponentClassGenerator.class); +// setBinder.addBinding().to(ComponentClassGenerator.class); setBinder.addBinding().to(ConverterClassGenerator.class); setBinder.addBinding().to(ValidatorClassGenerator.class); setBinder.addBinding().to(BehaviorClassGenerator.class); 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-18 18:39:27 UTC (rev 16634) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-03-19 14:47:30 UTC (rev 16635) @@ -36,7 +36,7 @@ import org.richfaces.cdk.model.ListenerModel; import org.richfaces.cdk.model.ModelElement; import org.richfaces.cdk.model.ModelElementBase; -import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.model.TagModel; @@ -142,7 +142,7 @@ private void appendAttributs(Element tag, BeanModelBase model) { - for (Property entry : model.getAttributes()) { + for (PropertyBase entry : model.getAttributes()) { createAttributeElement(tag, entry.getName(), entry); } } @@ -161,7 +161,7 @@ * * @return * */ - private Element createAttributeElement(Element tag, String name, Property attribute) { + private Element createAttributeElement(Element tag, String name, PropertyBase attribute) { Element attr = tag.addElement("attribute"); attr.addElement("name").addText(name); if (attribute.getDescription() != null) { @@ -199,7 +199,7 @@ } - public void visitProperty(Property model) { + public void visitProperty(PropertyBase model) { }