JBoss Rich Faces SVN: r16714 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/apt and 37 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-04-02 20:23:10 -0400 (Fri, 02 Apr 2010)
New Revision: 16714
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingException.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/FileManager.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Implementation.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Output.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/OutputFileManager.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/OutputImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Outputs.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Source.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/SourceFileManager.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/SourceImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CompilationTaskFactory.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
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/BehaviorProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/CdkAnnotationProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ConverterProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/JsfSubComponent.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/apt/processors/RendererProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ValidatorProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.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/java/ConverterClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerClassGenerator.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/java/taghandler/TagHandlerModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerWriter.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/generate/taglib/TaglibModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.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/BehaviorRenderer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroupBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.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/ModelMap.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Named.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Trackable.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ConversionToBooleanMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ConversionToStringMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EmptinessCheckingMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EncodeMethodPrefaceStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EndElementStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EqualsCheckingMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ForEachStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/HelperMethodBodyStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfElseStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassConfiguration.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ParameterizedTypeImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/QNameComparator.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/templatecompiler/RendererClassVisitor.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/templatecompiler/StartElementStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateVisitorFactory.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteAttributeStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteAttributesSetStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteTextStatement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkConditionalJstlElementBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkOtherwiseElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkWhenElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ClientBehavior.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ImportAttributes.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelElement.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/TemplateVisitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/package-info.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/ArrayUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/ComparatorUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXB.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/XmlModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementAdapterBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementBeanBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensibleBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesIdAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java
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/ValidatorAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/XMLSchema.dtd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-schemas-aggregator.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/datatypes.dtd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facelettaglibrary_2_0.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor-primitive.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes-old.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes_import.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_copyright.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_state-holder-methods-old.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_state-holder-methods.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/behavior.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/converter.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/class.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/conversion-to-boolean-method.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/conversion-to-string-method.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/emptiness-check-method.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/encode-method-preface.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/end-element.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/equals-check-method.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/for-each.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/if-else.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/start-element.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/write-attribute.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/write-attributes-set.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/write-text.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/method.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/object.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taghandler.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/validator.ftl
root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessor.groovy
root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/As.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/AsProvider.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestRunner.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/DependenciesGraph.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/Mock.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/RunnerTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/Stub.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TaskFactoryTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AnnotationProcessorTest.java
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/ComponentProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ConverterProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ValidatorProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/validator/ModelValidatorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/RendererTemplateParserTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/XhtmlAttributesParsingTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/util/ComparatorUtilsTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/TaglibGeneratorVisitorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java
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/ConverterBeanTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ModelBeanTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.java
root/cdk/trunk/plugins/generator/src/test/resources/META-INF/cdk/attributes/dummy-template-props.xml
root/cdk/trunk/plugins/generator/src/test/resources/META-INF/cdk/attributes/test-props.xml
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/GeneratedTagHandler.java
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/taglib/TaglibGeneratorTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/taglib/ValidatorTagGeneratorTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/templatecompiler/basic.template.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/templatecompiler/dummy-attributes.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/templatecompiler/dummy.template.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyBehavior.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyConverter.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyValidator.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/properties.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/renderkit.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml
Log:
CODING IN PROGRESS - issue RF-8567: Cleanup Annotation processor code
https://jira.jboss.org/jira/browse/RF-8567
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingException.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/FileManager.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Implementation.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Output.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/OutputFileManager.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/OutputImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Outputs.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Source.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/SourceFileManager.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/SourceImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -2,6 +2,7 @@
import com.google.inject.Inject;
import org.richfaces.cdk.Logger;
+import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.InvalidNameException;
import org.richfaces.cdk.util.PropertyUtils;
@@ -27,16 +28,18 @@
import java.util.Set;
public class AptSourceUtils implements SourceUtils {
- private static final Set<String> PROPERTIES = new HashSet<String>(Arrays.asList(
- "getEventNames", "getDefaultEventName", "getClientBehaviors", "getFamily"));
-
+ private static final Set<String> PROPERTIES =
+ new HashSet<String>(Arrays.asList("getEventNames", "getDefaultEventName", "getClientBehaviors", "getFamily"));
+
private final ProcessingEnvironment processingEnv;
-
+
@Inject
private Logger log;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @param processingEnv
*/
public AptSourceUtils(ProcessingEnvironment processingEnv) {
@@ -45,18 +48,16 @@
/**
* <p class="changed_added_4_0">
- * Get all fields and bean properties that are annotated with given
- * annotation.
+ * Get all fields and bean properties that are annotated with given annotation.
* </p>
- *
+ *
* @param annotation
* @param type
* @return
*/
- public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
- ClassName type) {
+ public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation, TypeElement type) {
Set<BeanProperty> properties = new HashSet<BeanProperty>();
- List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(asTypeElement(type));
+ List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(type);
// Get all methods and fields annotated by annotation.
for (Element childElement : members) {
@@ -64,7 +65,7 @@
if (!annotated) {
continue;
}
-
+
// Have an annotation, infer property name.
if (ElementKind.METHOD.equals(childElement.getKind())) {
processMethod(properties, childElement, annotated);
@@ -78,12 +79,12 @@
return properties;
}
- public Set<BeanProperty> getAbstractBeanProperties(ClassName type) {
+ public Set<BeanProperty> getAbstractBeanProperties(TypeElement type) {
log.debug("AptSourceUtils.getAbstractBeanProperties");
log.debug(" - type = " + type);
Set<BeanProperty> properties = new HashSet<BeanProperty>();
- List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(asTypeElement(type));
+ List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(type);
Map<String, List<ExecutableElement>> props = groupMethodsBySignature(members);
removeNotAbstractGroups(props);
@@ -91,8 +92,7 @@
for (List<ExecutableElement> methods : props.values()) {
ExecutableElement method = methods.get(0);
- if (ElementKind.METHOD.equals(method.getKind())
- && !PROPERTIES.contains(method.getSimpleName().toString())) {
+ if (ElementKind.METHOD.equals(method.getKind()) && !PROPERTIES.contains(method.getSimpleName().toString())) {
processMethod(properties, method, false);
}
@@ -104,7 +104,7 @@
private void removeNotAbstractGroups(Map<String, List<ExecutableElement>> props) {
List<String> removeKeys = new ArrayList<String>();
- for (Map.Entry<String,List<ExecutableElement>> entry : props.entrySet()) {
+ for (Map.Entry<String, List<ExecutableElement>> entry : props.entrySet()) {
List<ExecutableElement> value = entry.getValue();
for (ExecutableElement element : value) {
if (!isAbstract(element)) {
@@ -122,7 +122,7 @@
Map<String, List<ExecutableElement>> props = new HashMap<String, List<ExecutableElement>>();
for (Element element : members) {
if (ElementKind.METHOD.equals(element.getKind())
- && !PROPERTIES.contains(element.getSimpleName().toString())) {
+ && !PROPERTIES.contains(element.getSimpleName().toString())) {
ExecutableElement method = (ExecutableElement) element;
@@ -210,86 +210,93 @@
return new ClassName(type.toString());
}
- public String getDocComment(ClassName componentElement) {
- return this.processingEnv.getElementUtils().getDocComment(asTypeElement(componentElement));
+ public String getDocComment(Element componentElement) {
+ return this.processingEnv.getElementUtils().getDocComment(componentElement);
}
- public Object getConstant(ClassName componentElement, String name) {
+ public Object getConstant(TypeElement componentElement, String name) {
List<VariableElement> fieldsIn =
- ElementFilter.fieldsIn(this.processingEnv.getElementUtils().getAllMembers(asTypeElement(componentElement)));
+ ElementFilter.fieldsIn(this.processingEnv.getElementUtils().getAllMembers(componentElement));
Object value = null;
for (VariableElement field : fieldsIn) {
Set<Modifier> modifiers = field.getModifiers();
if (modifiers.contains(Modifier.FINAL) && modifiers.contains(Modifier.STATIC)
- && field.getSimpleName().toString().equals(name)) {
+ && field.getSimpleName().toString().equals(name)) {
value = field.getConstantValue();
}
}
return value;
}
-
-
- public void visitSupertypes(ClassName type, SuperTypeVisitor visitor) {
- visitSupertypes(asTypeElement(type).asType(),visitor);
- }
- private TypeElement asTypeElement(ClassName type) {
- return processingEnv.getElementUtils().getTypeElement(type.toString());
+ public void visitSupertypes(TypeElement type, SuperTypeVisitor visitor) {
+ visitSupertypes(type.asType(), visitor);
}
-
private void visitSupertypes(TypeMirror type, SuperTypeVisitor visitor) {
List<? extends TypeMirror> supertypes = this.processingEnv.getTypeUtils().directSupertypes(type);
for (TypeMirror typeMirror : supertypes) {
visitSupertypes(typeMirror, visitor);
}
- visitor.visit(asClassDescription(type));
+ visitor.visit(type);
}
+ @Override
+ public TypeElement asTypeElement(ClassName type) {
+ return processingEnv.getElementUtils().getTypeElement(type.toString());
+ }
+ @Override
+ public TypeElement asTypeElement(TypeMirror mirror) {
+ if(TypeKind.DECLARED.equals(mirror.getKind())){
+ return (TypeElement) processingEnv.getTypeUtils().asElement(mirror);
+ } else {
+ return null;
+ }
+ }
+
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
protected final class AptBeanProperty implements BeanProperty {
private Element element;
private boolean exists;
private final String name;
private ClassName type;
-
+
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @param name
*/
public AptBeanProperty(String name) {
this.name = name;
}
-
+
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
-
+
result = prime * result + ((name == null) ? 0 : name.hashCode());
-
+
return result;
}
-
+
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -297,17 +304,17 @@
if (this == obj) {
return true;
}
-
+
if (obj == null) {
return false;
}
-
+
if (getClass() != obj.getClass()) {
return false;
}
-
+
AptBeanProperty other = (AptBeanProperty) obj;
-
+
if (name == null) {
if (other.name != null) {
return false;
@@ -315,43 +322,49 @@
} else if (!name.equals(other.name)) {
return false;
}
-
+
return true;
}
-
+
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @return the name
*/
public String getName() {
return name;
}
-
+
/**
- * <p class="changed_added_4_0">Get JavaDoc comment of appropriate bean property element.</p>
+ * <p class="changed_added_4_0">
+ * Get JavaDoc comment of appropriate bean property element.
+ * </p>
+ *
* @return
*/
public String getDocComment() {
return processingEnv.getElementUtils().getDocComment(element);
}
-
+
public ClassName getType() {
return type;
}
-
+
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return the exists
*/
public boolean isExists() {
return exists;
}
-
+
public List<? extends AnnotationMirror> getAnnotationMirrors() {
return element.getAnnotationMirrors();
}
+
public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
return element.getAnnotation(annotationType);
}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CompilationTaskFactory.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -23,11 +23,16 @@
package org.richfaces.cdk.apt;
-import org.richfaces.cdk.model.ClassName;
-
import java.lang.annotation.Annotation;
import java.util.Set;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.richfaces.cdk.model.ClassName;
+
+
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
@@ -35,47 +40,47 @@
*/
public class ReflectionUtils implements SourceUtils {
- /* (non-Javadoc)
- * @see org.richfaces.cdk.apt.SourceUtils#getBeanPropertiesAnnotatedWith(java.lang.Class, org.richfaces.cdk.model.ClassName)
- */
@Override
- public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
- ClassName type) {
+ public TypeElement asTypeElement(TypeMirror mirror) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Set<BeanProperty> getAbstractBeanProperties(ClassName type) {
+ public TypeElement asTypeElement(ClassName type) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
- * @see org.richfaces.cdk.apt.SourceUtils#getConstant(org.richfaces.cdk.model.ClassName, java.lang.String)
- */
@Override
- public Object getConstant(ClassName componentElement, String name) {
+ public Set<BeanProperty> getAbstractBeanProperties(TypeElement type) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
- * @see org.richfaces.cdk.apt.SourceUtils#getDocComment(org.richfaces.cdk.model.ClassName)
- */
@Override
- public String getDocComment(ClassName componentElement) {
+ public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation, TypeElement type) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
- * @see org.richfaces.cdk.apt.SourceUtils#visitSupertypes(org.richfaces.cdk.model.ClassName, org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor)
- */
@Override
- public void visitSupertypes(ClassName type, SuperTypeVisitor visitor) {
+ public Object getConstant(TypeElement element, String name) {
// TODO Auto-generated method stub
+ return null;
+ }
+ @Override
+ public String getDocComment(Element element) {
+ // TODO Auto-generated method stub
+ return null;
}
+ @Override
+ public void visitSupertypes(TypeElement type, SuperTypeVisitor visitor) {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -27,6 +27,10 @@
import org.richfaces.cdk.model.ClassName;
import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
import java.lang.annotation.Annotation;
import java.util.Set;
import java.util.List;
@@ -48,7 +52,7 @@
*
*/
public interface SuperTypeVisitor {
- public void visit(ClassName type);
+ public void visit(TypeMirror type);
}
@@ -100,21 +104,21 @@
* @return
*/
public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
- ClassName type);
+ TypeElement type);
/**
* <p class="changed_added_4_0"></p>
* @param type
* @return
*/
- public Set<BeanProperty> getAbstractBeanProperties(ClassName type);
+ public Set<BeanProperty> getAbstractBeanProperties(TypeElement type);
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">Get JavaDoc comments associated with given element.</p>
* @param componentElement
* @return
*/
- public String getDocComment(ClassName componentElement);
+ public String getDocComment(Element element);
/**
* <p class="changed_added_4_0"></p>
@@ -122,7 +126,7 @@
* @param name
* @return
*/
- public Object getConstant(ClassName componentElement, String name);
+ public Object getConstant(TypeElement element, String name);
/**
@@ -130,6 +134,20 @@
* @param type
* @param visitor
*/
- public void visitSupertypes(ClassName type, SuperTypeVisitor visitor);
+ public void visitSupertypes(TypeElement type, SuperTypeVisitor visitor);
+
+ /**
+ * <p class="changed_added_4_0">Converts TypeMirror into corresponding TypeElement</p>
+ * @param mirror
+ * @return
+ */
+ public TypeElement asTypeElement(TypeMirror mirror);
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param type
+ * @return
+ */
+ public TypeElement asTypeElement(ClassName type);
}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
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-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -203,11 +203,10 @@
// Process XML files with standard attributes definitions.
SourceUtils sourceUtils = getSourceUtils();
- ClassName componentClassName = ClassName.parseName(element.getQualifiedName().toString());
- sourceUtils.visitSupertypes(componentClassName, new SuperTypeVisitor() {
+ sourceUtils.visitSupertypes(element, new SuperTypeVisitor() {
@Override
- public void visit(ClassName type) {
+ public void visit(TypeMirror type) {
try {
component.getAttributes().addAll(parseProperties(
CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml"));
@@ -220,8 +219,8 @@
Set<BeanProperty> properties = Sets.newHashSet();
- properties.addAll(sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, componentClassName));
- properties.addAll(sourceUtils.getAbstractBeanProperties(componentClassName));
+ properties.addAll(sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, element));
+ properties.addAll(sourceUtils.getAbstractBeanProperties(element));
// TODO - encapsulate attribute builder into utility class.
for (BeanProperty beanProperty : properties) {
process(beanProperty, component.getOrCreateAttribute(beanProperty.getName()));
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/BehaviorProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/CdkAnnotationProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -30,6 +30,7 @@
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.MirroredTypeException;
import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import org.richfaces.cdk.CdkException;
@@ -124,8 +125,11 @@
List<? extends TypeMirror> typeMirrors = e.getTypeMirrors();
for (TypeMirror mirror : typeMirrors) {
interfaceNames.add(ClassName.parseName(mirror.toString()));
- // TODO call processAttributes with element from type mirror.
-// attributesProcessor.processType(component,mirror.);
+ if(TypeKind.DECLARED.equals(mirror.getKind())){
+ attributesProcessor.processType(component, getSourceUtils().asTypeElement(mirror));
+ } else {
+ // TODO - record warning.
+ }
}
}
// TODO - store interfaces in the model.
@@ -143,7 +147,7 @@
component.setType(FacesId.parseId(type));
} else if (null != componentElement) {
// static final String COMPONENT_FAMILY = "...";
- Object value = getSourceUtils().getConstant(asClassDesctiption(componentElement), COMPONENT_TYPE);
+ Object value = getSourceUtils().getConstant(componentElement, COMPONENT_TYPE);
if (value != null) {
component.setType(FacesId.parseId(value.toString()));
}
@@ -154,7 +158,7 @@
if (null != componentElement) {
SourceUtils sourceUtils = getSourceUtils();
Set<BeanProperty> properties =
- sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, asClassDesctiption(componentElement));
+ sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, componentElement);
// TODO - encapsulate attribute builder into utility class.
for (BeanProperty beanProperty : properties) {
@@ -192,7 +196,7 @@
component.setFamily(family);
} else if (null != componentElement) {
// static final String COMPONENT_FAMILY = "...";
- Object value = getSourceUtils().getConstant(asClassDesctiption(componentElement), COMPONENT_FAMILY);
+ Object value = getSourceUtils().getConstant(componentElement, COMPONENT_FAMILY);
if (null != value) {
component.setFamily(value.toString());
}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ConverterProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/JsfSubComponent.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
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-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -129,7 +129,7 @@
}
protected String getDocComment(TypeElement componentElement) {
- return null != componentElement ? getSourceUtils().getDocComment(asClassDesctiption(componentElement)) : null;
+ return null != componentElement ? getSourceUtils().getDocComment(componentElement) : null;
}
/**
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -148,7 +148,7 @@
return;
}
- Object value = getSourceUtils().getConstant(asClassDesctiption(rendererElement), COMPONENT_FAMILY);
+ Object value = getSourceUtils().getConstant(rendererElement, COMPONENT_FAMILY);
if (value != null) {
rendererModel.setFamily(value.toString());
return;
@@ -164,7 +164,7 @@
return type;
}
- Object value = getSourceUtils().getConstant(asClassDesctiption(rendererElement), RENDERER_TYPE);
+ Object value = getSourceUtils().getConstant(rendererElement, RENDERER_TYPE);
if (value != null) {
return value.toString();
}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ValidatorProcessor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ClassGeneratorModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerClassGenerator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerWriter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroupBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelMap.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Named.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Trackable.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ConversionToBooleanMethodBodyStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ConversionToStringMethodBodyStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EmptinessCheckingMethodBodyStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EncodeMethodPrefaceStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EndElementStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EqualsCheckingMethodBodyStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ForEachStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/HelperMethodBodyStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfElseStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassConfiguration.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassConfiguration.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassConfiguration.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: JavaClassConfiguration.java 15790 2009-11-01 16:21:55Z Alex.Kolonitsky $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassConfiguration.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ParameterizedTypeImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/QNameComparator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
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-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: RendererClassGenerator.java 15789 2009-11-01 16:17:29Z Alex.Kolonitsky $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
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-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: RendererTemplateParser.java 15789 2009-11-01 16:17:29Z Alex.Kolonitsky $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/StartElementStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateVisitorFactory.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteAttributeStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteAttributesSetStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteTextStatement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkConditionalJstlElementBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkOtherwiseElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkWhenElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ClientBehavior.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ImportAttributes.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelElement.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/TemplateVisitor.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/package-info.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/ArrayUtils.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/ComparatorUtils.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Pair.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXB.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/XmlModule.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyAdapter.java 16067 2009-12-04 20:11:46Z Alex.Kolonitsky $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementAdapterBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ElementBeanBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: EventAdapter.java 15382 2009-08-28 00:25:48Z alexsmirnov $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensibleBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesIdAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesIdAdapter.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesIdAdapter.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: ClassAdapter.java 16509 2010-03-01 13:40:54Z Alex.Kolonitsky $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesIdAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/MapEntry.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyBean.java 16067 2009-12-04 20:11:46Z Alex.Kolonitsky $
+ * $Id$
*
* License Agreement.
*
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorAdapter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/XMLSchema.dtd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/XMLSchema.dtd 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/XMLSchema.dtd 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,7 +1,7 @@
<!-- DTD for XML Schemas: Part 1: Structures
Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- $Id: XMLSchema.dtd,v 1.3 2006/03/27 17:41:34 rlubke Exp $ -->
+<!-- $Id$ -->
<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
<!-- prose copy in the structures REC is the definitive version --> <!--d-->
<!-- (which shouldn't differ from this one except for this --> <!--d-->
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/XMLSchema.dtd
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-schemas-aggregator.xsd
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/datatypes.dtd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/datatypes.dtd 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/datatypes.dtd 2010-04-03 00:23:10 UTC (rev 16714)
@@ -1,6 +1,6 @@
<!--
DTD for XML Schemas: Part 2: Datatypes
- $Id: datatypes.dtd,v 1.3 2006/03/27 17:41:34 rlubke Exp $
+ $Id$
Note this DTD is NOT normative, or even definitive. - - the
prose copy in the datatypes REC is the definitive version
(which shouldn't differ from this one except for this comment
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/datatypes.dtd
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/web-facelettaglibrary_2_0.xsd
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor-primitive.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes-old.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes_import.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_copyright.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_state-holder-methods-old.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_state-holder-methods.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/behavior.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/converter.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/class.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/conversion-to-boolean-method.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/conversion-to-string-method.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/emptiness-check-method.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/encode-method-preface.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/end-element.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/equals-check-method.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/for-each.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/if-else.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/start-element.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/write-attribute.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/write-attributes-set.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/write-text.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/method.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/object.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taghandler.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/validator.ftl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessor.groovy
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/As.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/AsProvider.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkClassLoaderTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestRunner.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/DependenciesGraph.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/Mock.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/RunnerTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/Stub.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/TaskFactoryTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/AnnotationProcessorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
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-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/BehaviorProcessorTest.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -22,14 +22,16 @@
package org.richfaces.cdk.apt.processors;
-import com.google.inject.Inject;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,22 +43,15 @@
import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.JsfBehavior;
import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.apt.SourceUtils;
import org.richfaces.cdk.apt.SourceUtils.BeanProperty;
import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
-import org.richfaces.cdk.apt.processors.BehaviorProcessor;
-import org.richfaces.cdk.apt.processors.AnnotationProcessorTest;
-import org.richfaces.cdk.apt.SourceUtils;
import org.richfaces.cdk.model.BehaviorModel;
-import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.FacesId;
import org.richfaces.cdk.xmlconfig.JAXB;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.Name;
-import javax.lang.model.element.TypeElement;
-import java.util.Collection;
-import java.util.Collections;
+import com.google.inject.Inject;
/**
* @author akolonitsky
@@ -79,7 +74,7 @@
@Mock
private TypeElement componentElement;
-
+
@Stub
private Name name;
@@ -98,11 +93,10 @@
@Mock
private NamingConventions conventions;
-
@Test
@Ignore
public void testProcess() throws Exception {
-
+
expect(componentElement.getAnnotation(JsfBehavior.class)).andStubReturn(behaviorAnnotation);
expect(behaviorAnnotation.id()).andReturn(MY_BEHAVIOR);
expect(componentElement.getQualifiedName()).andReturn(name);
@@ -110,22 +104,24 @@
expect(componentElement.getQualifiedName()).andReturn(name).atLeastOnce();
expect(behaviorAnnotation.generate()).andReturn("foo.Bar");
expect(behaviorAnnotation.tag()).andReturn(tag);
- expect(behaviorAnnotation.attributes()).andReturn(new String[]{});
+ expect(behaviorAnnotation.attributes()).andReturn(new String[] {});
expect(behaviorAnnotation.description()).andReturn(this.description);
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);
- replay(log, utils, componentElement, jaxb, conventions,behaviorAnnotation,tag,name);
+ utils.visitSupertypes((TypeElement) anyObject(), (SuperTypeVisitor) anyObject());
+ expectLastCall();
+ expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class), (TypeElement) anyObject())).andReturn(
+ Collections.<BeanProperty> emptySet());
+ expect(utils.getDocComment((TypeElement) anyObject())).andStubReturn(null);
+ replay(log, utils, componentElement, jaxb, conventions, behaviorAnnotation, tag, name);
processor.process(componentElement, library);
- verify(log, utils, componentElement, jaxb, conventions,behaviorAnnotation,tag,name);
+ verify(log, utils, componentElement, jaxb, conventions, behaviorAnnotation, tag, name);
Collection<BehaviorModel> behaviors = library.getBehaviors();
assertEquals(1, behaviors.size());
for (BehaviorModel model : behaviors) {
FacesId id = model.getId();
- if (id != null ) {
+ if (id != null) {
assertEquals(MY_BEHAVIOR, id.toString());
}
}
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/BehaviorProcessorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-02 17:49:39 UTC (rev 16713)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-03 00:23:10 UTC (rev 16714)
@@ -23,48 +23,36 @@
package org.richfaces.cdk.apt.processors;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
+import org.richfaces.cdk.FileManager;
import org.richfaces.cdk.Mock;
import org.richfaces.cdk.NamingConventions;
-import org.richfaces.cdk.Stub;
import org.richfaces.cdk.Source;
import org.richfaces.cdk.Sources;
-import org.richfaces.cdk.FileManager;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.EventName;
-import org.richfaces.cdk.annotations.Facet;
+import org.richfaces.cdk.Stub;
import org.richfaces.cdk.annotations.Description;
+import org.richfaces.cdk.annotations.Facet;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.apt.SourceUtils;
import org.richfaces.cdk.apt.SourceUtils.BeanProperty;
-import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.FacetModel;
-import org.richfaces.cdk.model.PropertyBase;
import org.richfaces.cdk.xmlconfig.JAXB;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import java.util.Collections;
+import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
/**
* <p class="changed_added_4_0">
@@ -116,7 +104,7 @@
@Stub
@Source(Sources.RENDERER_TEMPLATES)
- FileManager sources;
+ private FileManager sources;
/**
* Test method for
@@ -182,8 +170,7 @@
@Test
public void testSetFamily1() throws Exception {
TestName fooBar = new TestName(FOO_BAR);
- expect(componentElement.getQualifiedName()).andReturn(fooBar);
- expect(utils.getConstant(eq(ClassName.parseName(FOO_BAR)), eq(ComponentProcessor.COMPONENT_FAMILY))).andReturn(FOO_HTML_BAR);
+ expect(utils.getConstant(same(componentElement), eq(ComponentProcessor.COMPONENT_FAMILY))).andReturn(FOO_HTML_BAR);
replay(log, utils, componentElement, jaxb, annotation);
processor.setComponeneFamily(componentElement, model,"");
verify(log, utils, componentElement, jaxb,annotation );
@@ -193,8 +180,7 @@
@Test
public void testSetFamily2() throws Exception {
TestName fooBar = new TestName(FOO_BAR);
- expect(componentElement.getQualifiedName()).andReturn(fooBar);
- expect(utils.getConstant(eq(ClassName.parseName(FOO_BAR)), eq(ComponentProcessor.COMPONENT_FAMILY))).andReturn(null);
+ expect(utils.getConstant(same(componentElement), eq(ComponentProcessor.COMPONENT_FAMILY))).andReturn(null);
replay(log, utils, componentElement, jaxb, annotation);
processor.setComponeneFamily(componentElement, model,"");
verify(log, utils, componentElement, jaxb,annotation );
@@ -228,8 +214,7 @@
@Test
public void testProcessFacetsFromProperty() throws Exception {
Facet facet = createMock(Facet.class);
- expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
- expect(utils.getBeanPropertiesAnnotatedWith(eq(Facet.class),eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.singleton(property));
+ expect(utils.getBeanPropertiesAnnotatedWith(eq(Facet.class),same(componentElement))).andReturn(Collections.singleton(property));
expect(annotation.facets()).andReturn(new Facet[0]);
expect(property.getAnnotation(Facet.class)).andReturn(facet);
expect(property.getName()).andReturn("foo");
@@ -255,8 +240,7 @@
@Test
public void testProcessFacetsFromAnnotation() throws Exception {
Facet facet = createMock(Facet.class);
- expect(componentElement.getQualifiedName()).andReturn(new TestName(FOO_BAR));
- expect(utils.getBeanPropertiesAnnotatedWith(eq(Facet.class),eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.<BeanProperty>emptySet());
+ expect(utils.getBeanPropertiesAnnotatedWith(eq(Facet.class),same(componentElement))).andReturn(Collections.<BeanProperty>emptySet());
expect(annotation.facets()).andReturn(new Facet[]{facet});
expect(facet.name()).andReturn("foo");
expect(facet.description()).andReturn(this.description);
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ConverterProcessorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ValidatorProcessorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/validator/ModelValidatorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/RendererTemplateParserTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/XhtmlAttributesParsingTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/util/ComparatorUtilsTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/TaglibGeneratorVisitorTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ModelBeanTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/META-INF/cdk/attributes/dummy-template-props.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/META-INF/cdk/attributes/test-props.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedBehavior.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedTagHandler.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedValidator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/taglib/TaglibGeneratorTest.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/taglib/ValidatorTagGeneratorTest.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/templatecompiler/basic.template.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/templatecompiler/dummy-attributes.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/templatecompiler/dummy.template.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyBehavior.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyConverter.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/test/component/MyValidator.java
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/properties.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/renderkit.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id
16 years, 1 month
JBoss Rich Faces SVN: r16713 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-04-02 13:49:39 -0400 (Fri, 02 Apr 2010)
New Revision: 16713
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
Log:
queue js docs (https://jira.jboss.org/jira/browse/RF-7897)
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-04-02 15:27:09 UTC (rev 16712)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-04-02 17:49:39 UTC (rev 16713)
@@ -1,7 +1,30 @@
(function(jQuery, richfaces, jsf) {
+ /**
+ * @class
+ * @name ajax
+ *
+ * */
richfaces.ajax = richfaces.ajax || {};
+
+ /**
+ * JSF 2.0 original method that sends an asynchronous ajax request to the server
+ * see jsf.ajax.request method for parameter's description
+ * @methodOf
+ * @name ajax.request
+ *
+ * */
richfaces.ajax.request = jsf.ajax.request;
+
+ /**
+ * RichFaces wrapper function of JSF 2.0 original method jsf.ajax.request
+ * @methodOf
+ * @name jsf_ajax.request
+ *
+ * @param {string|DOMElement} source - The DOM element or an id that triggered this ajax request
+ * @param {object} [event] - The DOM event that triggered this ajax request
+ * @param {object} [options] - The set name/value pairs that can be sent as request parameters to control client and/or server side request processing
+ * */
jsf.ajax.request = function request(source, event, options) {
//richfaces.ajax.request(source, event, options);
richfaces.queue.push(source, event, options);
@@ -11,6 +34,10 @@
var QUEUE_MODE_PUSH = 'push';
var defaultQueueOptions = {mode: QUEUE_MODE_PULL, requestDelay:0};
+ /**
+ * @class
+ * @name queue
+ * */
richfaces.queue = function(opts){
var QueueEntry = function(queue, source, event, options) {
@@ -178,10 +205,40 @@
return {
+ /**
+ * Get current queue size
+ * @methodOf
+ * @name queue.getSize
+ *
+ * @return {number} size of items in the queue
+ * */
getSize: getSize,
+
+ /**
+ * Check if queue is empty
+ * @methodOf
+ * @name queue.isEmpty
+ *
+ * @return {boolean} returns true if queue is empty
+ * */
isEmpty: isEmpty,
+
+ /**
+ * Extract and submit first QueueEntry in the queue if QueueEntry is ready to submit
+ * @methodOf
+ * @name queue.submitFirst
+ * */
submitFirst: submitFirst,
+ /**
+ * Create and push QueueEntry to the queue for ajax requests
+ * @methodOf
+ * @name queue.push
+ *
+ * @param {string|DOMElement} source - The DOM element or an id that triggered this ajax request
+ * @param {object} [event] - The DOM event that triggered this ajax request
+ * @param {object} [options] - The set name/value pairs that can be sent as request parameters to control client and/or server side request processing
+ * */
push: function (source, event, options) {
var entry = new QueueEntry(this, source, event, options);
var similarityGroupingId = entry.getSimilarityGroupingId();
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-04-02 15:27:09 UTC (rev 16712)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-04-02 17:49:39 UTC (rev 16713)
@@ -1,3 +1,13 @@
+
+/**
+ * Global object container for RichFaces API.
+ * All classes should be defined here
+ * @class
+ * @name RichFaces
+ *
+ * */
+window.RichFaces = {};
+
(function(richfaces, jQuery) {
//form.js
richfaces.submitForm = function(form, parameters, target) {
@@ -644,5 +654,5 @@
};
}()));
-}(window.RichFaces = {}, jQuery));
+}(RichFaces, jQuery));
16 years, 1 month
JBoss Rich Faces SVN: r16712 - root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-04-02 11:27:09 -0400 (Fri, 02 Apr 2010)
New Revision: 16712
Modified:
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
Log:
add missing richfaces-event.js
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-04-02 15:13:12 UTC (rev 16711)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-04-02 15:27:09 UTC (rev 16712)
@@ -46,6 +46,7 @@
@ResourceDependencies( {@ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"),
@ResourceDependency(name = "jquery.js"),
@ResourceDependency(name = "richfaces.js"),
+ @ResourceDependency(name= "richfaces-event.js"),
@ResourceDependency(name = "richfaces-queue.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
@ResourceDependency(name = "script/datascroller.js"),
16 years, 1 month
JBoss Rich Faces SVN: r16711 - in root/examples-sandbox/trunk/components/tables/src/main: webapp and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-04-02 11:13:12 -0400 (Fri, 02 Apr 2010)
New Revision: 16711
Modified:
root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java
root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml
Log:
Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-04-02 15:11:48 UTC (rev 16710)
+++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-04-02 15:13:12 UTC (rev 16711)
@@ -1,7 +1,9 @@
package org.richfaces.demo;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
@@ -15,16 +17,36 @@
@SessionScoped
public class DataBean {
- DataComponentState componentState;
+ DataComponentState dataTableState;
- public DataComponentState getComponentState() {
- return componentState;
+ Map<Object,Integer> stateMap = new HashMap<Object, Integer>();
+
+ int page = 1;
+
+ public int getPage() {
+ return page;
}
- public void setComponentState(DataComponentState componentState) {
- this.componentState = componentState;
+ public void setPage(int page) {
+ this.page = page;
}
+ public Map<Object, Integer> getStateMap() {
+ return stateMap;
+ }
+
+ public void setStateMap(Map<Object, Integer> stateMap) {
+ this.stateMap = stateMap;
+ }
+
+ public DataComponentState getDataTableState() {
+ return dataTableState;
+ }
+
+ public void setDataTableState(DataComponentState dataTableState) {
+ this.dataTableState = dataTableState;
+ }
+
private List<Employee> employeeList;
private boolean state = true;
Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-04-02 15:11:48 UTC (rev 16710)
+++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-04-02 15:13:12 UTC (rev 16711)
@@ -14,17 +14,14 @@
<h:body>
<h:form id="form1">
-
- <rich:dataTable id="richTable" var="record" value="#{dataBean.employeeList}" rows="20" sortMode="single">
+ <ds:dataScroller id="scroller1" for="richTable" page="#{dataBean.page}" maxPages="7"></ds:dataScroller >
+
+ <rich:dataTable id="richTable" var="record" rowKeyVar="rowKey" value="#{dataBean.employeeList}" rows="20" sortMode="single">
<f:facet name="caption">
<h:outputText id="captioFacet1" value="Caption Facet" />
</f:facet>
- <f:facet name="header">
- <rich:colGroup id="headerFacet1">
- <rich:column><h:outputText id="headerFacet12" value="header column 1"> </h:outputText></rich:column>
- <rich:column><h:outputText id="headerFacet13" value="header column 2"></h:outputText></rich:column>
- <rich:column><h:outputText id="headerFacet14" value="header column 3"></h:outputText></rich:column>
- </rich:colGroup>
+ <f:facet name="header">
+ <h:outputText value="header facet"/>
</f:facet>
<rich:column id="column_name" sortBy="#{record.name}" sortIconAsc="resources/images/asc.gif" sortIconDesc="resources/images/desc.gif" sortIconUnsort="resources/images/unsort.gif">
<f:facet name="header">
@@ -50,7 +47,7 @@
<rich:subTable id="expandedSubTable" var="company" value="#{record.companies}" rows="1" switchType="ajax" expanded="true">
<f:facet name="header">
- <ds:dataScroller id="subscroller" for="expandedSubTable" maxPages="3"></ds:dataScroller >
+ <ds:dataScroller id="subscroller" for="expandedSubTable" page="#{dataBean.stateMap[rowKey]}" maxPages="3"></ds:dataScroller >
</f:facet>
<f:facet name="footer">
@@ -71,12 +68,11 @@
</rich:subTable>
<f:facet name="footer">
- <h:outputText id="footerFacet1" value="Footer Facet" />
+ <ds:dataScroller id="scroller3" for="richTable" page="#{dataBean.page}" maxPages="7"></ds:dataScroller >
</f:facet>
</rich:dataTable>
- <ds:dataScroller id="scroller" for="richTable" maxPages="7"></ds:dataScroller >
-
+
<br/>
<h:commandButton value="submit" />
</h:form>
16 years, 1 month
JBoss Rich Faces SVN: r16710 - in root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces: component and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-04-02 11:11:48 -0400 (Fri, 02 Apr 2010)
New Revision: 16710
Modified:
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java
Log:
refactor
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-04-02 15:11:08 UTC (rev 16709)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/DataScrollerUtils.java 2010-04-02 15:11:48 UTC (rev 16710)
@@ -38,8 +38,7 @@
}
public static int getRows(UIComponent component) {
- int row = 0;
- row = (Integer)component.getAttributes().get("rows");
+ int row = (Integer)component.getAttributes().get("rows");
if (row == 0) {
row = getRowCount(component);
}
@@ -89,15 +88,11 @@
if((component instanceof UIDataScroller) && component.isRendered()) {
result.add((UIDataScroller)component);
} else {
-
for(UIComponent child: component.getChildren()) {
if(!(child instanceof NamingContainer)) {
findBelow(child, result);
}
}
-
}
}
-
-
}
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-04-02 15:11:08 UTC (rev 16709)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-04-02 15:11:48 UTC (rev 16710)
@@ -45,6 +45,10 @@
public static final String LAST_DISABLED_FACET_NAME = "last_disabled";
+ public static final String PAGEMODE_FULL = "full";
+
+ public static final String PAGEMODE_SHORT = "short";
+
private Integer page;
protected enum PropertyKeys {
@@ -53,10 +57,7 @@
style, styleClass, stepControls
}
- public enum PageMode {
- full, part
- }
-
+
public String getLastPageMode() {
return (String)getStateHelper().eval(PropertyKeys.lastPageMode);
}
@@ -269,8 +270,8 @@
Integer pageObject = (Integer) ve.getValue(getFacesContext().getELContext());
if (pageObject != null) {
- return pageObject;
- }
+ return pageObject;
+ }
} catch (ELException e) {
throw new FacesException(e);
}
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-04-02 15:11:08 UTC (rev 16709)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-04-02 15:11:48 UTC (rev 16710)
@@ -4,11 +4,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
import javax.el.ValueExpression;
-import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
import javax.faces.context.FacesContext;
@@ -20,7 +17,6 @@
import org.richfaces.DataScrollerUtils;
import org.richfaces.component.UIDataAdaptor;
import org.richfaces.component.UIDataScroller;
-import org.richfaces.component.UIDataScroller.PageMode;
import org.richfaces.component.util.MessageUtil;
import org.richfaces.log.RichfacesLogger;
import org.slf4j.Logger;
@@ -29,14 +25,13 @@
private static final Logger log = RichfacesLogger.COMPONENTS.getLogger();
+
@Override
public boolean isListenerForSource(Object source) {
return ((source instanceof UIDataAdaptor) || (source instanceof UIData));
}
-
public UIDataScroller processActiveDatascroller(FacesContext facesContext, List<UIDataScroller> dataScrollers, UIComponent dataTable) {
-
UIDataScroller activeComponent = null;
List<Object> values = new ArrayList<Object>(dataScrollers.size());
@@ -77,9 +72,9 @@
}
if (!valid) {
- //TODO: anton - test debug
String formattedMessage = getPageDifferentMessage(facesContext, activeComponent, dataScrollers, values);
log.error(formattedMessage);
+
}
return activeComponent;
@@ -113,7 +108,7 @@
if (newPage != -1) {
Object label = MessageUtil.getLabel(facesContext, activeComponent);
String formattedMessage = Messages.getMessage(Messages.DATASCROLLER_PAGE_MISSING, new Object[] {label, page, pageCount, newPage});
- //TODO: anton - test debug
+
log.warn(formattedMessage);
page = newPage;
@@ -126,12 +121,13 @@
String lastPageMode = activeComponent.getLastPageMode();
if (lastPageMode == null) {
- lastPageMode = PageMode.part.toString();
- } else if (!PageMode.part.equals(lastPageMode) && !PageMode.full.equals(lastPageMode)) {
+ lastPageMode = UIDataScroller.PAGEMODE_SHORT;
+ } else if (!UIDataScroller.PAGEMODE_SHORT.equals(lastPageMode)
+ && !UIDataScroller.PAGEMODE_FULL.equals(lastPageMode)) {
throw new IllegalArgumentException("Illegal value of 'lastPageMode' attribute: '" + lastPageMode + "'");
}
- if (page != pageCount || PageMode.part.equals(lastPageMode)) {
+ if (page != pageCount || UIDataScroller.PAGEMODE_SHORT.equals(lastPageMode)) {
first = (page - 1) * rows;
} else {
first = rowCount - rows;
16 years, 1 month
JBoss Rich Faces SVN: r16709 - root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-04-02 11:11:08 -0400 (Fri, 02 Apr 2010)
New Revision: 16709
Modified:
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/ControlsState.java
Log:
remove unnecessary methods
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/ControlsState.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/ControlsState.java 2010-04-02 13:39:39 UTC (rev 16708)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/ControlsState.java 2010-04-02 15:11:08 UTC (rev 16709)
@@ -28,21 +28,19 @@
public class ControlsState {
private boolean firstRendered = true;
- private boolean firstEnabled = true;
+
+ private boolean firstEnabled = true;
private boolean lastRendered = true;
+
private boolean lastEnabled = true;
-/*
- private boolean previousRendered = true;
- private boolean previousEnabled = true;
- private boolean nextRendered = true;
- private boolean nextEnabled = true;
-*/
private boolean fastRewindRendered = true;
+
private boolean fastRewindEnabled = true;
private boolean fastForwardRendered = true;
+
private boolean fastForwardEnabled = true;
private boolean controlsSeparatorRendered = false;
@@ -51,80 +49,71 @@
public boolean getFirstRendered() {
return firstRendered;
}
+
public void setFirstRendered(boolean firstRendered) {
this.firstRendered = firstRendered;
}
+
public boolean getFirstEnabled() {
return firstEnabled;
}
+
public void setFirstEnabled(boolean firstEnabled) {
this.firstEnabled = firstEnabled;
}
+
public boolean getLastRendered() {
return lastRendered;
}
+
public void setLastRendered(boolean lastRendered) {
this.lastRendered = lastRendered;
}
+
public boolean getLastEnabled() {
return lastEnabled;
}
+
public void setLastEnabled(boolean lastEnabled) {
this.lastEnabled = lastEnabled;
}
- /*
- public boolean isPreviousRendered() {
- return previousRendered;
- }
- public void setPreviousRendered(boolean previousRendered) {
- this.previousRendered = previousRendered;
- }
- public boolean isPreviousEnabled() {
- return previousEnabled;
- }
- public void setPreviousEnabled(boolean previousEnabled) {
- this.previousEnabled = previousEnabled;
- }
- public boolean isNextRendered() {
- return nextRendered;
- }
- public void setNextRendered(boolean nextRendered) {
- this.nextRendered = nextRendered;
- }
- public boolean isNextEnabled() {
- return nextEnabled;
- }
- public void setNextEnabled(boolean nextEnabled) {
- this.nextEnabled = nextEnabled;
- }*/
public boolean getFastRewindRendered() {
return fastRewindRendered;
}
+
public void setFastRewindRendered(boolean fastRewindRendered) {
this.fastRewindRendered = fastRewindRendered;
}
+
public boolean getFastRewindEnabled() {
return fastRewindEnabled;
}
+
public void setFastRewindEnabled(boolean fastRewindEnabled) {
this.fastRewindEnabled = fastRewindEnabled;
}
+
public boolean getFastForwardRendered() {
return fastForwardRendered;
}
+
public void setFastForwardRendered(boolean fastForwardRendered) {
this.fastForwardRendered = fastForwardRendered;
}
+
public boolean getFastForwardEnabled() {
return fastForwardEnabled;
}
+
public void setFastForwardEnabled(boolean fastForwardEnabled) {
this.fastForwardEnabled = fastForwardEnabled;
}
+
public boolean isControlsSeparatorRendered() {
return controlsSeparatorRendered;
}
+
public void setControlsSeparatorRendered(boolean controlsSeparatorRendered) {
this.controlsSeparatorRendered = controlsSeparatorRendered;
}
16 years, 1 month
JBoss Rich Faces SVN: r16708 - in root/ui-sandbox/trunk/components/tables/ui/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2010-04-02 09:39:39 -0400 (Fri, 02 Apr 2010)
New Revision: 16708
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-7869
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-04-02 13:36:47 UTC (rev 16707)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-04-02 13:39:39 UTC (rev 16708)
@@ -68,7 +68,15 @@
((PartialEncodingRenderer) renderer).encodePartially(this, context, callback, subComponentIdentifiers);
}
- public void partiallyWalk(FacesContext faces, DataVisitor visitor, Range range, Object argument) {
+ /**
+ * Walk ( visit ) this component on all data-aware children for each row from range.
+ *
+ * @param faces
+ * @param visitor
+ * @param range
+ * @param argument
+ */
+ public void walk(FacesContext faces, DataVisitor visitor, Range range, Object argument) {
Object key = getRowKey();
captureOrigValue(faces);
@@ -88,7 +96,13 @@
@Override
public int getRows() {
- return UIExtendedDataTable.this.getRealClientRows();
+ int rows = getClientRows();
+ if (rows > 0) {
+ rows = Math.min(rows, UIExtendedDataTable.this.getRows());
+ } else {
+ rows = UIExtendedDataTable.this.getRows();
+ }
+ return rows;
}
};
}
@@ -107,16 +121,6 @@
setClientFirst(0);
}
- public int getRealClientRows() {
- int rows = getClientRows();
- if (rows > 0) {
- rows = Math.min(rows, getRows());
- } else {
- rows = getRows();
- }
- return rows;
- }
-
public int getClientRows() {
return (Integer) getStateHelper().eval(PropertyKeys.clientRows, 0);
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-04-02 13:36:47 UTC (rev 16707)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-04-02 13:39:39 UTC (rev 16708)
@@ -35,6 +35,10 @@
import java.util.List;
import java.util.Map;
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ValueExpression;
+import javax.faces.FacesException;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
@@ -46,6 +50,7 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.model.DataVisitResult;
import org.ajax4jsf.model.DataVisitor;
import org.ajax4jsf.model.SequenceRange;
@@ -169,7 +174,7 @@
if (oldClientFirst == null) {
oldClientFirst = clientFirst;
}
- int clientRows = table.getRealClientRows();
+ int clientRows = ((SequenceRange)table.getComponentState().getRange()).getRows();
int difference = clientFirst - oldClientFirst;
SequenceRange addRange = null;
SequenceRange removeRange = null;
@@ -196,7 +201,7 @@
for (state.startIterate(); state.hasNextPart();) {
char partNameFirstChar = state.nextPart().getName().toString().charAt(0);
final List<String> ids = new LinkedList<String>();
- table.partiallyWalk(context, new DataVisitor() {
+ table.walk(context, new DataVisitor() {
@Override
public DataVisitResult process(FacesContext context, Object rowKey, Object argument) {
UIExtendedDataTable dataTable = state.getRow();
@@ -206,7 +211,7 @@
return DataVisitResult.CONTINUE;
}
}, removeRange, null);
- table.partiallyWalk(context, new DataVisitor() {
+ table.walk(context, new DataVisitor() {
@Override
public DataVisitResult process(FacesContext context, Object rowKey, Object argument) {
UIExtendedDataTable dataTable = state.getRow();
@@ -221,8 +226,7 @@
encodeRow(state);
writer.endUpdate();
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new FacesException(e);
}
return DataVisitResult.CONTINUE;
}
@@ -333,20 +337,14 @@
writer.endElement(HTML.INPUT_ELEM);
writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
-
JSFunction ajaxFunction = buildAjaxFunction(context, component, AJAX_FUNCTION_NAME);
AjaxEventOptions eventOptions = buildEventOptions(context, component);
- eventOptions.getParameters().put("rich:columnsOrder", new JSReference("columnsOrder"));
+ Map<String, Object> parameters = eventOptions.getParameters();
+ eventOptions.set(AjaxEventOptions.PARAMETERS, new JSReference("parameters"));
ajaxFunction.addParameter(eventOptions);
-
- JSFunction scrollFunction = buildAjaxFunction(context, component, AJAX_FUNCTION_NAME);
- AjaxEventOptions scrollOptions = buildEventOptions(context, component);
- scrollOptions.getParameters().put("rich:clientFirst", new JSReference("clientFirst"));
- scrollFunction.addParameter(scrollOptions);
-
writer.write("new RichFaces.ExtendedDataTable('" + component.getClientId(context) + "', "
- + getRowCount(component) + ", function(event, columnsOrder) {" + ajaxFunction.toScript() + ";}"
- + ", function(event, clientFirst) {" + scrollFunction.toScript() + ";});");
+ + getRowCount(component) + ", function(event, parameters) {" + ajaxFunction.toScript() + ";},"
+ + ScriptUtils.toScript(parameters) + ");");
writer.endElement(HTML.SCRIPT_ELEM);
writer.endElement(HTML.DIV_ELEM);
}
@@ -566,7 +564,7 @@
protected void doDecode(FacesContext context, UIComponent component) {
super.doDecode(context, component);
Map<String, String> map = context.getExternalContext().getRequestParameterMap();
- updateWidthOfColumns(component, map.get(component.getClientId(context) + ":wi"));
+ updateWidthOfColumns(context, component, map.get(component.getClientId(context) + ":wi"));
if (map.get(component.getClientId(context)) != null) {
updateColumnsOrder(context, component, map.get("rich:columnsOrder"));
}
@@ -575,18 +573,30 @@
}
}
- /**
- * @deprecated
- * TODO Other approaches of updating width of columns should be discussed.
- */
- private void updateWidthOfColumns(UIComponent component, String widthString) {
+ private void updateAttribute(FacesContext context, UIComponent component, String attribute, Object value) {
+ ELContext elContext = context.getELContext();
+ ValueExpression ve = component.getValueExpression(attribute);
+ if (ve != null && !ve.isReadOnly(elContext)) {
+ component.getAttributes().put(attribute, null);
+ try {
+ ve.setValue(elContext, value);
+ } catch (ELException e) {
+ throw new FacesException(e);
+ }
+ } else {
+ component.getAttributes().put(attribute, value);
+ }
+
+ }
+
+ private void updateWidthOfColumns(FacesContext context, UIComponent component, String widthString) {
if (widthString != null && widthString.length() > 0) {
String[] widthArray = widthString.split(",");
for (int i = 0; i < widthArray.length; i++) {
String[] widthEntry = widthArray[i].split(":");
UIComponent column = component.findComponent(widthEntry[0]);
if (!widthEntry[1].equals(column.getAttributes().get("width"))) {
- column.getAttributes().put("width", widthEntry[1]);
+ updateAttribute(context, column, "width", widthEntry[1]);
}
}
@@ -596,20 +606,30 @@
private void updateColumnsOrder(FacesContext context, UIComponent component, String columnsOrderString) {
if (columnsOrderString != null && columnsOrderString.length() > 0) {
String[] columnsOrder = columnsOrderString.split(",");
- component.getAttributes().put("columnsOrder", columnsOrder);
- context.getPartialViewContext().getRenderIds().add(component.getClientId(context));
+ if (!columnsOrder.equals(component.getAttributes().get("columnsOrder"))) {
+ updateAttribute(context, component, "columnsOrder", columnsOrder);
+ context.getPartialViewContext().getRenderIds().add(component.getClientId(context));
+ }
}
}
private void updateClientFirst(FacesContext context, UIComponent component, String clientFirst) {
if (clientFirst != null && clientFirst.length() > 0) {
- int value = Integer.parseInt(clientFirst);
- component.getAttributes().put(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST, value);
- context.getPartialViewContext().getRenderIds().add(
- component.getClientId(context) + "@" + UIExtendedDataTable.SCROLL);
+ Integer value = Integer.valueOf(clientFirst);
+ if (!value.equals(component.getAttributes().get("clientFirst"))) {
+ component.getAttributes().put(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST, value);
+ context.getPartialViewContext().getRenderIds().add(
+ component.getClientId(context) + "@" + UIExtendedDataTable.SCROLL);
+ }
}
}
+ /**
+ * @deprecated
+ * TODO Remove this method when width in relative units in columns will be implimented.
+ * @param column
+ * @return width
+ */
private String getColumnWidth(UIComponent column) {
String width = (String) column.getAttributes().get("width");
if (width == null || width.length() == 0 || width.indexOf("%") != -1) {
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-04-02 13:36:47 UTC (rev 16707)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-04-02 13:39:39 UTC (rev 16708)
@@ -34,7 +34,7 @@
return rule;
};
- richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, scrollFunction) {
+ richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, ajaxParameters) {
var WIDTH_CLASS_NAME_BASE = "rich-extable-cell-width-";
var MIN_WIDTH = 20;
var idSuffixs = [":header", ":footer"]; //TODO Not use idSuffixs
@@ -67,6 +67,15 @@
var timeoutId = null;
+ var sendAjax = function(event, map) {
+ for (key in ajaxParameters) {
+ if(!map[key]) {
+ map[key] = ajaxParameters[key];
+ }
+ }
+ ajaxFunction(event, map);
+ };
+
var updateLayout = function() {
var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0;
var width = Math.max(0, element.clientWidth - offsetWidth);
@@ -173,7 +182,7 @@
widthInput.value = widthsArray.toString();
updateLayout();
adjustResizers();
- ajaxFunction(null, ""); // TODO Maybe, event model should be used here.
+ sendAjax(); // TODO Maybe, event model should be used here.
};
var endResize = function(event) {
@@ -224,7 +233,7 @@
colunmsOrder += i + ",";
}
});
- ajaxFunction(event, colunmsOrder); // TODO Maybe, event model should be used here.
+ sendAjax(event, {"rich:columnsOrder" : colunmsOrder}); // TODO Maybe, event model should be used here.
};
var cancelReorder = function(event) {
@@ -240,7 +249,7 @@
} else {
clientFirst = Math.min(rowCount - rows, clientFirst);
}
- scrollFunction(event, clientFirst);
+ sendAjax(event, {"rich:clientFirst" : clientFirst});// TODO Maybe, event model should be used here.
}
var bodyScrollListener = function(event) {
@@ -303,7 +312,7 @@
}
}
}
- ajaxFunction(null, colunmsOrder); // TODO Maybe, event model should be used here.
+ sendAjax(null, {"rich:columnsOrder" : colunmsOrder}); // TODO Maybe, event model should be used here.
}
this.setColumnWidth = function(id, width) {
16 years, 1 month
JBoss Rich Faces SVN: r16707 - in root: cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt and 10 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-04-02 09:36:47 -0400 (Fri, 02 Apr 2010)
New Revision: 16707
Modified:
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
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/DescriptionProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.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/java/taghandler/TagHandlerModule.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerWriter.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/PropertyBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taghandler.ftl
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedTagHandler.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/AbstractPush.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIRepeat.java
Log:
RF-7826 "Migrate A1 components to new CDK now"
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/pom.xml 2010-04-02 13:36:47 UTC (rev 16707)
@@ -31,6 +31,20 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>guice-maven-plugin</artifactId>
+ <!--<configuration>-->
+ <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass>-->
+ <!--</configuration>-->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-guice</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.0</version>
@@ -107,6 +121,11 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-guice</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
@@ -242,6 +261,11 @@
<artifactId>guice-multibindings</artifactId>
<version>2.0</version>
</dependency>
+<!-- <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-grapher</artifactId>
+ <version>2.0</version>
+ </dependency>-->
<!-- <dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assisted-inject</artifactId>
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -27,12 +27,16 @@
import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
import org.richfaces.cdk.LibraryBuilder;
+import org.richfaces.cdk.apt.processors.AttributesProcessor;
+import org.richfaces.cdk.apt.processors.AttributesProcessorImpl;
+import org.richfaces.cdk.apt.processors.BehaviorProcessor;
+import org.richfaces.cdk.apt.processors.CdkAnnotationProcessor;
import org.richfaces.cdk.apt.processors.ComponentProcessor;
+import org.richfaces.cdk.apt.processors.ConverterProcessor;
+import org.richfaces.cdk.apt.processors.DescriptionProcessor;
+import org.richfaces.cdk.apt.processors.DescriptionProcessorImpl;
+import org.richfaces.cdk.apt.processors.RendererProcessor;
import org.richfaces.cdk.apt.processors.ValidatorProcessor;
-import org.richfaces.cdk.apt.processors.RendererProcessor;
-import org.richfaces.cdk.apt.processors.ConverterProcessor;
-import org.richfaces.cdk.apt.processors.BehaviorProcessor;
-import org.richfaces.cdk.apt.processors.CdkAnnotationProcessor;
import javax.annotation.processing.Processor;
@@ -56,6 +60,8 @@
setBinder.addBinding().to(ValidatorProcessor.class);
bind(Processor.class).to(CdkProcessor.class);
+ bind(AttributesProcessor.class).to(AttributesProcessorImpl.class);
+ bind(DescriptionProcessor.class).to(DescriptionProcessorImpl.class);
bind(CompilationTaskFactory.class).to(TaskFactoryImpl.class);
bind(LibraryBuilder.class).to(AptBuilder.class);
bind(SourceUtilsProvider.class).in(Singleton.class);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -13,6 +13,7 @@
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
+import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter;
@@ -348,6 +349,9 @@
return exists;
}
+ public List<? extends AnnotationMirror> getAnnotationMirrors() {
+ return element.getAnnotationMirrors();
+ }
public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
return element.getAnnotation(annotationType);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -26,8 +26,10 @@
import com.google.inject.ProvidedBy;
import org.richfaces.cdk.model.ClassName;
+import javax.lang.model.element.AnnotationMirror;
import java.lang.annotation.Annotation;
import java.util.Set;
+import java.util.List;
/**
* <p class="changed_added_4_0">This class provides utility methods to analayze java classes. This implementation uses APT API to get
@@ -80,7 +82,9 @@
* @return the exists
*/
public boolean isExists();
-
+
+ public List<? extends AnnotationMirror> getAnnotationMirrors();
+
public <T extends Annotation> T getAnnotation(Class<T> annotationType);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -23,13 +23,10 @@
package org.richfaces.cdk.apt.processors;
-import java.util.Collection;
+import org.richfaces.cdk.model.BeanModelBase;
import javax.lang.model.element.TypeElement;
-import org.richfaces.cdk.model.BeanModelBase;
-import org.richfaces.cdk.model.PropertyBase;
-
/**
* <p class="changed_added_4_0">
* </p>
@@ -48,7 +45,7 @@
* relative URL to the fragment file.
* @return properties defined by that fragment.
*/
- public void processXmlFragment(BeanModelBase component,String ...attributesConfig);
+ public void processXmlFragment(BeanModelBase component, String ...attributesConfig);
/**
* <p class="changed_added_4_0">
@@ -60,6 +57,6 @@
* @param element
* @return
*/
- public void processType(BeanModelBase component,TypeElement element);
+ public void processType(BeanModelBase component, TypeElement element);
}
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-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -1,33 +1,11 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright , Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
package org.richfaces.cdk.apt.processors;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.google.inject.Provider;
-
import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.Logger;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Signature;
@@ -41,34 +19,42 @@
import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
import org.richfaces.cdk.xmlconfig.FragmentParser;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.MirroredTypeException;
import javax.lang.model.type.MirroredTypesException;
import javax.lang.model.type.TypeMirror;
-
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-/**
- * @author akolonitsky
- * @since Mar 23, 2010
- */
public class AttributesProcessorImpl implements AttributesProcessor {
private static final String SIGNATURE_NONE_CLASS_NAME = Signature.NONE.class.getName().replace('$', '.');
+
private static final String STRING_NAME = String.class.getName();
+ @Inject
+ private Logger log;
+
private final DescriptionProcessor descriptionProcessor;
+
private final Provider<SourceUtils> utilsProvider;
+
private final FragmentParser parser;
/**
* <p class="changed_added_4_0"></p>
* @param descriptionProcessor
+ * @param utilsProvider
+ * @param parser
*/
@Inject
- public AttributesProcessorImpl(DescriptionProcessor descriptionProcessor,Provider<SourceUtils> utilsProvider,FragmentParser parser) {
+ public AttributesProcessorImpl(DescriptionProcessor descriptionProcessor, Provider<SourceUtils> utilsProvider, FragmentParser parser) {
this.descriptionProcessor = descriptionProcessor;
this.utilsProvider = utilsProvider;
this.parser = parser;
@@ -107,15 +93,28 @@
}
// MethodExpression call signature.
- attribute.setSignature(getSignature(attributeAnnotarion.signature()));
+ AnnotationValue signatureMirror = null;
+ List<? extends AnnotationMirror> mirrors = beanProperty.getAnnotationMirrors();
+ for (AnnotationMirror mirror : mirrors) {
+ if (Attribute.class.getName().equals(mirror.getAnnotationType().toString())) {
+ for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : mirror.getElementValues().entrySet()) {
+ Name simpleName = entry.getKey().getSimpleName();
+ if ("signature".equals(simpleName.toString())) {
+ signatureMirror = entry.getValue();
+ }
+ }
+ }
+ }
+ attribute.setSignature(getSignature(attributeAnnotarion.signature(), signatureMirror));
+
for (EventName event : attributeAnnotarion.events()) {
setBehaviorEvent(attribute, event);
}
}
}
- private List<ClassName> getSignature(Signature signature) {
+ private List<ClassName> getSignature(Signature signature, AnnotationValue signatureMirror) {
if (signature == null) {
return null;
}
@@ -129,27 +128,64 @@
}
if (signature != null && SIGNATURE_NONE_CLASS_NAME.equals(returnType)) {
- List<ClassName> parameters = Lists.newArrayList();
+ return getSignatureParams(signature, signatureMirror);
+ // signature parameters always should be replaced.
+ // TODO - set method return type.
- try {
- for (Class<?> parameterType : signature.parameters()) {
- parameters.add(new ClassName(parameterType.getName()));
+ }
+
+ return null;
+ }
+
+ private List<ClassName> getSignatureParams(Signature signature, AnnotationValue signatureMirror) {
+ List<ClassName> parameters = Lists.newArrayList();
+
+ try {
+ for (Class<?> parameterType : signature.parameters()) {
+ parameters.add(new ClassName(parameterType.getName()));
+ }
+ } catch (MirroredTypeException e) {
+ AnnotationValue params = signatureMirror.accept(new EmptyAnnotationValueVisitor<AnnotationValue>() {
+ @Override
+ public AnnotationValue visitAnnotation(AnnotationMirror a, Object o) {
+ log.debug("-14- AttributeProcessor.visit(" + a + ", " + o + ")");
+ for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : a.getElementValues().entrySet()) {
+ if ("parameters".equals(entry.getKey().getSimpleName().toString())) {
+ return entry.getValue();
+ }
+ }
+ return null;
}
- } catch (MirroredTypeException e) {
- TypeMirror parameterType = e.getTypeMirror();
- parameters.add(new ClassName(parameterType.toString()));
- } catch (MirroredTypesException e) {
- for (TypeMirror parameterType : e.getTypeMirrors()) {
- parameters.add(new ClassName(parameterType.toString()));
+ }, null);
+
+ List<? extends AnnotationValue> o = params.accept(new EmptyAnnotationValueVisitor<List<? extends AnnotationValue>>(){
+ @Override
+ public List<? extends AnnotationValue> visitArray(List<? extends AnnotationValue> vals, Object o) {
+ log.debug("-15- AttributeProcessor.visit(" + vals + ", " + o + ")");
+ return vals;
}
+ }, null);
+
+ for (AnnotationValue annotationValue : o) {
+ parameters.add(annotationValue.accept(new EmptyAnnotationValueVisitor<ClassName>() {
+ @Override
+ public ClassName visitType(TypeMirror t, Object o) {
+ log.debug("-12- AttributeProcessor.visit(" + t + ", " + o + ")");
+ return new ClassName(t.toString());
+ }
+ }, null));
}
-
- return parameters;
- // signature parameters always should be replaced.
- // TODO - set method return type.
+// TypeMirror parameterType = e.getTypeMirror();
+// parameters.add(new ClassName(parameterType.toString()));
+ } catch (MirroredTypesException e) {
+ for (TypeMirror parameterType : e.getTypeMirrors()) {
+ parameters.add(new ClassName(parameterType.toString()));
+ }
}
- return null;
+ return parameters;
+ // signature parameters always should be replaced.
+ // TODO - set method return type.
}
private void setBehaviorEvent(PropertyBase attribute, EventName eventName) {
@@ -163,7 +199,7 @@
}
@Override
- public void processType(final BeanModelBase component,TypeElement element) throws CdkException {
+ public void processType(final BeanModelBase component, TypeElement element) throws CdkException {
// Process XML files with standard attributes definitions.
SourceUtils sourceUtils = getSourceUtils();
@@ -202,7 +238,7 @@
@Override
- public void processXmlFragment(BeanModelBase component,String ...attributesConfig) {
+ public void processXmlFragment(BeanModelBase component, String ...attributesConfig) {
// Process all files from @Jsf.. attributes property.
for (String attributes : attributesConfig) {
try {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -39,12 +39,12 @@
* @param description
* @param docComment JavaDoc comment associated with described element.
*/
- public void processDescription(DescriptionGroup model,Description description,String docComment);
+ public void processDescription(DescriptionGroup model, Description description, String docComment);
/**
* <p class="changed_added_4_0">process {@link Description} annotation and set information from it into model.</p>
* @param model
* @param description
*/
- public void processDescription(DescriptionGroup model,Description description);
+ public void processDescription(DescriptionGroup model, Description description);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -33,18 +33,12 @@
*/
public class DescriptionProcessorImpl implements DescriptionProcessor {
- /* (non-Javadoc)
- * @see org.richfaces.cdk.apt.processors.DescriptionProcessor#processDescription(org.richfaces.cdk.model.DescriptionGroup, org.richfaces.cdk.annotations.Description, java.lang.String)
- */
@Override
public void processDescription(DescriptionGroup model, Description description, String docComment) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
- * @see org.richfaces.cdk.apt.processors.DescriptionProcessor#processDescription(org.richfaces.cdk.model.DescriptionGroup, org.richfaces.cdk.annotations.Description)
- */
@Override
public void processDescription(DescriptionGroup model, Description description) {
// TODO Auto-generated method stub
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-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -1,29 +1,39 @@
package org.richfaces.cdk.apt.processors;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-
+import com.google.inject.Inject;
+import com.google.inject.Provider;
import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.apt.SourceUtils;
+import org.richfaces.cdk.model.BehaviorModel;
import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.ComponentModel;
+import org.richfaces.cdk.model.ConverterModel;
import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.ModelElementBase;
import org.richfaces.cdk.model.TagModel;
+import org.richfaces.cdk.model.ValidatorModel;
import org.richfaces.cdk.util.Strings;
+import org.richfaces.cdk.NamingConventions;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import javax.faces.view.facelets.BehaviorHandler;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.ConverterHandler;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.xml.validation.ValidatorHandler;
public abstract class ProcessorBase {
@Inject
private Provider<SourceUtils> sourceUtils;
-
@Inject
private AttributesProcessor attributeProcessor;
+ @Inject
+ private NamingConventions namingConventions;
+
public SourceUtils getSourceUtils() {
return this.sourceUtils.get();
}
@@ -32,17 +42,43 @@
TagModel tagModel = new TagModel();
String name = tag.name();
- if (!Strings.isEmpty(name)) {
- tagModel.setName(name);
+ if (Strings.isEmpty(name)) {
+ name = getNamingConventions().inferTagName(model.getId());
}
+ tagModel.setName(name);
+ tagModel.setType(tag.type());
tagModel.setTargetClass(ClassName.parseName(tag.handler()));
- tagModel.setType(tag.type());
- tagModel.setBaseClass(ClassName.parseName(tag.baseClass()));
+ tagModel.setBaseClass(ClassName.parseName(getBaseClass(tag, model)));
+ tagModel.setGenerate(tag.generate());
+
// TODO - move refference integrity to model.
tagModel.setModel(model);
model.getTags().add(tagModel);
}
+ private String getBaseClass(Tag tag, ModelElementBase model) {
+ String baseClass = tag.baseClass();
+ if (!Strings.isEmpty(baseClass)) {
+ return baseClass;
+ }
+
+ if (model instanceof ComponentModel) {
+ return ComponentHandler.class.getName();
+
+ } else if (model instanceof ValidatorModel) {
+ return ValidatorHandler.class.getName();
+
+ } else if (model instanceof ConverterModel) {
+ return ConverterHandler.class.getName();
+
+ } else if (model instanceof BehaviorModel) {
+ return BehaviorHandler.class.getName();
+
+ } else {
+ throw new IllegalStateException("Unknown model class.");
+ }
+ }
+
protected void setIcon(DescriptionGroup component, Description icon) {
if (null != icon && (!Strings.isEmpty(icon.smallIcon()) || !Strings.isEmpty(icon.largeIcon()))) {
DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon();
@@ -104,4 +140,11 @@
return this.attributeProcessor;
}
+ public NamingConventions getNamingConventions() {
+ return namingConventions;
+ }
+
+ public void setNamingConventions(NamingConventions namingConventions) {
+ this.namingConventions = namingConventions;
+ }
}
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-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -22,9 +22,15 @@
package org.richfaces.cdk.generate.java.taghandler;
-import org.richfaces.cdk.model.*;
import com.google.inject.Inject;
import com.google.inject.Injector;
+import org.richfaces.cdk.model.BehaviorModel;
+import org.richfaces.cdk.model.ComponentModel;
+import org.richfaces.cdk.model.ConverterModel;
+import org.richfaces.cdk.model.EmptyVisitor;
+import org.richfaces.cdk.model.ModelElementBase;
+import org.richfaces.cdk.model.TagModel;
+import org.richfaces.cdk.model.ValidatorModel;
/**
* @author akolonitsky
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -23,8 +23,6 @@
package org.richfaces.cdk.generate.java.taghandler;
import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import org.richfaces.cdk.CdkWriter;
/**
* @author akolonitsky
@@ -34,7 +32,9 @@
@Override
protected void configure() {
+/*
Multibinder.newSetBinder(binder(), CdkWriter.class)
.addBinding().to(TagHandlerWriter.class);
+*/
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerWriter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerWriter.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerWriter.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -24,7 +24,11 @@
import com.google.inject.Inject;
import com.google.inject.Injector;
-import org.richfaces.cdk.*;
+import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.CdkWriter;
+import org.richfaces.cdk.FileManager;
+import org.richfaces.cdk.Output;
+import org.richfaces.cdk.Outputs;
import org.richfaces.cdk.model.ComponentLibrary;
/**
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-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -178,6 +178,9 @@
}
private Element createTag(String tagName) {
+ if (tagName == null) {
+ System.out.println("tagName == null");
+ }
Element tag = faceletTaglib.addElement("tag");
tag.addElement("tag-name").addText(tagName);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -334,5 +334,8 @@
this.binding = binding;
}
-
+ @Override
+ public String toString() {
+ return "Property {name: " + getName() + ", type: " + getType().getName() + "}";
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -60,8 +60,8 @@
* @see org.richfaces.cdk.templatecompiler.TemplateVisitorFactory#createVisitor(org.richfaces.cdk.templatecompiler.model.CompositeInterface)
*/
@Override
- public RendererClassVisitor createVisitor(CompositeInterface composite,Collection<PropertyBase> attributes) {
- return new RendererClassVisitor(composite, attributes,classLoader, jaxbBinding, log);
+ public RendererClassVisitor createVisitor(CompositeInterface composite, Collection<PropertyBase> attributes) {
+ return new RendererClassVisitor(composite, attributes, classLoader, jaxbBinding, log);
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taghandler.ftl
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taghandler.ftl 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/taghandler.ftl 2010-04-02 13:36:47 UTC (rev 16707)
@@ -5,10 +5,12 @@
import javax.faces.view.facelets.*;
import org.richfaces.MethodMetadata;
import ${model.targetClass};
+<#list generatedAttributes as prop><#if (!prop.signature.empty)><#list prop.signature as class>import ${class.name};
+</#list></#if></#list>
public class ${targetClass.simpleName} extends ${baseClass.simpleName} {
- private static final ${targetClass.simpleName}MetaRule metaRule = new ${targetClass.simpleName}MetaRule();
+ private static final ${targetClass.simpleName}MetaRule META_RULE = new ${targetClass.simpleName}MetaRule();
public ${targetClass.simpleName}(${objectType}Config config) {
@@ -17,7 +19,7 @@
protected MetaRuleset createMetaRuleset(Class type) {
MetaRuleset m = super.createMetaRuleset(type);
- m.addRule(metaRule);
+ m.addRule(META_RULE);
return m;
}
@@ -27,7 +29,7 @@
if (meta.isTargetInstanceOf(${model.targetClass.simpleName}.class)) {
<#list generatedAttributes as prop>
if ("${prop.name}".equals(name)) {
- return new MethodMetadata(attribute) {
+ return new MethodMetadata(attribute<#if (!prop.signature.empty)><#list prop.signature as class>, ${class.simpleName}.class</#list></#if>) {
public void applyMetadata(FaceletContext ctx, Object instance) {
((${model.targetClass.simpleName}) instance).${prop.setterName}(<#if (prop.isBinging)>getMethodBinding(ctx));<#else>getMethodExpression(ctx));</#if>
}
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -84,6 +84,9 @@
@Inject
private ComponentProcessor processor;
+ @Mock
+ private AttributesProcessor attributesProcessor;
+
@Inject
private ComponentLibrary library;
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -43,6 +43,7 @@
import javax.faces.el.MethodBinding;
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Set;
/**
@@ -107,6 +108,7 @@
attribute.setType(new ClassName(MethodExpression.class));
attribute.setGenerate(true);
attribute.setBindingAttribute(true);
+ attribute.setSignature(Arrays.asList(new ClassName(String.class), new ClassName(Integer.class)));
attribute = component.getOrCreateAttribute("id");
attribute.setType(new ClassName(String.class));
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/TagHandlerClassGeneratorTest.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -31,6 +31,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
+import org.richfaces.cdk.Logger;
import org.richfaces.cdk.generate.java.taghandler.TagHandlerClassGenerator;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentModel;
@@ -47,6 +48,9 @@
public class TagHandlerClassGeneratorTest extends AbstractClassGeneratorTest {
@Inject
+ private Logger log;
+
+ @Inject
private TagHandlerClassGenerator generator;
@Test
@@ -67,7 +71,7 @@
generator.process(tagModel);
-// System.out.println(outputWriter);
+ log.debug(outputWriter.toString());
verify(output);
compare(outputWriter, "GeneratedTagHandler.java");
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedTagHandler.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedTagHandler.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedTagHandler.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -24,10 +24,12 @@
import javax.faces.view.facelets.*;
import org.richfaces.MethodMetadata;
import org.richfaces.cdk.generate.java.GeneratedComponent;
+import java.lang.String;
+import java.lang.Integer;
public class GeneratedTagHandler extends ComponentHandler {
- private static final GeneratedTagHandlerMetaRule metaRule = new GeneratedTagHandlerMetaRule();
+ private static final GeneratedTagHandlerMetaRule META_RULE = new GeneratedTagHandlerMetaRule();
public GeneratedTagHandler(ComponentConfig config) {
@@ -36,7 +38,7 @@
protected MetaRuleset createMetaRuleset(Class type) {
MetaRuleset m = super.createMetaRuleset(type);
- m.addRule(metaRule);
+ m.addRule(META_RULE);
return m;
}
@@ -53,7 +55,7 @@
}
if ("testExpr".equals(name)) {
- return new MethodMetadata(attribute) {
+ return new MethodMetadata(attribute, String.class, Integer.class) {
public void applyMetadata(FaceletContext ctx, Object instance) {
((GeneratedComponent) instance).setTestExpr(getMethodExpression(ctx));
}
@@ -64,4 +66,4 @@
return null;
}
}
-}
+}
\ No newline at end of file
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-04-02 07:02:13 UTC (rev 16706)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -39,15 +39,15 @@
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
+import java.util.Date;
import java.io.OutputStream;
-import java.util.Date;
/**
* @author shura
*
*/
@JsfComponent(
- tag = @Tag(handler = "org.richfaces.taglib.html.facelets.MediaOutputHandler")
+ tag = @Tag(generate = true, handler = "org.richfaces.taglib.html.facelets.MediaOutputHandler")
)
public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent2 {
@@ -86,9 +86,7 @@
*
* @return MethodBinding to createContent
*/
- @Attribute(
- generate = false,
- signature = @Signature(parameters = {OutputStream.class, Object.class}))
+ @Attribute(signature = @Signature(parameters = {OutputStream.class, Object.class}))
public MethodBinding getCreateContent() {
MethodBinding result = null;
MethodExpression me = getCreateContentExpression();
@@ -162,6 +160,13 @@
public abstract void setCoords(String coords);
+ /**
+ * TODO original implemenattion
+ *
+ * public MethodExpression getCreateContentExpression() {
+ * return (MethodExpression) getStateHelper().get(PropertyKeys.createContentExpression);
+ * }
+ * */
public abstract MethodExpression getCreateContentExpression();
public abstract String getDeclare();
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-04-02 07:02:13 UTC (rev 16706)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -45,7 +45,7 @@
*
*/
@JsfComponent(
- tag = @Tag(handler = "org.richfaces.taglib.html.facelets.AjaxPushHandler")
+ tag = @Tag(generate = true, handler = "org.richfaces.taglib.html.facelets.AjaxPushHandler")
)
public abstract class AbstractPush extends UICommand {
Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIRepeat.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIRepeat.java 2010-04-02 07:02:13 UTC (rev 16706)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIRepeat.java 2010-04-02 13:36:47 UTC (rev 16707)
@@ -28,7 +28,7 @@
* @author Nick Belaevski
*
*/
-(a)JsfComponent(type=UIRepeat.COMPONENT_TYPE, generate = "", tag = @Tag(name = "repeat"))
+@JsfComponent(generate = "", tag = @Tag(name = "repeat"))
public class UIRepeat extends UISequence {
public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
16 years, 1 month
JBoss Rich Faces SVN: r16706 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-04-02 03:02:13 -0400 (Fri, 02 Apr 2010)
New Revision: 16706
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java
Log:
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java 2010-04-02 07:02:13 UTC (rev 16706)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.cdk.apt.processors;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.AnnotationValueVisitor;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import java.util.List;
+
+/**
+ * @author akolonitsky
+ * @since Apr 1, 2010
+ */
+public class EmptyAnnotationValueVisitor<R> implements AnnotationValueVisitor<R, Object> {
+
+ @Override
+ public R visit(AnnotationValue av, Object o) {
+ System.out.println("-1- AttributeProcessor.visit(" + av + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visit(AnnotationValue av) {
+ System.out.println("-2- AttributeProcessor.visit(" + av + ")");
+ return null;
+ }
+
+ @Override
+ public R visitBoolean(boolean b, Object o) {
+ System.out.println("-3- AttributeProcessor.visit(" + b + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitByte(byte b, Object o) {
+ System.out.println("-4- AttributeProcessor.visit(" + b + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitChar(char c, Object o) {
+ System.out.println("-5- AttributeProcessor.visit(" + c + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitDouble(double d, Object o) {
+ System.out.println("-6- AttributeProcessor.visit(" + d + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitFloat(float f, Object o) {
+ System.out.println("-7- AttributeProcessor.visit(" + f + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitInt(int i, Object o) {
+ System.out.println("-8- AttributeProcessor.visit(" + i + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitLong(long i, Object o) {
+ System.out.println("-9- AttributeProcessor.visit(" + i + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitShort(short s, Object o) {
+ System.out.println("-10- AttributeProcessor.visit(" + s + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitString(String s, Object o) {
+ System.out.println("-11- AttributeProcessor.visit(" + s + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitType(TypeMirror t, Object o) {
+ System.out.println("-12- AttributeProcessor.visit(" + t + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitEnumConstant(VariableElement c, Object o) {
+ System.out.println("-13- AttributeProcessor.visit(" + c + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitAnnotation(AnnotationMirror a, Object o) {
+ System.out.println("-14- AttributeProcessor.visit(" + a + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitArray(List<? extends AnnotationValue> vals, Object o) {
+ System.out.println("-15- AttributeProcessor.visit(" + vals + ", " + o + ")");
+ return null;
+ }
+
+ @Override
+ public R visitUnknown(AnnotationValue av, Object o) {
+ System.out.println("-16- AttributeProcessor.visit(" + av + ", " + o + ")");
+ return null;
+ }
+}
16 years, 1 month
JBoss Rich Faces SVN: r16705 - in root/cdk/trunk/plugins/generator/src: test/java/org/richfaces/cdk/apt/processors and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-04-01 19:54:08 -0400 (Thu, 01 Apr 2010)
New Revision: 16705
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
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/DescriptionProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java
Removed:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributeProcessor.java
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/BehaviorProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ConverterProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/JsfSubComponent.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/apt/processors/RendererProcessor.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java
Log:
CODING IN PROGRESS - issue RF-8567: Cleanup Annotation processor code
https://jira.jboss.org/jira/browse/RF-8567
Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributeProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributeProcessor.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributeProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -1,137 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright , Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.cdk.apt.processors;
-
-import com.google.common.collect.Lists;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.EventName;
-import org.richfaces.cdk.annotations.Signature;
-import org.richfaces.cdk.apt.SourceUtils;
-import org.richfaces.cdk.model.ClassName;
-import org.richfaces.cdk.model.PropertyBase;
-import org.richfaces.cdk.util.Strings;
-
-import javax.lang.model.type.MirroredTypeException;
-import javax.lang.model.type.MirroredTypesException;
-import javax.lang.model.type.TypeMirror;
-import java.util.List;
-
-/**
- * @author akolonitsky
- * @since Mar 23, 2010
- */
-public class AttributeProcessor extends ProcessorBase {
-
- private static final String SIGNATURE_NONE_CLASS_NAME = Signature.NONE.class.getName().replace('$', '.');
- private static final String STRING_NAME = String.class.getName();
-
- public void process(SourceUtils.BeanProperty beanProperty, PropertyBase attribute) {
-
- attribute.setType(beanProperty.getType());
-
- Attribute attributeAnnotarion = beanProperty.getAnnotation(Attribute.class);
- if (attributeAnnotarion == null) {
- attribute.setGenerate(!beanProperty.isExists());
- setDescription(attribute, null, beanProperty.getDocComment());
-
- } else {
- attribute.setHidden(attributeAnnotarion.hidden());
- attribute.setLiteral(attributeAnnotarion.literal());
- attribute.setPassThrough(attributeAnnotarion.passThrough());
- attribute.setRequired(attributeAnnotarion.required());
- attribute.setReadOnly(attributeAnnotarion.readOnly());
- attribute.setGenerate(attributeAnnotarion.generate() || !beanProperty.isExists());
-
- setDescription(attribute, attributeAnnotarion.description(), beanProperty.getDocComment());
-
- String defaultValue = attributeAnnotarion.defaultValue();
- if (!Strings.isEmpty(defaultValue)) {
- if (STRING_NAME.equals(attribute.getType().toString())) {
- defaultValue = "\"" + defaultValue + "\"";
- }
- attribute.setDefaultValue(defaultValue);
- }
-
-
- String suggestedValue = attributeAnnotarion.suggestedValue();
- if (!Strings.isEmpty(suggestedValue)) {
- attribute.setSuggestedValue(suggestedValue);
- }
-
- // MethodExpression call signature.
- attribute.setSignature(getSignature(attributeAnnotarion.signature()));
-
- for (EventName event : attributeAnnotarion.events()) {
- setBehaviorEvent(attribute, event);
- }
- }
- }
-
- private List<ClassName> getSignature(Signature signature) {
- if (signature == null) {
- return null;
- }
-
- String returnType;
- try {
- returnType = signature.returnType().getName();
- } catch (MirroredTypeException e) {
- TypeMirror returnTypeMirror = e.getTypeMirror();
- returnType = returnTypeMirror.toString();
- }
-
- if (signature != null && SIGNATURE_NONE_CLASS_NAME.equals(returnType)) {
- List<ClassName> parameters = Lists.newArrayList();
-
- try {
- for (Class<?> parameterType : signature.parameters()) {
- parameters.add(new ClassName(parameterType.getName()));
- }
- } catch (MirroredTypeException e) {
- TypeMirror parameterType = e.getTypeMirror();
- parameters.add(new ClassName(parameterType.toString()));
- } catch (MirroredTypesException e) {
- for (TypeMirror parameterType : e.getTypeMirrors()) {
- parameters.add(new ClassName(parameterType.toString()));
- }
- }
-
- return parameters;
- // signature parameters always should be replaced.
- // TODO - set method return type.
- }
-
- return null;
- }
-
- private void setBehaviorEvent(PropertyBase attribute, EventName eventName) {
- if (null != eventName) {
- org.richfaces.cdk.model.EventName event = new org.richfaces.cdk.model.EventName();
-
- event.setName(eventName.value());
- event.setDefaultEvent(eventName.defaultEvent());
- attribute.getEventNames().add(event);
- }
- }
-
-}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -0,0 +1,65 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.apt.processors;
+
+import java.util.Collection;
+
+import javax.lang.model.element.TypeElement;
+
+import org.richfaces.cdk.model.BeanModelBase;
+import org.richfaces.cdk.model.PropertyBase;
+
+/**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public interface AttributesProcessor {
+
+ /**
+ * <p class="changed_added_4_0">
+ * Process attributes defined by the faces-config fragment.
+ * </p>
+ *
+ * @param attributesConfig
+ * relative URL to the fragment file.
+ * @return properties defined by that fragment.
+ */
+ public void processXmlFragment(BeanModelBase component,String ...attributesConfig);
+
+ /**
+ * <p class="changed_added_4_0">
+ * Process all bean properties associated with type element. Recursively visit all supertypes and interfaces. For
+ * each type, tries to read xml fragment with same name as class or interface with ".xml" suffix, then collect all
+ * bean properties marked by the {@link Attribute} annotation
+ * </p>
+ *
+ * @param element
+ * @return
+ */
+ public void processType(BeanModelBase component,TypeElement element);
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java (from rev 16704, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributeProcessor.java)
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -0,0 +1,217 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.cdk.apt.processors;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.EventName;
+import org.richfaces.cdk.annotations.Signature;
+import org.richfaces.cdk.apt.SourceUtils;
+import org.richfaces.cdk.apt.SourceUtils.BeanProperty;
+import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
+import org.richfaces.cdk.model.BeanModelBase;
+import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.PropertyBase;
+import org.richfaces.cdk.util.Strings;
+import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
+import org.richfaces.cdk.xmlconfig.FragmentParser;
+
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeMirror;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author akolonitsky
+ * @since Mar 23, 2010
+ */
+public class AttributesProcessorImpl implements AttributesProcessor {
+
+ private static final String SIGNATURE_NONE_CLASS_NAME = Signature.NONE.class.getName().replace('$', '.');
+ private static final String STRING_NAME = String.class.getName();
+
+ private final DescriptionProcessor descriptionProcessor;
+ private final Provider<SourceUtils> utilsProvider;
+ private final FragmentParser parser;
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param descriptionProcessor
+ */
+ @Inject
+ public AttributesProcessorImpl(DescriptionProcessor descriptionProcessor,Provider<SourceUtils> utilsProvider,FragmentParser parser) {
+ this.descriptionProcessor = descriptionProcessor;
+ this.utilsProvider = utilsProvider;
+ this.parser = parser;
+ }
+
+ public void process(SourceUtils.BeanProperty beanProperty, PropertyBase attribute) {
+
+ attribute.setType(beanProperty.getType());
+
+ Attribute attributeAnnotarion = beanProperty.getAnnotation(Attribute.class);
+ if (attributeAnnotarion == null) {
+ attribute.setGenerate(!beanProperty.isExists());
+ attribute.setDescription(beanProperty.getDocComment());
+ } else {
+ attribute.setHidden(attributeAnnotarion.hidden());
+ attribute.setLiteral(attributeAnnotarion.literal());
+ attribute.setPassThrough(attributeAnnotarion.passThrough());
+ attribute.setRequired(attributeAnnotarion.required());
+ attribute.setReadOnly(attributeAnnotarion.readOnly());
+ attribute.setGenerate(attributeAnnotarion.generate() || !beanProperty.isExists());
+
+ descriptionProcessor.processDescription(attribute, attributeAnnotarion.description(), beanProperty.getDocComment());
+
+ String defaultValue = attributeAnnotarion.defaultValue();
+ if (!Strings.isEmpty(defaultValue)) {
+ if (STRING_NAME.equals(attribute.getType().toString())) {
+ defaultValue = "\"" + defaultValue + "\"";
+ }
+ attribute.setDefaultValue(defaultValue);
+ }
+
+
+ String suggestedValue = attributeAnnotarion.suggestedValue();
+ if (!Strings.isEmpty(suggestedValue)) {
+ attribute.setSuggestedValue(suggestedValue);
+ }
+
+ // MethodExpression call signature.
+ attribute.setSignature(getSignature(attributeAnnotarion.signature()));
+
+ for (EventName event : attributeAnnotarion.events()) {
+ setBehaviorEvent(attribute, event);
+ }
+ }
+ }
+
+ private List<ClassName> getSignature(Signature signature) {
+ if (signature == null) {
+ return null;
+ }
+
+ String returnType;
+ try {
+ returnType = signature.returnType().getName();
+ } catch (MirroredTypeException e) {
+ TypeMirror returnTypeMirror = e.getTypeMirror();
+ returnType = returnTypeMirror.toString();
+ }
+
+ if (signature != null && SIGNATURE_NONE_CLASS_NAME.equals(returnType)) {
+ List<ClassName> parameters = Lists.newArrayList();
+
+ try {
+ for (Class<?> parameterType : signature.parameters()) {
+ parameters.add(new ClassName(parameterType.getName()));
+ }
+ } catch (MirroredTypeException e) {
+ TypeMirror parameterType = e.getTypeMirror();
+ parameters.add(new ClassName(parameterType.toString()));
+ } catch (MirroredTypesException e) {
+ for (TypeMirror parameterType : e.getTypeMirrors()) {
+ parameters.add(new ClassName(parameterType.toString()));
+ }
+ }
+
+ return parameters;
+ // signature parameters always should be replaced.
+ // TODO - set method return type.
+ }
+
+ return null;
+ }
+
+ private void setBehaviorEvent(PropertyBase attribute, EventName eventName) {
+ if (null != eventName) {
+ org.richfaces.cdk.model.EventName event = new org.richfaces.cdk.model.EventName();
+
+ event.setName(eventName.value());
+ event.setDefaultEvent(eventName.defaultEvent());
+ attribute.getEventNames().add(event);
+ }
+ }
+
+ @Override
+ public void processType(final BeanModelBase component,TypeElement element) throws CdkException {
+
+ // Process XML files with standard attributes definitions.
+ SourceUtils sourceUtils = getSourceUtils();
+ ClassName componentClassName = ClassName.parseName(element.getQualifiedName().toString());
+ sourceUtils.visitSupertypes(componentClassName, new SuperTypeVisitor() {
+
+ @Override
+ public void visit(ClassName type) {
+ try {
+ component.getAttributes().addAll(parseProperties(
+ CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml"));
+ } catch (CdkException e) {
+ // TODO - log errors ?
+ }
+ }
+
+ });
+
+
+ Set<BeanProperty> properties = Sets.newHashSet();
+ properties.addAll(sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, componentClassName));
+ properties.addAll(sourceUtils.getAbstractBeanProperties(componentClassName));
+ // TODO - encapsulate attribute builder into utility class.
+ for (BeanProperty beanProperty : properties) {
+ process(beanProperty, component.getOrCreateAttribute(beanProperty.getName()));
+ }
+ }
+
+ private Collection<? extends PropertyBase> parseProperties(String uri) {
+ return parser.parseProperties(uri);
+ }
+
+ private SourceUtils getSourceUtils() {
+ return utilsProvider.get();
+ }
+
+
+ @Override
+ public void processXmlFragment(BeanModelBase component,String ...attributesConfig) {
+ // Process all files from @Jsf.. attributes property.
+ for (String attributes : attributesConfig) {
+ try {
+ 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/apt/processors/BehaviorProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/BehaviorProcessor.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/BehaviorProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -23,16 +23,17 @@
package org.richfaces.cdk.apt.processors;
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.TypeElement;
+
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfBehavior;
import org.richfaces.cdk.model.BehaviorModel;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.FacesId;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.element.TypeElement;
-import java.lang.annotation.Annotation;
-
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
@@ -49,7 +50,9 @@
setClassNames(element, behaviorModel, behavior.generate());
setTagInfo(behavior.tag(), behaviorModel);
- processAttributes(element, behaviorModel,behavior.attributes());
+ AttributesProcessor attributesProcessor = getAttributeProcessor();
+ attributesProcessor.processXmlFragment(behaviorModel, behavior.attributes());
+ attributesProcessor.processType(behaviorModel,element);
setDescription(behaviorModel, behavior.description(), getDocComment(element));
library.getBehaviors().add(behaviorModel);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -23,8 +23,15 @@
package org.richfaces.cdk.apt.processors;
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeMirror;
+
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.annotations.Event;
import org.richfaces.cdk.annotations.Facet;
@@ -40,13 +47,8 @@
import org.richfaces.cdk.model.FacetModel;
import org.richfaces.cdk.util.Strings;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.MirroredTypeException;
-import javax.lang.model.type.MirroredTypesException;
-import javax.lang.model.type.TypeMirror;
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Set;
+import com.google.common.collect.Lists;
+import com.google.inject.Inject;
/**
* <p class="changed_added_4_0">
@@ -77,8 +79,9 @@
// Should that component be generated ?
setClassNames(componentElement, component, annotation.generate());
setComponentProperties(componentElement, component, annotation, library);
+ // Process the second level annotations.
for (final SubComponent subcomponent : annotation.components()) {
- JsfComponent subAnnotation = new JsfSubComponent(subcomponent, annotation.family());
+ JsfComponent subAnnotation = new JsfSubComponent(subcomponent, annotation);
ComponentModel subcomponentModel = new ComponentModel();
subcomponentModel.setBaseClass(component.getTargetClass());
subcomponentModel.setTargetClass(ClassName.parseName(subcomponent.generate()));
@@ -87,6 +90,14 @@
library.getComponents().add(component);
}
+ /**
+ * <p class="changed_added_4_0">process annotation and set component model properties.</p>
+ * @param componentElement
+ * @param component
+ * @param annotation
+ * @param library
+ * @throws CdkException
+ */
void setComponentProperties(TypeElement componentElement, ComponentModel component,
JsfComponent annotation, ComponentLibrary library) throws CdkException {
@@ -97,6 +108,11 @@
processFacets(componentElement, component, annotation);
processEvents(componentElement, component, annotation);
+ AttributesProcessor attributesProcessor = getAttributeProcessor();
+ attributesProcessor.processXmlFragment(component, annotation.attributes());
+ if(null != componentElement){
+ attributesProcessor.processType(component,componentElement);
+ }
// TODO - process interfaces() attribute.
List<ClassName> interfaceNames = Lists.newArrayList();
try {
@@ -107,12 +123,12 @@
} catch (MirroredTypesException e) {
List<? extends TypeMirror> typeMirrors = e.getTypeMirrors();
for (TypeMirror mirror : typeMirrors) {
+ interfaceNames.add(ClassName.parseName(mirror.toString()));
// TODO call processAttributes with element from type mirror.
- interfaceNames.add(ClassName.parseName(mirror.toString()));
+// attributesProcessor.processType(component,mirror.);
}
}
- processAttributes(componentElement, component, annotation.attributes());
-
+ // TODO - store interfaces in the model.
for (Tag tag : annotation.tag()) {
setTagInfo(tag, component);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ConverterProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ConverterProcessor.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ConverterProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -61,7 +61,9 @@
setDescription(converterModel, converter.description(), getDocComment(element));
- processAttributes(element, converterModel,converter.attributes());
+ AttributesProcessor attributesProcessor = getAttributeProcessor();
+ attributesProcessor.processXmlFragment(converterModel, converter.attributes());
+ attributesProcessor.processType(converterModel,element);
setClassNames(element, converterModel, converter.generate());
setTagInfo(converter.tag(), converterModel);
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -0,0 +1,50 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.apt.processors;
+
+import org.richfaces.cdk.annotations.Description;
+import org.richfaces.cdk.model.DescriptionGroup;
+
+/**
+ * <p class="changed_added_4_0">Implementation of that interface process {@link Description} annotation and set information from it into model.</p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public interface DescriptionProcessor {
+
+ /**
+ * <p class="changed_added_4_0">process {@link Description} annotation and set information from it into model. Optional string from the JavaDoc comment has precedence over {@link Desription#value()} attribute.</p>
+ * @param model
+ * @param description
+ * @param docComment JavaDoc comment associated with described element.
+ */
+ public void processDescription(DescriptionGroup model,Description description,String docComment);
+
+ /**
+ * <p class="changed_added_4_0">process {@link Description} annotation and set information from it into model.</p>
+ * @param model
+ * @param description
+ */
+ public void processDescription(DescriptionGroup model,Description description);
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -0,0 +1,54 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.apt.processors;
+
+import org.richfaces.cdk.annotations.Description;
+import org.richfaces.cdk.model.DescriptionGroup;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class DescriptionProcessorImpl implements DescriptionProcessor {
+
+ /* (non-Javadoc)
+ * @see org.richfaces.cdk.apt.processors.DescriptionProcessor#processDescription(org.richfaces.cdk.model.DescriptionGroup, org.richfaces.cdk.annotations.Description, java.lang.String)
+ */
+ @Override
+ public void processDescription(DescriptionGroup model, Description description, String docComment) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.cdk.apt.processors.DescriptionProcessor#processDescription(org.richfaces.cdk.model.DescriptionGroup, org.richfaces.cdk.annotations.Description)
+ */
+ @Override
+ public void processDescription(DescriptionGroup model, Description description) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/DescriptionProcessorImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/JsfSubComponent.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/JsfSubComponent.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/JsfSubComponent.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -22,6 +22,8 @@
package org.richfaces.cdk.apt.processors;
+import java.lang.annotation.Annotation;
+
import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.Event;
import org.richfaces.cdk.annotations.Facet;
@@ -31,21 +33,22 @@
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.Test;
-import java.lang.annotation.Annotation;
-
/**
+ * This calss wraps {@link SubComponent} annotation so it would be used by {@link ComponentProcessor} methods, so they
+ * can be reused for different types of the component annotations.
+ *
* @author akolonitsky
* @since Mar 31, 2010
*/
public class JsfSubComponent implements JsfComponent {
- private SubComponent subcomponent;
+ private final SubComponent subcomponent;
- private String family;
+ private final JsfComponent parent;
- public JsfSubComponent(SubComponent subcomponent, String family) {
+ public JsfSubComponent(SubComponent subcomponent, JsfComponent parent) {
this.subcomponent = subcomponent;
- this.family = family;
+ this.parent = parent;
}
@Override
@@ -90,7 +93,7 @@
@Override
public String family() {
- return this.family;
+ return this.parent.family();
}
@Override
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-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -1,50 +1,29 @@
package org.richfaces.cdk.apt.processors;
-import com.google.common.collect.Sets;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.NamingConventions;
-import org.richfaces.cdk.annotations.Attribute;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+
import org.richfaces.cdk.annotations.Description;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.apt.SourceUtils;
-import org.richfaces.cdk.apt.SourceUtils.BeanProperty;
-import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
-import org.richfaces.cdk.model.BeanModelBase;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.ModelElementBase;
-import org.richfaces.cdk.model.PropertyBase;
import org.richfaces.cdk.model.TagModel;
import org.richfaces.cdk.util.Strings;
-import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
-import org.richfaces.cdk.xmlconfig.FragmentParser;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import java.util.Collection;
-import java.util.Set;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
public abstract class ProcessorBase {
@Inject
private Provider<SourceUtils> sourceUtils;
- @Inject
- private FragmentParser fragmentParser;
@Inject
- private AttributeProcessor attributeProcessor;
+ private AttributesProcessor attributeProcessor;
- @Inject
- private NamingConventions namingConventions;
-
-
- public FragmentParser getFragmentParser() {
- return this.fragmentParser;
- }
-
public SourceUtils getSourceUtils() {
return this.sourceUtils.get();
}
@@ -53,10 +32,9 @@
TagModel tagModel = new TagModel();
String name = tag.name();
- if (Strings.isEmpty(name)) {
- name = getNamingConventions().inferTagName(model.getId());
+ if (!Strings.isEmpty(name)) {
+ tagModel.setName(name);
}
- tagModel.setName(name);
tagModel.setTargetClass(ClassName.parseName(tag.handler()));
tagModel.setType(tag.type());
tagModel.setBaseClass(ClassName.parseName(tag.baseClass()));
@@ -109,9 +87,6 @@
modelElement.setBaseClass(ClassName.parseName(componentElement.getQualifiedName().toString()));
}
- protected Collection<PropertyBase> parseProperties(String attributesConfig) {
- return getFragmentParser().parseProperties(CdkEntityResolver.URN_ATTRIBUTES + attributesConfig + ".xml");
- }
protected ClassName asClassDesctiption(TypeElement componentElement) {
return new ClassName(componentElement.getQualifiedName().toString());
@@ -121,48 +96,12 @@
return null != componentElement ? getSourceUtils().getDocComment(asClassDesctiption(componentElement)) : null;
}
- protected void processAttributes(TypeElement componentElement, final BeanModelBase component, String[] annotationAttributes) throws CdkException {
-
- // Process XML files with standard attributes definitions.
- SourceUtils sourceUtils = getSourceUtils();
- ClassName componentClassName = asClassDesctiption(componentElement);
- sourceUtils.visitSupertypes(componentClassName, new SuperTypeVisitor() {
-
- @Override
- public void visit(ClassName type) {
- try {
- component.getAttributes().addAll(parseProperties(
- CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml"));
- } catch (CdkException e) {
- // TODO - log errors ?
- }
- }
- });
-
- // Process all files from @Jsf.. attributes property.
- for (String attributes : annotationAttributes) {
- try {
- component.getAttributes().addAll(parseProperties(
- CdkEntityResolver.URN_ATTRIBUTES + attributes));
- } catch (CdkException e) {
- // TODO - log errors ?
- }
- }
-
- Set<BeanProperty> properties = Sets.newHashSet();
- properties.addAll(sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, componentClassName));
- properties.addAll(sourceUtils.getAbstractBeanProperties(componentClassName));
- // TODO - encapsulate attribute builder into utility class.
- for (BeanProperty beanProperty : properties) {
- attributeProcessor.process(beanProperty, component.getOrCreateAttribute(beanProperty.getName()));
- }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the attributeProcessor
+ */
+ protected AttributesProcessor getAttributeProcessor() {
+ return this.attributeProcessor;
}
- public NamingConventions getNamingConventions() {
- return namingConventions;
- }
-
- public void setNamingConventions(NamingConventions namingConventions) {
- this.namingConventions = namingConventions;
- }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -108,7 +108,7 @@
}
private void setComponentType(RendererModel rendererModel) {
- getNamingConventions().inferComponentType(rendererModel.getFamily());
+// getNamingConventions().inferComponentType(rendererModel.getFamily());
}
private void addToRenderKit(JsfRenderer annotation, ComponentLibrary library, RendererModel rendererModel) {
@@ -154,8 +154,8 @@
return;
}
- rendererModel.setFamily(getNamingConventions()
- .inferComponentFamilyByRendererClass(rendererElement.getQualifiedName().toString()));
+// rendererModel.setFamily(getNamingConventions()
+// .inferComponentFamilyByRendererClass(rendererElement.getQualifiedName().toString()));
}
private String getRendererType(TypeElement rendererElement, JsfRenderer annotation) {
@@ -169,7 +169,7 @@
return value.toString();
}
- return getNamingConventions().inferRendererTypeByRendererClass(asClassDesctiption(rendererElement));
+ return null;//getNamingConventions().inferRendererTypeByRendererClass(asClassDesctiption(rendererElement));
}
private void setRendererType(TypeElement rendererElement, RendererModel rendererModel, JsfRenderer annotation) {
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-01 14:21:35 UTC (rev 16704)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/processors/ComponentProcessorTest.java 2010-04-01 23:54:08 UTC (rev 16705)
@@ -274,37 +274,6 @@
assertNull(facetModel.getIcon());
}
- @Test
- public void testProcessAttributesFromProperty() throws Exception {
- Attribute attribute = createNiceMock(Attribute.class);
- expect(componentElement.getQualifiedName()).andStubReturn(new TestName(FOO_BAR));
- utils.visitSupertypes(eq(ClassName.parseName(FOO_BAR)), (SuperTypeVisitor) anyObject());expectLastCall();
- expect(utils.getBeanPropertiesAnnotatedWith(eq(Attribute.class),eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.singleton(property));
- expect(utils.getAbstractBeanProperties(eq(ClassName.parseName(FOO_BAR)))).andReturn(Collections.<BeanProperty>emptySet());
- expect(property.getName()).andReturn("foo");
- expect(property.getType()).andReturn(ClassName.parseName("java.lang.Integer"));
- expect(property.getAnnotation(Attribute.class)).andReturn(attribute);
- expect(property.getDocComment()).andReturn("my comment");
-// expect(property.isExists()).andReturn(true);
- expect(attribute.description()).andReturn(this.description);
- expect(attribute.generate()).andReturn(true);
- expect(attribute.events()).andReturn(new EventName[]{});
- expect(this.description.smallIcon()).andReturn("");
- expect(this.description.largeIcon()).andReturn("");
- expect(this.description.displayName()).andReturn("fooFacet").times(2);
- expect(this.description.value()).andReturn("");
- replay(log, utils, componentElement, jaxb, annotation,property,attribute,description);
- processor.processAttributes(componentElement, model,new String[0]);
- verify(log, utils, componentElement, jaxb,annotation,property,attribute,description);
- assertEquals(1, model.getAttributes().size());
- PropertyBase propertyModel = Iterables.getOnlyElement(model.getAttributes());
- assertTrue(propertyModel.isGenerate());
- assertEquals("foo", propertyModel.getName());
- assertEquals("my comment", propertyModel.getDescription());
- assertEquals("fooFacet", propertyModel.getDisplayname());
- assertEquals(ClassName.parseName("java.lang.Integer"), propertyModel.getType());
- assertNull(propertyModel.getIcon());
- }
@Override
protected Iterable<String> sources() {
16 years, 1 month