[richfaces-svn-commits] JBoss Rich Faces SVN: r16908 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/xmlconfig/model and 1 other directories.

Author: Alex.Kolonitsky Date: 2010-05-06 06:57:11 -0400 (Thu, 06 May 2010) New Revision: 16908 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/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java Log: fix core-ui build 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-06 09:56:55 UTC (rev 16907) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-05-06 10:57:11 UTC (rev 16908) @@ -267,7 +267,7 @@ log.debug(" -- Process Java files."); Set<BeanProperty> properties = Sets.newHashSet(); properties.addAll(sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, element)); -// properties.addAll(sourceUtils.getAbstractBeanProperties(element)); + properties.addAll(sourceUtils.getAbstractBeanProperties(element)); // TODO - encapsulate attribute builder into utility class. for (BeanProperty beanProperty : properties) { processAttribute(beanProperty, component.getOrCreateAttribute(beanProperty.getName())); 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-06 09:56:55 UTC (rev 16907) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-05-06 10:57:11 UTC (rev 16908) @@ -23,19 +23,17 @@ package org.richfaces.cdk.xmlconfig.model; -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.Collection; + /** * <p class="changed_added_4_0"> * </p> @@ -43,7 +41,7 @@ * @author asmirnov(a)exadel.com */ @XmlType(name = "faces-config-rendererType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder = {"family", "type", "rendererClass",/*"facet",*/"facesAttributes", "extension"}) + propOrder = {"family", "type", "rendererClass", /*"facet",*/"facesAttributes", "extension"}) public class RendererBean extends ElementBeanBase<RendererBean.RendererExtension> { 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-06 09:56:55 UTC (rev 16907) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AttributesProcessorTest.java 2010-05-06 10:57:11 UTC (rev 16908) @@ -27,6 +27,7 @@ import static org.junit.Assert.*; import java.util.Collections; +import java.util.HashSet; import javax.lang.model.element.TypeElement; @@ -88,6 +89,7 @@ expectLastCall(); BeanProperty beanProperty = createNiceMock(BeanProperty.class); expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class), same(element))).andReturn(Collections.singleton(beanProperty)); + expect(utils.getAbstractBeanProperties(same(element))).andReturn(new HashSet<BeanProperty>(0)); expect(beanProperty.getName()).andReturn(FOO); expect(beanProperty.getType()).andReturn(ClassName.parseName(String.class.getName())); mockController.replay();replay(element,beanProperty); @@ -96,9 +98,6 @@ assertEquals(1, bean.getAttributes().size()); } - /** - * Test method for {@link org.richfaces.cdk.apt.processors.AttributesProcessorImpl#processXmlFragment(org.richfaces.cdk.model.BeanModelBase, java.lang.String[])}. - */ @Test public void testProcessXmlFragment() { BeanModelBase bean = new BeanModelBase();