Author: alexsmirnov Date: 2010-05-05 15:47:22 -0400 (Wed, 05 May 2010) New Revision: 16898 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedBehavior.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedValidator.java Log: Fix unit tests and renderer attributes marshaling. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -254,7 +254,7 @@ public void visit(TypeMirror type) { try { log.debug(" -> visit - " + type.toString()); - component.addAttributes( + component.getAttributes().addAll( parseProperties(CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml")); } catch (CdkException e) { // TODO - log errors ? @@ -288,7 +288,7 @@ // Process all files from @Jsf.. attributes property. for (String attributes : attributesConfig) { try { - component.addAttributes(parseProperties(CdkEntityResolver.URN_ATTRIBUTES + attributes)); + component.getAttributes().addAll(parseProperties(CdkEntityResolver.URN_ATTRIBUTES + attributes)); } catch (CdkException e) { // TODO - log errors ? } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -33,7 +33,7 @@ */ public class BeanModelBase extends DescriptionGroupBase { - private final ModelMap<String, PropertyBase> attributes = ModelMap.<String, PropertyBase>create(); + private final ModelCollection<PropertyBase> attributes = ModelCollection.<PropertyBase>create(); /** * <p class="changed_added_4_0"> @@ -43,44 +43,30 @@ * @return the attributes */ public Collection<PropertyBase> getAttributes() { - return attributes.values(); + return attributes; } - public void addAttribute(PropertyBase attribute) { - if (attributes != null) { - this.attributes.put(attribute.getName(), attribute); - } - } - - public void addAttributes(Iterable<? extends PropertyBase> attributes) { - if (attributes != null) { - for (PropertyBase attribute : attributes) { - addAttribute(attribute); - } - } - } - - public int getAttributesCount() { - return this.attributes.size(); - } - /** * <p class="changed_added_4_0">Return bean attribute for given name.</p> * @param name * @return */ public PropertyBase getAttribute(final String name) { - return attributes.get(name); + return attributes.find(new Named.NamedPredicate(name)); } public PropertyBase getOrCreateAttribute(String attributeName) { PropertyBase attribute = getAttribute(attributeName); if (null == attribute) { - attribute = new PropertyModel(); + attribute = createAttribute(); attribute.setName(attributeName); - attributes.put(attributeName, attribute); + attributes.add(attribute); } return attribute; } + + protected PropertyBase createAttribute() { + return new PropertyModel(); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -175,6 +175,11 @@ public void setComponentType(String componentType) { this.componentType = componentType; } + + @Override + protected PropertyBase createAttribute() { + return new AttributeModel(); + } /** * <p class="changed_added_4_0">FacesId for lookup renderer in the model.</p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -211,7 +211,7 @@ String importURI = attributesImport.getSource(); Collection<PropertyBase> properties = fragmentParser.parseProperties(importURI); if (properties != null) { - renderer.addAttributes(properties); + renderer.getAttributes().addAll(properties); } } } @@ -219,7 +219,7 @@ List<Attribute> templateAttributes = compositeInterface.getAttributes(); if (templateAttributes != null) { for (Attribute templateAttribute : templateAttributes) { - renderer.addAttribute(buildProperty(templateAttribute)); + renderer.getAttributes().add(buildProperty(templateAttribute)); } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -23,18 +23,19 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; +import java.util.Collection; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.TagModel; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; - /** * <p class="changed_added_4_0"> * </p> @@ -42,11 +43,10 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "faces-config-rendererType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder = {"family", "type", "rendererClass",/*"facet",*/"attributes", "extension"}) + propOrder = {"family", "type", "rendererClass",/*"facet",*/"facesAttributes", "extension"}) public class RendererBean extends - ExtensibleBean<RendererBean.RendererExtension> { + ElementBeanBase<RendererBean.RendererExtension> { - private List<AttributeModel> attributes = Lists.newArrayList(); private String family; private ClassName rendererClass; private String type; @@ -122,19 +122,11 @@ * @return the attributes */ @XmlElement(name = "attribute", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = AttributeBean.class) - public List<AttributeModel> getAttributes() { - return this.attributes; + @XmlJavaTypeAdapter(AttributeAdapter.class) + public Collection<AttributeModel> getFacesAttributes() { + return super.getFacesAttributes(); } - /** - * <p class="changed_added_4_0"> - * </p> - * - * @param attributes the attributes to set - */ - public void setAttributes(List<AttributeModel> attributes) { - this.attributes = attributes; - } /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -94,7 +94,7 @@ mockController.replay();replay(element,beanProperty); processor.processType(bean, element); mockController.verify();verify(element,beanProperty); - assertEquals(1, bean.getAttributesCount()); + assertEquals(1, bean.getAttributes().size()); } /** @@ -111,7 +111,7 @@ mockController.replay(); processor.processXmlFragment(bean, FOO_XML); mockController.verify(); - assertEquals(1, bean.getAttributesCount()); + assertEquals(1, bean.getAttributes().size()); } @Override Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -51,7 +51,7 @@ AttributeModel attributeModel = new AttributeModel(); attributeModel.setName("attr2"); attributeModel.setType(new ClassName(String.class)); - behaviorModel.addAttribute(attributeModel); + behaviorModel.getAttributes().add(attributeModel); library.getBehaviors().add(behaviorModel); Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedBehavior.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedBehavior.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedBehavior.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -29,7 +29,7 @@ import javax.faces.el.ValueBinding; /** - * + * **/ @Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"}) public class GeneratedBehavior extends Object implements Behavior, PartialStateHolder { @@ -38,14 +38,30 @@ public void broadcast(BehaviorEvent event) { } + + private Object testValue; + private Boolean testFlag; + + + public void setTestValue(Object testValue) { + this.testValue = testValue; + } - private Object testValue; + public Object getTestValue() { + if (testValue != null) { + return testValue; + } + ValueBinding vb = getValueBinding("testValue"); + if (null != vb) { + return (Object) vb.getValue(getFacesContext()); + } - + return testValue; + } public void setTestFlag(Boolean testFlag) { this.testFlag = testFlag; } @@ -62,22 +78,6 @@ return testFlag; } - public void setTestValue(Object testValue) { - this.testValue = testValue; - } - - public Object getTestValue() { - if (testValue != null) { - return testValue; - } - - ValueBinding vb = getValueBinding("testValue"); - if (null != vb) { - return (Object) vb.getValue(getFacesContext()); - } - - return testValue; - } private static FacesContext getFacesContext() { return FacesContext.getCurrentInstance(); } @@ -94,8 +94,8 @@ } if (!initialStateMarked()) { Object values[] = new Object[1]; - values[0] = this.isTestFlag(); - values[1] = this.getTestValue(); + values[0] = this.getTestValue(); + values[1] = this.isTestFlag(); return values; } @@ -112,8 +112,8 @@ } Object values[] = (Object[]) state; - setTestFlag((Boolean) values[0]); - setTestValue((Object) values[1]); + setTestValue((Object) values[0]); + setTestFlag((Boolean) values[1]); } private boolean transientValue = false; Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -41,7 +41,7 @@ import javax.faces.el.MethodBinding; /** - * + * **/ @Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"}) public class GeneratedComponent extends UIOutput @@ -61,7 +61,7 @@ "action" )); - + public Collection<String> getEventNames() { return EVENT_NAMES; } @@ -72,45 +72,37 @@ } protected static enum Properties { - list, - listInteger, - listStrings, + testValue, + testFlag, testBinding, testExpr, - testFlag, - testValue + listStrings, + listInteger, + list } - public ArrayList getList() { - return (ArrayList) getStateHelper().eval(Properties.list); + public Object getTestValue() { + return getStateHelper().get(Properties.testValue); } - - public void setList(ArrayList list) { - getStateHelper().put(Properties.list, list); + + public void setTestValue(Object testValue) { + getStateHelper().put(Properties.testValue, testValue); } - public ArrayList getListInteger() { - return (ArrayList) getStateHelper().eval(Properties.listInteger); + public Boolean isTestFlag() { + return Boolean.valueOf(getStateHelper().eval(Properties.testFlag).toString()); } - - public void setListInteger(ArrayList listInteger) { - getStateHelper().put(Properties.listInteger, listInteger); + + public void setTestFlag(Boolean testFlag) { + getStateHelper().put(Properties.testFlag, testFlag); } - public ArrayList getListStrings() { - return (ArrayList) getStateHelper().eval(Properties.listStrings); - } - - public void setListStrings(ArrayList listStrings) { - getStateHelper().put(Properties.listStrings, listStrings); - } - public MethodBinding getTestBinding() { return (MethodBinding) getStateHelper().get(Properties.testBinding); } - + public void setTestBinding(MethodBinding testBinding) { getStateHelper().put(Properties.testBinding, testBinding); } @@ -118,24 +110,32 @@ public MethodExpression getTestExpr() { return (MethodExpression) getStateHelper().get(Properties.testExpr); } - + public void setTestExpr(MethodExpression testExpr) { getStateHelper().put(Properties.testExpr, testExpr); } - public Boolean isTestFlag() { - return Boolean.valueOf(getStateHelper().eval(Properties.testFlag).toString()); + public ArrayList getListStrings() { + return (ArrayList) getStateHelper().eval(Properties.listStrings); } - - public void setTestFlag(Boolean testFlag) { - getStateHelper().put(Properties.testFlag, testFlag); + + public void setListStrings(ArrayList listStrings) { + getStateHelper().put(Properties.listStrings, listStrings); } - public Object getTestValue() { - return getStateHelper().get(Properties.testValue); + public ArrayList getListInteger() { + return (ArrayList) getStateHelper().eval(Properties.listInteger); } + + public void setListInteger(ArrayList listInteger) { + getStateHelper().put(Properties.listInteger, listInteger); + } - public void setTestValue(Object testValue) { - getStateHelper().put(Properties.testValue, testValue); + public ArrayList getList() { + return (ArrayList) getStateHelper().eval(Properties.list); } + + public void setList(ArrayList list) { + getStateHelper().put(Properties.list, list); + } } \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -31,7 +31,7 @@ import org.richfaces.cdk.generate.freemarker.PropertyModel; /** - * + * **/ @Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"}) public class GeneratedConverter extends Object implements Converter, PartialStateHolder { @@ -48,9 +48,9 @@ protected enum Properties { myClass, + testObject, testBoolean, testInteger, - testObject, visible } @@ -58,15 +58,23 @@ public PropertyModel getMyClass() { return (PropertyModel) getStateHelper().eval(Properties.myClass); } - + public void setMyClass(PropertyModel myClass) { getStateHelper().put(Properties.myClass, myClass); } + public Object getTestObject() { + return getStateHelper().get(Properties.testObject); + } + + public void setTestObject(Object testObject) { + getStateHelper().put(Properties.testObject, testObject); + } + public Boolean isTestBoolean() { return Boolean.valueOf(getStateHelper().eval(Properties.testBoolean).toString()); } - + public void setTestBoolean(Boolean testBoolean) { getStateHelper().put(Properties.testBoolean, testBoolean); } @@ -74,29 +82,21 @@ public Integer getTestInteger() { return (Integer) getStateHelper().eval(Properties.testInteger); } - + public void setTestInteger(Integer testInteger) { getStateHelper().put(Properties.testInteger, testInteger); } - public Object getTestObject() { - return getStateHelper().get(Properties.testObject); - } - - public void setTestObject(Object testObject) { - getStateHelper().put(Properties.testObject, testObject); - } - public boolean isVisible() { return Boolean.valueOf(getStateHelper().eval(Properties.visible).toString()); } - + public void setVisible(boolean visible) { getStateHelper().put(Properties.visible, visible); } private StateHelper stateHelper = null; - + protected StateHelper getStateHelper() { if (stateHelper == null) { stateHelper = new PartialStateHolderHelper(this); Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedValidator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedValidator.java 2010-05-05 15:40:30 UTC (rev 16897) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedValidator.java 2010-05-05 19:47:22 UTC (rev 16898) @@ -30,24 +30,40 @@ import javax.faces.el.ValueBinding; /** - * + * **/ @Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"}) public class GeneratedValidator extends Object implements Validator, PartialStateHolder { @Override public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { - + } + + private Object testValue; + private Boolean testFlag; + + + public void setTestValue(Object testValue) { + this.testValue = testValue; + } - private Object testValue; + public Object getTestValue() { + if (testValue != null) { + return testValue; + } + ValueBinding vb = getValueBinding("testValue"); + if (null != vb) { + return (Object) vb.getValue(getFacesContext()); + } - + return testValue; + } public void setTestFlag(Boolean testFlag) { this.testFlag = testFlag; } @@ -64,22 +80,6 @@ return testFlag; } - public void setTestValue(Object testValue) { - this.testValue = testValue; - } - - public Object getTestValue() { - if (testValue != null) { - return testValue; - } - - ValueBinding vb = getValueBinding("testValue"); - if (null != vb) { - return (Object) vb.getValue(getFacesContext()); - } - - return testValue; - } private static FacesContext getFacesContext() { return FacesContext.getCurrentInstance(); } @@ -96,8 +96,8 @@ } if (!initialStateMarked()) { Object values[] = new Object[1]; - values[0] = this.isTestFlag(); - values[1] = this.getTestValue(); + values[0] = this.getTestValue(); + values[1] = this.isTestFlag(); return values; } @@ -114,8 +114,8 @@ } Object values[] = (Object[]) state; - setTestFlag((Boolean) values[0]); - setTestValue((Object) values[1]); + setTestValue((Object) values[0]); + setTestFlag((Boolean) values[1]); } private boolean transientValue = false;