Author: Alex.Kolonitsky Date: 2009-12-04 15:11:46 -0500 (Fri, 04 Dec 2009) New Revision: 16067 Added: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/resources/META-INF/plexus/ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaClassRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaFieldRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaLanguageElementRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaMethodRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkError.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelValidator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardSources.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaClassPathObject.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileSystemObject.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.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/ClassDescription.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Extensible.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/InvalidNameException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Key.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/LibraryVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Merge.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.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/Name.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SearchableCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.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/Validator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/package-info.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/package-info.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatement.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/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/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/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/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/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/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/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/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/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/PropertyUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Strings.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.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/FacesConfigParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.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/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/ClassAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.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/FacesConfigAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.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/PropertyBean.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/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/package-info.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinition.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Element.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Node.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java Log: RFPL-195 - Code style policy Reformatting Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * Representation of method argument - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class Argument { private String name; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * @author Maksim Kaszynski - * */ public class ClassImport implements JavaImport { private Class<?> clazz; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; import java.util.ArrayList; @@ -29,8 +27,8 @@ /** * Wrapper for '@annotations - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class JavaAnnotation { private List<String> arguments = new ArrayList<String>(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; import java.util.ArrayList; @@ -32,8 +30,8 @@ /** * Java Class model. * Intended for building java classes. - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class JavaClass extends JavaLanguageElement { private static final JavaClass DEFAULT_SUPERCLASS = new JavaClass(Object.class); @@ -190,7 +188,7 @@ if (importPackageName != null && importPackageName.length() != 0) { result = !(importPackageName.equals("java.lang") - || (jp != null && importPackageName.equals(jp.getName()))); + || (jp != null && importPackageName.equals(jp.getName()))); } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,19 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * Java comment representation - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class JavaComment { private String value; - public JavaComment() {} + public JavaComment() { + } public JavaComment(String value) { super(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * Constructor method - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class JavaConstructor extends JavaMethod { public JavaConstructor(JavaClass javaClass, Argument... arguments) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * Class field abstraction - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class JavaField extends JavaLanguageElement { private Class<?> type; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * @author Maksim Kaszynski - * */ public interface JavaImport { public String getName(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,20 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.TreeSet; /** - * * @author Maksim Kaszynski - * */ public class JavaLanguageElement { private Set<JavaModifier> modifiers = new TreeSet<JavaModifier>(); @@ -84,8 +79,8 @@ public void addAnnotation(Class<?> annotation) { annotations.add(new JavaAnnotation(annotation)); } - - public void addComment(JavaComment comment) { - comments.add(comment); - } + + public void addComment(JavaComment comment) { + comments.add(comment); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; import java.util.ArrayList; @@ -29,7 +27,6 @@ /** * @author Maksim Kaszynski - * */ public class JavaMethod extends JavaLanguageElement { private List<Argument> arguments = new ArrayList<Argument>(); @@ -39,7 +36,7 @@ public JavaMethod(String name) { super(name); - + this.returnType = Void.TYPE; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * @author Maksim Kaszynski - * */ public enum JavaModifier { PRIVATE, DEFAULT { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * @author Maksim Kaszynski - * */ public class JavaPackage { private String name; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; import java.util.HashMap; @@ -28,7 +26,6 @@ /** * @author Maksim Kaszynski - * */ public final class JavaPrimitive { private static final Map<String, Class<?>> TYPES = new HashMap<String, Class<?>>() { @@ -56,7 +53,8 @@ } }; - private JavaPrimitive() {} + private JavaPrimitive() { + } public static Class<?> forName(String name) throws ClassNotFoundException { Class<?> class1 = TYPES.get(name); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; import java.util.HashSet; @@ -34,7 +32,8 @@ private Set<Class<?>> usedClasses = new HashSet<Class<?>>(); private JavaMethod method; - public MethodBody() {} + public MethodBody() { + } public MethodBody(JavaMethod method) { super(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -25,10 +25,9 @@ /** * @author Nick Belaevski - * */ public interface MethodBodyStatement { - public String getCode(FreeMarkerRenderer renderer); - + public String getCode(FreeMarkerRenderer renderer); + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementImpl.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementImpl.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -25,20 +25,19 @@ /** * @author Nick Belaevski - * */ public class MethodBodyStatementImpl implements MethodBodyStatement { - private String code; - - public MethodBodyStatementImpl(String code) { - super(); - this.code = code; - } + private String code; - @Override - public String getCode(FreeMarkerRenderer renderer) { - return code; - } + public MethodBodyStatementImpl(String code) { + super(); + this.code = code; + } + @Override + public String getCode(FreeMarkerRenderer renderer) { + return code; + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,16 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; +import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer; + import java.util.ArrayList; import java.util.List; -import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer; - - /** * @author Nick Belaevski * @since 4.0 @@ -37,41 +34,41 @@ private List<MethodBodyStatement> statements = new ArrayList<MethodBodyStatement>(); - public List<MethodBodyStatement> getStatements() { - return statements; - } - - public void addStatement(MethodBodyStatement statement) { - statements.add(statement); - } + public List<MethodBodyStatement> getStatements() { + return statements; + } - public void addStatement(int index, MethodBodyStatement statement) { - statements.add(index, statement); - } + public void addStatement(MethodBodyStatement statement) { + statements.add(statement); + } - public void addStatement(String statementCode) { - addStatement(new MethodBodyStatementImpl(statementCode)); - } + public void addStatement(int index, MethodBodyStatement statement) { + statements.add(index, statement); + } - public void addStatement(int index, String statementCode) { - addStatement(index, new MethodBodyStatementImpl(statementCode)); - } - - public boolean isEmpty() { - return statements.isEmpty(); - } - - /* (non-Javadoc) - * @see org.richfaces.builder.model.MethodBodyStatement#getCode() - */ - @Override - public String getCode(FreeMarkerRenderer renderer) { - StringBuilder sb = new StringBuilder(); - for (MethodBodyStatement statement: statements) { - sb.append(statement.getCode(renderer)); - sb.append('\n'); - } - - return sb.toString(); - } + public void addStatement(String statementCode) { + addStatement(new MethodBodyStatementImpl(statementCode)); + } + + public void addStatement(int index, String statementCode) { + addStatement(index, new MethodBodyStatementImpl(statementCode)); + } + + public boolean isEmpty() { + return statements.isEmpty(); + } + + /* (non-Javadoc) + * @see org.richfaces.builder.model.MethodBodyStatement#getCode() + */ + @Override + public String getCode(FreeMarkerRenderer renderer) { + StringBuilder sb = new StringBuilder(); + for (MethodBodyStatement statement : statements) { + sb.append(statement.getCode(renderer)); + sb.append('\n'); + } + + return sb.toString(); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.model; /** * Implementation of import taht cannot be resolved in design time - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class RuntimeImport implements JavaImport { private String name; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaClassRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaClassRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaClassRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.render; import org.richfaces.builder.model.JavaClass; @@ -29,13 +27,11 @@ import org.richfaces.builder.model.JavaMethod; import java.io.PrintWriter; - import java.util.List; import java.util.Set; /** * @author Maksim Kaszynski - * */ public class JavaClassRenderer extends JavaLanguageElementRenderer<JavaClass> { private JavaMethodRenderer methodRenderer = new JavaMethodRenderer(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaFieldRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaFieldRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaFieldRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,17 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.render; -import java.io.PrintWriter; - import org.richfaces.builder.model.JavaField; +import java.io.PrintWriter; + /** * @author Maksim Kaszynski - * */ public class JavaFieldRenderer extends JavaLanguageElementRenderer<JavaField> { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaLanguageElementRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaLanguageElementRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaLanguageElementRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,26 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.render; -import java.io.PrintWriter; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - import org.richfaces.builder.model.JavaAnnotation; import org.richfaces.builder.model.JavaComment; import org.richfaces.builder.model.JavaLanguageElement; import org.richfaces.builder.model.JavaModifier; +import java.io.PrintWriter; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + /** - * * @author Maksim Kaszynski - * * @param <T> */ public abstract class JavaLanguageElementRenderer<T extends JavaLanguageElement> { @@ -67,7 +61,7 @@ if (arguments != null && !arguments.isEmpty()) { out.print("("); - for (Iterator<String> iterator = arguments.iterator(); iterator.hasNext(); ) { + for (Iterator<String> iterator = arguments.iterator(); iterator.hasNext();) { String string = iterator.next(); out.print(string); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaMethodRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaMethodRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/JavaMethodRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,22 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.render; -import java.io.PrintWriter; -import java.util.Iterator; -import java.util.List; - import org.richfaces.builder.model.Argument; import org.richfaces.builder.model.JavaMethod; import org.richfaces.builder.model.MethodBody; import org.richfaces.builder.model.MethodBodyStatement; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.List; + /** * @author Maksim Kaszynski - * */ public class JavaMethodRenderer extends JavaLanguageElementRenderer<JavaMethod> { @Override @@ -55,7 +52,7 @@ List<Argument> arguments = javaMethod.getArguments(); if (arguments != null) { - for (Iterator<Argument> iterator = arguments.iterator(); iterator.hasNext(); ) { + for (Iterator<Argument> iterator = arguments.iterator(); iterator.hasNext();) { Argument argument = iterator.next(); out.print(argument.getType().getSimpleName()); @@ -75,7 +72,7 @@ if (exceptions != null && !exceptions.isEmpty()) { out.print(" throws "); - for (Iterator<Class<? extends Throwable>> iterator = exceptions.iterator(); iterator.hasNext(); ) { + for (Iterator<Class<? extends Throwable>> iterator = exceptions.iterator(); iterator.hasNext();) { Class<? extends Throwable> class1 = iterator.next(); out.print(class1.getSimpleName()); @@ -91,10 +88,10 @@ MethodBody methodBody = javaMethod.getMethodBody(); if (methodBody != null) { - List<MethodBodyStatement> statements = methodBody.getStatements(); - for (MethodBodyStatement methodBodyStatement : statements) { - out.println(methodBodyStatement.toString()); - } + List<MethodBodyStatement> statements = methodBody.getStatements(); + for (MethodBodyStatement methodBodyStatement : statements) { + out.println(methodBodyStatement.toString()); + } } out.println("}"); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,16 +1,15 @@ package org.richfaces.cdk; +import org.richfaces.cdk.CdkWriter.OutputType; + import java.io.File; -import org.richfaces.cdk.CdkWriter.OutputType; - /** * <p class="changed_added_4_0"> * That interface defines context for all CDK operations * </p> * * @author asmirnov(a)exadel.com - * */ public interface CdkContext { @@ -25,6 +24,7 @@ /** * <p class="changed_added_4_0">Get all sources for given type.</p> + * * @param type * @return */ @@ -33,6 +33,7 @@ /** * <p class="changed_added_4_0">Provides default output folder for given output type.</p> * TODO - define "output families" to group similar outputs ( classes, resources, tests ... ). + * * @param type of output * @return output folder for requested type. */ @@ -40,7 +41,8 @@ /** * <p class="changed_added_4_0">This method creates output file in the appropriate output folder. If target file exists and its modification time is late than model modification time from {@code lastModified} parameter, no new file will be created.</p> - * @param output target output folder. + * + * @param output target output folder. * @param relativePath path to file in the output folder. * @param lastModified model modification time. If that parameter is less then 0, no checks for existing file will be performed. * @return new created file or null if the target file exists and its modification time is late then model. @@ -49,6 +51,7 @@ /** * <p class="changed_added_4_0">Record recowerable CdkError. To avoid consequence builds of the project with many errors, all non-fatal errors ( Java compilation errors, incorrect xml fales, inconsistent component descriptions ) these error are stored in the context and marks whole build failed.</p> + * * @param error */ public void sendError(CdkError error); @@ -57,6 +60,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type * @return */ @@ -64,6 +68,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param <W> * @param workerClass * @return @@ -74,6 +79,7 @@ /** * <p class="changed_added_4_0">Get value of configuration option.</p> * TODO make it type safe. + * * @param name option name. * @return option value or null. */ @@ -81,8 +87,8 @@ /** * <p class="changed_added_4_0">Id of source files e.g. Java classes, faces-configs, renderer templates</p> + * * @author asmirnov(a)exadel.com - * */ public interface SourceType { String getName(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,18 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import org.richfaces.cdk.CdkWriter.OutputType; import java.io.File; import java.io.IOException; - import java.util.Iterator; import java.util.List; import java.util.Map; @@ -40,8 +36,8 @@ /** * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that class with * tool-specific methods.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class CdkContextBase implements CdkContext { private Map<String, String> options = Maps.newHashMap(); @@ -191,6 +187,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param options the options to set */ public void setOptions(Map<String, String> options) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkError.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkError.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkError.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,14 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; /** * <p class="changed_added_4_0">That class incapsulates information about recoverable CDK errors.</p> + * * @author asmirnov(a)exadel.com - * */ public class CdkError { private Throwable cause; @@ -37,6 +35,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message */ public CdkError(String message) { @@ -45,6 +44,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message * @param cause */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkException.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,24 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class CdkException extends Exception { /** * <p class="changed_added_4_0"></p> */ - public CdkException() {} + public CdkException() { + } /** * <p class="changed_added_4_0"></p> + * * @param message */ public CdkException(String message) { @@ -47,6 +47,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param cause */ public CdkException(Throwable cause) { @@ -55,6 +56,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message * @param cause */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkProcessingError.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; /** @@ -32,22 +30,23 @@ * processing that let developer to know about all errors in the project.</p> * * @author asmirnov(a)exadel.com - * */ public class CdkProcessingError extends CdkException { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private static final long serialVersionUID = -3696046213271071968L; /** * <p class="changed_added_4_0"></p> */ - public CdkProcessingError() {} + public CdkProcessingError() { + } /** * <p class="changed_added_4_0"></p> + * * @param message */ public CdkProcessingError(String message) { @@ -56,6 +55,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param cause */ public CdkProcessingError(Throwable cause) { @@ -64,6 +64,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message * @param cause */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWorker.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,15 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; /** * <p class="changed_added_4_0">Interface for all CDK worker objects ( parsers, validators, renderers etc. ). * Instances of these objects are stored in the {@link CdkContext}</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public interface CdkWorker { public void init(CdkContext context) throws CdkException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkWriter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public interface CdkWriter extends CdkWorker { public void render(ComponentLibrary library) throws CdkException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">This is dummy model builder class for not yet implemented source types</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class DummyBuilder implements ModelBuilder { private CdkContext context; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyGenerator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">This is dummy generator for not yet implemented output types</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class DummyGenerator implements CdkWriter { private CdkContext context; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import java.util.logging.Level; /** * <p class="changed_added_4_0">That logger delegates all calls to the JDK {@link java.util.logging.Logger}</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ class JavaLogger implements Logger { java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger(LoggerFactory.CDK_LOG); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import com.google.common.collect.ImmutableMap; - -import org.richfaces.cdk.templatecompiler.RendererClassGenerator; -import org.richfaces.cdk.templatecompiler.RendererTemplateParser; import org.richfaces.cdk.CdkContext.SourceType; import org.richfaces.cdk.CdkWriter.OutputType; import org.richfaces.cdk.apt.AptBuilder; import org.richfaces.cdk.generate.java.ComponentClassGenerator; import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.templatecompiler.RendererClassGenerator; +import org.richfaces.cdk.templatecompiler.RendererTemplateParser; import org.richfaces.cdk.xmlconfig.FacesConfigGenerator; import org.richfaces.cdk.xmlconfig.FacesConfigParser; @@ -44,7 +41,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public final class LibraryBuilder implements CdkWorker { @@ -53,18 +49,18 @@ */ private static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS = ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder().put(StandardOutputs.COMPONENT_CLASSES, - ComponentClassGenerator.class).put(StandardOutputs.RENDERER_CLASSES, - RendererClassGenerator.class).put(StandardOutputs.FACES_CONFIG, - FacesConfigGenerator.class).build(); + ComponentClassGenerator.class).put(StandardOutputs.RENDERER_CLASSES, + RendererClassGenerator.class).put(StandardOutputs.FACES_CONFIG, + FacesConfigGenerator.class).build(); /** * map contain library model builder classes for each source type. */ private static final ImmutableMap<SourceType, Class<? extends ModelBuilder>> BUILDERS = ImmutableMap.<SourceType, Class<? extends ModelBuilder>>builder().put(StandardSources.FACES_CONFIGS, - FacesConfigParser.class).put(StandardSources.JAVA_SOURCES, - AptBuilder.class).put(StandardSources.RENDERER_TEMPLATES, - RendererTemplateParser.class).build(); + FacesConfigParser.class).put(StandardSources.JAVA_SOURCES, + AptBuilder.class).put(StandardSources.RENDERER_TEMPLATES, + RendererTemplateParser.class).build(); /** * <p class="changed_added_4_0"> @@ -79,7 +75,8 @@ * * @param context */ - public LibraryBuilder() {} + public LibraryBuilder() { + } @Override public void init(CdkContext context) throws CdkException { @@ -106,8 +103,7 @@ * into model. * </p> * - * @param sources - * Java Source files. + * @param sources Java Source files. * @return generated library model. * @throws CdkException */ @@ -150,6 +146,7 @@ /** * Generate all types of files from library model. + * * @param library * @throws CdkException */ @@ -165,7 +162,7 @@ * </p> * * @param library model - * @param type of generated files. + * @param type of generated files. * @throws CdkException */ public void generate(ComponentLibrary library, OutputType type) throws CdkException { @@ -176,6 +173,7 @@ /** * This method returns instance of {@link CdkWriter} for given output type. + * * @param type * @return * @throws CdkException @@ -222,6 +220,7 @@ /** * This method returns initialized instance of the {@link ModelBuilder} for given source type. + * * @param type * @return * @throws CdkException Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,16 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; /** * That interface hides current logging system from generator classe. * Concrete tools ( Maven, Ant, JUnit ) should provide appropriate logger instance that delegates * messages to the current log system. - * @author shura * + * @author shura */ public interface Logger { boolean isDebugEnabled(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,21 +21,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public final class LoggerFactory { public static final String CDK_LOG = "org.richfaces.cdk"; /** - * <p class="changed_added_4_0">Current logger. By default all calls will be sent to system - * {@link java.util.logging.Logger}</p> + * <p class="changed_added_4_0">Current logger. By default all calls will be sent to system + * {@link java.util.logging.Logger}</p> */ private static Logger logger = new JavaLogger(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,21 +21,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">Interface for {@link ComponentLibrary} model builder.</p> + * * @author asmirnov(a)exadel.com - * */ public interface ModelBuilder extends CdkWorker { /** * <p class="changed_added_4_0">Initialize builder.</p> + * * @param context * @throws CdkException */ @@ -43,6 +42,7 @@ /** * <p class="changed_added_4_0">Build library model.</p> + * * @return * @throws CdkException */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelValidator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelValidator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelValidator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,21 +21,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">Interface for CDK library model verifier.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public interface ModelValidator extends CdkWorker { /** * <p class="changed_added_4_0">Perform verify procedure on the library model.</p> + * * @param library * @throws CdkException */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.InvalidNameException; @@ -35,7 +33,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public interface NamingConventions extends CdkWorker { @@ -46,6 +43,7 @@ * <li><code>&lt;prefix&gt;.component.&lt;Name&gt;Base</code> =&gt; <code>&lt;prefix&gt;.&lt;Name&gt;</code> </li> * <li><code>&lt;prefix&gt;.component.UI&lt;Name&gt;</code> =&gt; <code>&lt;prefix&gt;.&lt;Name&gt;</code> </li> * </ul> + * * @param explicitType * @param className * @return @@ -61,12 +59,13 @@ * <code>&lt;prefix&gt;.component.UI&lt;Name&gt;</code> for an abstract class.</li> * <li>Use base class name if concrete class should not be generated. * </ul> + * * @param explicitClass * @param className * @return */ public String inferUIComponentClass(String componentType, String explicitClass, String baseClass, - boolean baseClassIsAbstract) throws InvalidNameException; + boolean baseClassIsAbstract) throws InvalidNameException; public String inferUIComponentBaseClass(String componentType, String baseClassName, boolean baseClassIsAbstract); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -10,7 +10,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public final class RichFacesConventions implements NamingConventions { private static final String ABSTRACT = "Abstract"; @@ -22,7 +21,8 @@ private String baseName; private CdkContext context; - public RichFacesConventions() {} + public RichFacesConventions() { + } @Override public void init(CdkContext context) throws CdkException { @@ -81,8 +81,8 @@ @Override public String inferUIComponentClass(String componentType, String explicitClass, String baseClass, - boolean baseClassIsAbstract) throws InvalidNameException { - + boolean baseClassIsAbstract) throws InvalidNameException { + String className; if (!Strings.isEmpty(explicitClass)) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputFolders.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.CdkWriter.OutputType; /** * <p class="changed_added_4_0">This enumeration defines standard types of output folders.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public enum StandardOutputFolders implements OutputType { JAVA_CLASSES, RESOURCES, TEST_JAVA_CLASSES, TEST_RESOURCES, DOCUMENTATION; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.CdkWriter.OutputType; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public enum StandardOutputs implements OutputType { COMPONENT_CLASSES(StandardOutputFolders.JAVA_CLASSES), RENDERER_CLASSES(StandardOutputFolders.JAVA_CLASSES), @@ -44,6 +42,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param folderType */ private StandardOutputs(OutputType folderType) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardSources.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardSources.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardSources.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.CdkContext.SourceType; /** * <p class="changed_added_4_0">This enumeration defines standard types for project sources.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public enum StandardSources implements SourceType { JAVA_SOURCES, FACES_CONFIGS, RENDERER_TEMPLATES; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; import org.richfaces.cdk.model.Component; @@ -34,8 +32,8 @@ /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class ValidatorImpl implements ModelValidator { private CdkContext context; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,31 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; -import java.io.File; - -import java.net.URL; -import java.net.URLClassLoader; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - -import javax.annotation.processing.Processor; - -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; -import javax.tools.Diagnostic.Kind; -import javax.tools.JavaCompiler.CompilationTask; - +import com.google.common.collect.Lists; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.Logger; @@ -55,7 +33,22 @@ import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.model.ComponentLibrary; -import com.google.common.collect.Lists; +import javax.annotation.processing.Processor; +import javax.tools.Diagnostic; +import javax.tools.Diagnostic.Kind; +import javax.tools.DiagnosticListener; +import javax.tools.JavaCompiler; +import javax.tools.JavaCompiler.CompilationTask; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; +import java.io.File; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; /** * <p class="changed_added_4_0"> @@ -63,7 +56,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class AptBuilder implements ModelBuilder { private static final Logger LOG = LoggerFactory.getLogger(); @@ -77,6 +69,7 @@ /** * <p class="changed_added_4_0">Builder method that creates and initializes compiler instance. * That instance can be reused for consecuence processing.</p> + * * @param context * @return */ @@ -168,6 +161,7 @@ /** * <p class="changed_added_4_0">That method process source files and call appropriate annotation processors</p> + * * @param sources * @param processors * @throws AptException @@ -193,17 +187,17 @@ } if (!sourceObjects.isEmpty()) { - CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null, - sourceObjects); + CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null, + sourceObjects); - task.setProcessors(Arrays.asList(processors)); - task.setLocale(locale); + task.setProcessors(Arrays.asList(processors)); + task.setLocale(locale); - if (!task.call()) { - throw new AptException("Compilation error: " + messages); - } + if (!task.call()) { + throw new AptException("Compilation error: " + messages); + } } else { - LOG.info("No source objects detected, skipping compilation"); + LOG.info("No source objects detected, skipping compilation"); } } @@ -221,8 +215,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param options - * the options to set + * @param options the options to set */ protected void setOptions(Iterable<String> options) { this.options = options; @@ -230,6 +223,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the fileManager */ protected VirtualFileManager getFileManager() { @@ -238,6 +232,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param fileManager the fileManager to set */ protected void setFileManager(VirtualFileManager fileManager) { @@ -246,6 +241,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param javaCompiler the javaCompiler to set */ protected void setJavaCompiler(JavaCompiler javaCompiler) { @@ -264,6 +260,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the locale */ public Locale getLocale() { @@ -272,6 +269,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param locale the locale to set */ public void setLocale(Locale locale) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptException.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,31 +21,31 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class AptException extends CdkException { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private static final long serialVersionUID = 8023042422371321042L; /** * <p class="changed_added_4_0"></p> */ - public AptException() {} + public AptException() { + } /** * <p class="changed_added_4_0"></p> + * * @param message */ public AptException(String message) { @@ -54,6 +54,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param cause */ public AptException(Throwable cause) { @@ -62,6 +63,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message * @param cause */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,12 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import com.google.common.collect.Sets; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.NamingConventions; @@ -35,14 +32,16 @@ import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; - import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; - import java.lang.annotation.Annotation; - import java.util.List; import java.util.Set; @@ -53,7 +52,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public abstract class CdkProcessor extends AbstractProcessor { @@ -68,8 +66,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param context - * current CDK context + * @param context current CDK context */ protected CdkProcessor(CdkContext context) { super(); @@ -97,16 +94,14 @@ * <p class="changed_added_4_0"> * Get all classes annotated with particular annotation. * </p> - * @param round - * current round environment. - * @param annotation - * annotation class. * + * @param round current round environment. + * @param annotation annotation class. * @return {@link Set} of all classes annotated with {@code annotation} * type. */ protected Set<? extends TypeElement> getClassesAnnotatedWith(RoundEnvironment round, - Class<? extends Annotation> annotation) { + Class<? extends Annotation> annotation) { Set<TypeElement> classes = Sets.newHashSet(); Set<? extends Element> annotatedWith = round.getElementsAnnotatedWith(annotation); @@ -132,7 +127,7 @@ * @return */ protected Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation, - TypeElement type) { + TypeElement type) { Set<BeanProperty> properties = Sets.newHashSet(); List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(type); @@ -208,7 +203,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ protected final class BeanProperty { private Element element; @@ -285,6 +279,7 @@ /** * <p class="changed_added_4_0">Get JavaDoc comment of appropriate bean property element.</p> + * * @return */ public String getDocComment() { @@ -297,6 +292,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the exists */ public boolean isExists() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,12 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import com.google.common.collect.Lists; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.annotations.*; @@ -40,14 +37,17 @@ import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; - import javax.faces.event.FacesEvent; - -import javax.lang.model.element.*; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; import javax.lang.model.type.MirroredTypesException; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.ElementFilter; - import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -59,7 +59,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ @SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Component.NAME}) public class ComponentProcessor extends CdkProcessor { @@ -104,7 +103,7 @@ // Because component type is a primary key for components collection, we have to infer explicit // value here. String type = getNamingConventions().inferComponentType(componentAnnotation.value(), - componentElement.getQualifiedName().toString()); + componentElement.getQualifiedName().toString()); org.richfaces.cdk.model.Component component = library.findOrCreateComponent(type); // Should that component be generated ? @@ -114,7 +113,7 @@ // rise error and continue. processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(), - componentElement); + componentElement); continue; } @@ -136,7 +135,7 @@ processingEnv.getElementUtils().getElementValuesWithDefaults(mirror); for (Entry<? extends ExecutableElement, ? extends AnnotationValue> valueEntry - : valuesWithDefaults.entrySet()) { + : valuesWithDefaults.entrySet()) { Name name = valueEntry.getKey().getSimpleName(); if ("value".equals(name.toString())) { @@ -157,7 +156,7 @@ // rise error and continue. processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, - e.getMessage(), element); + e.getMessage(), element); continue; } @@ -252,6 +251,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param component * @param icon */ @@ -286,7 +286,7 @@ Set<Modifier> modifiers = field.getModifiers(); if (modifiers.contains(Modifier.FINAL) && modifiers.contains(Modifier.STATIC) - && field.getSimpleName().equals("COMPONENT_FAMILY")) { + && field.getSimpleName().equals("COMPONENT_FAMILY")) { Object value = field.getConstantValue(); if (null != value) { @@ -338,7 +338,7 @@ protected void processAttributes(TypeElement componentElement, org.richfaces.cdk.model.Component component) throws CdkException { - + // Process XML files with standard attributes definitions. Attributes attributes = componentElement.getAnnotation(Attributes.class); @@ -461,6 +461,7 @@ /** * <p class="changed_added_4_0">Reccursive method to find and process standard class or interface attributes.</p> + * * @param component * @param interfaceMirror */ @@ -476,7 +477,7 @@ try { component.getAttributes().addAll(fragmentParser.parseProperties(CdkEntityResolver.URN_ATTRIBUTES + name - + ".xml")); + + ".xml")); } catch (CdkException e) { // TODO - log errors ? Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,25 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Lists; - import org.richfaces.cdk.Logger; import org.richfaces.cdk.LoggerFactory; -import javax.tools.*; +import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; - +import javax.tools.StandardLocation; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.io.Serializable; - import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -47,17 +46,16 @@ /** * <p class="changed_added_4_0"> - * That class wraps {@link StandardJavaFileManager} + * That class wraps {@link javax.tools.StandardJavaFileManager} * </p> * * @author asmirnov(a)exadel.com - * */ final class VirtualFileManager extends ForwardingJavaFileManager<JavaFileManager> { private static final Logger LOG = LoggerFactory.getLogger(); // private final BiMap<FileObjectKey, FileObject> classPathFiles; -// private final BiMap<FileObject, FileObjectKey> inversedClassPathFiles; + // private final BiMap<FileObject, FileObjectKey> inversedClassPathFiles; private final ClassLoader classPathLoader; private final BiMap<FileObject, FileObjectKey> inversedSources; private final BiMap<FileObjectKey, FileObject> sources; @@ -93,16 +91,14 @@ public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) throws IOException { if (LOG.isDebugEnabled()) { LOG.debug("VirtualFileManager.getJavaFileForInput(" + String.valueOf(location) + "," + className + "," - + String.valueOf(kind) + ")"); + + String.valueOf(kind) + ")"); } FileObjectKey key = new FileObjectKey(className, kind); if (StandardLocation.SOURCE_PATH.equals(location)) { - JavaFileObject fileObject = null; + JavaFileObject fileObject = (JavaFileObject) sources.get(key); - fileObject = (JavaFileObject) sources.get(key); - if (null == fileObject && null != javaSourceDirectory) { String fileName = className.replace('.', File.separatorChar) + kind.extension; File resource = new File(javaSourceDirectory, fileName); @@ -126,7 +122,7 @@ } if (StandardLocation.CLASS_OUTPUT.equals(location) || StandardLocation.SOURCE_PATH.equals(location) - || StandardLocation.SOURCE_OUTPUT.equals(location)) { + || StandardLocation.SOURCE_OUTPUT.equals(location)) { return getClassPathLoader(); } else { return super.getClassLoader(location); @@ -145,7 +141,7 @@ public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) { if (LOG.isDebugEnabled()) { LOG.debug("VirtualFileManager.getJavaFileForOutput(" + String.valueOf(location) + "," + className + "," - + String.valueOf(kind) + "," + String.valueOf(sibling) + ")"); + + String.valueOf(kind) + "," + String.valueOf(sibling) + ")"); } JavaFileObject fileForOutput = null; @@ -188,11 +184,11 @@ @Override public Iterable<JavaFileObject> list(final Location location, final String packageName, final Set<Kind> kinds, - final boolean recurse) throws IOException { + final boolean recurse) throws IOException { if (LOG.isDebugEnabled()) { LOG.debug("VirtualFileManager.list(" + String.valueOf(location) + "," + packageName + "," - + String.valueOf(kinds) + "," + String.valueOf(recurse) + ")"); + + String.valueOf(kinds) + "," + String.valueOf(recurse) + ")"); } Iterable<JavaFileObject> list; @@ -214,7 +210,7 @@ // Recursive add directory content. try { Iterable<JavaFileObject> childList = list(location, packageName + '.' + name, - kinds, recurse); + kinds, recurse); for (JavaFileObject javaFileObject : childList) { fileslist.add(javaFileObject); @@ -315,7 +311,7 @@ public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException { if (LOG.isDebugEnabled()) { LOG.debug("VirtualFileManager.getFileForInput(" + String.valueOf(location) + "," + packageName + "," - + relativeName + ")"); + + relativeName + ")"); } if (StandardLocation.SOURCE_PATH.equals(location)) { @@ -345,10 +341,10 @@ @Override public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) throws IOException { - + if (LOG.isDebugEnabled()) { LOG.debug("VirtualFileManager.getFileForOutput(" + String.valueOf(location) + "," + packageName + "," - + relativeName + "," + String.valueOf(sibling) + ")"); + + relativeName + "," + String.valueOf(sibling) + ")"); } return super.getFileForOutput(location, packageName, relativeName, sibling); @@ -379,7 +375,7 @@ public String inferBinaryName(Location location, JavaFileObject file) { if (LOG.isDebugEnabled()) { LOG.debug("VirtualFileManager.inferBinaryName(" + String.valueOf(location) + "," + String.valueOf(file) - + ")"); + + ")"); } if (StandardLocation.SOURCE_PATH.equals(location)) { @@ -454,8 +450,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param outputDirectory - * the outputDirectory to set + * @param outputDirectory the outputDirectory to set */ public void setOutputDirectory(File outputDirectory) { this.outputDirectory = outputDirectory; @@ -475,8 +470,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param javaSourceDirectory - * the javaSourceDirectory to set + * @param javaSourceDirectory the javaSourceDirectory to set */ public void setJavaSourceDirectory(File javaSourceDirectory) { this.javaSourceDirectory = javaSourceDirectory; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaClassPathObject.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaClassPathObject.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaClassPathObject.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,13 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import java.io.IOException; import java.io.InputStream; - import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; @@ -37,13 +34,13 @@ * from {@link java.io.File} or {@link URL}</p> * * @author asmirnov(a)exadel.com - * */ public class VirtualJavaClassPathObject extends VirtualJavaFileObject { private final URL url; /** * <p class="changed_added_4_0">Create file object from URL</p> + * * @param url * @param kind * @throws URISyntaxException Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,17 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import javax.tools.SimpleJavaFileObject; - import java.io.IOException; import java.io.InputStream; - import java.net.URI; - import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; @@ -42,22 +37,22 @@ * from {@link java.io.File} or {@link java.net.URL}</p> * * @author asmirnov(a)exadel.com - * */ public class VirtualJavaFileObject extends SimpleJavaFileObject { /** - * <p class="changed_added_4_0">base file object. One of {@link file} or {@link url} fields should be set</p> + * <p class="changed_added_4_0">base file object. One of {@link file} or {@link url} fields should be set</p> */ private Charset charset = Charset.defaultCharset(); /** - * <p class="changed_added_4_0">Cached content</p> + * <p class="changed_added_4_0">Cached content</p> */ private CharSequence content; /** * <p class="changed_added_4_0"></p> + * * @param classFile * @param kind */ @@ -94,6 +89,7 @@ /** * <p class="changed_added_4_0">Set {@link Charset} for read operations</p> + * * @param charset the charset to set */ public void setCharset(Charset charset) { @@ -105,6 +101,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the charset */ public Charset getCharset() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileSystemObject.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileSystemObject.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileSystemObject.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.apt; import java.io.File; @@ -35,17 +33,17 @@ * {@link File} or {@link java.net.URL}</p> * * @author asmirnov(a)exadel.com - * */ public class VirtualJavaFileSystemObject extends VirtualJavaFileObject { /** - * <p class="changed_added_4_0">base file object. One of {@link file} or {@link url} fields should be set</p> + * <p class="changed_added_4_0">base file object. One of {@link file} or {@link url} fields should be set</p> */ private final File classFile; /** * <p class="changed_added_4_0">Create source from {@link File}</p> + * * @param classFile */ public VirtualJavaFileSystemObject(File classFile) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,23 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.freemarker; -import org.richfaces.cdk.CdkContext; - import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; -import freemarker.template.TemplateHashModel; -import freemarker.template.TemplateModel; -import freemarker.template.TemplateModelException; +import org.richfaces.cdk.CdkContext; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class CdkConfiguration extends Configuration { private static final String TEMPLATES = "/META-INF/templates"; @@ -54,11 +48,12 @@ setObjectWrapper(new LibraryModelWrapper()); // Add context variables - this.setSharedVariable("context", new BeanModel(context,new BeansWrapper())); + this.setSharedVariable("context", new BeanModel(context, new BeansWrapper())); } /** * <p class="changed_added_4_0"></p> + * * @return the context */ protected CdkContext getContext() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,34 +21,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.freemarker; -import java.util.NoSuchElementException; -import java.util.Set; - -import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.EventName; -import org.richfaces.cdk.model.Property; - import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; - import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; - import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; +import org.richfaces.cdk.model.Component; +import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.Property; +import java.util.NoSuchElementException; +import java.util.Set; + /** * <p class="changed_added_4_0"> * </p> * * @author asmirnov(a)exadel.com - * */ public class ComponentTemplateModel extends BeanModel implements TemplateModel { private final Component component; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,15 +21,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.freemarker; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; - +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; @@ -38,14 +34,15 @@ import org.richfaces.cdk.model.Trackable; import org.richfaces.cdk.model.Visitable; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; /** * <p class="changed_added_4_0">Base class for all output file buildes that use FreeMarker as template engine.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public abstract class FreeMarkerRenderer<C extends Visitable, P> implements CdkWriter, LibraryVisitor<Boolean, P> { private Configuration configuration; @@ -129,6 +126,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the context */ protected CdkContext getContext() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,23 +21,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.freemarker; import freemarker.ext.beans.BeansWrapper; - import freemarker.template.ObjectWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; - import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.Property; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class LibraryModelWrapper extends BeansWrapper implements ObjectWrapper { public LibraryModelWrapper() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,29 +21,26 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.freemarker; -import org.richfaces.cdk.model.Property; -import org.richfaces.cdk.util.Strings; - import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; - import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.util.Strings; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class PropertyModel extends BeanModel implements TemplateModel { private final Property property; /** * <p class="changed_added_4_0"></p> + * * @param object * @param wrapper */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.generate.java; import org.richfaces.cdk.CdkContext; @@ -38,8 +36,8 @@ /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class ComponentClassGenerator extends FreeMarkerRenderer<Component, ComponentLibrary> implements CdkWriter { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Attribute.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,20 +21,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") public class Attribute extends Property { /** * <p class="changed_added_4_0"></p> + * * @param name */ public Attribute(Property.Name name) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Behavior.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") public class Behavior implements ModelElement<Behavior, Behavior.Type> { Modified: 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/BehaviorRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class BehaviorRenderer implements ModelElement<BehaviorRenderer, BehaviorRenderer.Type> { @@ -48,6 +46,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ public Type getType() { @@ -56,6 +55,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the rendererClass */ public ClassDescription getRendererClass() { @@ -64,6 +64,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param rendererClass the rendererClass to set */ public void setRendererClass(ClassDescription rendererClass) { @@ -82,14 +83,15 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public static final class Type extends Key { /** * <p class="changed_added_4_0"></p> + * * @param type */ public Type(String type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import com.google.common.collect.ImmutableMap; @@ -33,41 +31,41 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class ClassDescription { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private static final long serialVersionUID = -846623207703750456L; private static final ImmutableMap<String, String> PRIMITIVE_TYPES = ImmutableMap.<String, String>builder().put(boolean.class.getName(), - Boolean.class.getName()).put(byte.class.getName(), - Byte.class.getName()).put(char.class.getName(), - Character.class.getName()).put(short.class.getName(), - Short.class.getName()).put(int.class.getName(), - Integer.class.getName()).put(long.class.getName(), - Long.class.getName()).put(float.class.getName(), - Float.class.getName()).put(double.class.getName(), - Double.class.getName()).build(); + Boolean.class.getName()).put(byte.class.getName(), + Byte.class.getName()).put(char.class.getName(), + Character.class.getName()).put(short.class.getName(), + Short.class.getName()).put(int.class.getName(), + Integer.class.getName()).put(long.class.getName(), + Long.class.getName()).put(float.class.getName(), + Float.class.getName()).put(double.class.getName(), + Double.class.getName()).build(); private final String boxingClassName; private final String fullName; /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private final String name; private final boolean primitive; /** - * <p class="changed_added_4_0">Id parameters for that class</p> - * TODO append type parameters to key. + * <p class="changed_added_4_0">Id parameters for that class</p> + * TODO append type parameters to key. */ private String typeParameters; /** * <p class="changed_added_4_0"></p> + * * @param cl */ public ClassDescription(Class<?> cl) { @@ -106,6 +104,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the typeParameters */ public String getTypeParameters() { @@ -114,6 +113,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param typeParameters the typeParameters to set */ public void setTypeParameters(String typeParameters) { @@ -132,6 +132,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return package name. */ public String getPackage() { @@ -146,6 +147,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return package name. */ public String getSimpleName() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,24 +1,22 @@ package org.richfaces.cdk.model; -import java.util.Collection; -import java.util.Set; +import com.google.common.collect.Sets; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.model.Facet.Name; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlType; +import java.util.Collection; +import java.util.Set; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.model.Facet.Name; - -import com.google.common.collect.Sets; - /** * That class represents JSF component in the CDK. * That is mapped to faces-config "component" element. + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") @XmlType(name = "faces-config-componentType") @@ -26,7 +24,7 @@ public final class Component extends ModelElementBase implements ModelElement<Component, Component.Type> { /** - * <p class="changed_added_4_0">Is that component c</p> + * <p class="changed_added_4_0">Is that component c</p> */ private boolean generate = false; @@ -60,7 +58,7 @@ * </p> */ private final SearchableCollection<Property, Property.Name> attributes = new ModelCollection<Property, - Property.Name>() { + Property.Name>() { @Override public Property create(Property.Name key) { return new Property(key); @@ -150,8 +148,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param family - * the family to set + * @param family the family to set */ public void setFamily(String family) { this.family = family; @@ -172,8 +169,7 @@ * <p class="changed_added_4_0">Represents class of that component. * </p> * - * @param componentClass - * the componentClass to set + * @param componentClass the componentClass to set */ @XmlElement(name = "component-class") public void setComponentClass(ClassDescription componentClass) { @@ -195,8 +191,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param baseClass - * the baseClass to set + * @param baseClass the baseClass to set */ public void setBaseClass(ClassDescription baseClass) { this.baseClass = baseClass; @@ -204,6 +199,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the generate */ @Merge @@ -213,6 +209,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param generate the generate to set */ public void setGenerate(boolean exists) { @@ -226,8 +223,8 @@ * * @return the attributes */ - @XmlElements({@XmlElement(name = "property", type = Property.class) , - @XmlElement(name = "attribute", type = Attribute.class) }) + @XmlElements({@XmlElement(name = "property", type = Property.class), + @XmlElement(name = "attribute", type = Attribute.class)}) public Collection<Property> getAttributes() { return attributes; } @@ -242,6 +239,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the facets */ public Collection<Facet> getFacets() { @@ -254,6 +252,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the events */ public Collection<Event> getEvents() { @@ -269,6 +268,7 @@ /** * <p class="changed_added_4_0"></p> * TODO - synchronize renderers collection with library ? + * * @return the renderers */ public Set<Renderer> getRenderers() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,31 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import org.richfaces.cdk.CdkException; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; - import java.io.Serializable; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; - import java.util.Collection; import java.util.NoSuchElementException; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.richfaces.cdk.CdkException; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - /** * <p class="changed_added_4_0"> * That class contains model of all JSF components asscoiated with that project @@ -56,7 +49,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ @XmlRootElement(name = "faces-config", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlType(namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, name = "faces-configType") @@ -72,7 +64,7 @@ */ private static final long serialVersionUID = -6055670836731899832L; private final SearchableCollection<Component, Component.Type> components = new ModelCollection<Component, - Component.Type>() { + Component.Type>() { @Override public Component create(Component.Type key) { return new Component(key); @@ -85,7 +77,7 @@ * </p> */ private final SearchableCollection<RenderKit, RenderKit.Id> renderKits = new ModelCollection<RenderKit, - RenderKit.Id>() { + RenderKit.Id>() { @Override public RenderKit create(RenderKit.Id key) { RenderKit rendererKit = new RenderKit(key); @@ -131,7 +123,7 @@ } }; private final SearchableCollection<Behavior, Behavior.Type> behaviors = new ModelCollection<Behavior, - Behavior.Type>() { + Behavior.Type>() { @Override public Behavior create(Behavior.Type key) { Behavior behavior = new Behavior(key); @@ -193,13 +185,10 @@ * Create a new component description. * </p> * - * @param type - * component type. - * @param className - * final component class name. - * @param superClassName - * name of the component superclass. May be empty or null for - * already existed components. + * @param type component type. + * @param className final component class name. + * @param superClassName name of the component superclass. May be empty or null for + * already existed components. * @return */ public Component findOrCreateComponent(String type) { @@ -286,6 +275,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the events */ public SearchableCollection<Event, Event.Type> getEvents() { @@ -306,6 +296,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the extension */ public ConfigExtension getExtension() { @@ -314,6 +305,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param extension the extension to set */ public void setExtension(ConfigExtension extension) { @@ -328,12 +320,12 @@ static <K extends Key, T extends ModelElement<T, K>> void merge(Collection<T> target, Collection<T> source) { for (T element : source) { T targetElement = null; - + try { find(target, element.getKey()); } catch (NoSuchElementException e) { - // TODO: handle exception - } + // TODO: handle exception + } if (null == targetElement) { target.add(element); @@ -377,7 +369,7 @@ } static <R, P, T extends ModelElement<T, ?>> R accept(Iterable<T> components, LibraryVisitor<R, P> visitor, P param, - R result) throws CdkException { + R result) throws CdkException { if (null == result) { for (T t : components) { R accept = t.accept(visitor, param); @@ -398,19 +390,15 @@ * Find element in the model collection. * </p> * - * @param <T> - * type of element to find. - * @param collection - * of elements. - * @param key - * for search. + * @param <T> type of element to find. + * @param collection of elements. + * @param key for search. * @return existing element in the collection. - * @throws NoSuchElementException - * if there was no such element in collection. + * @throws NoSuchElementException if there was no such element in collection. */ static <K extends Key, T extends Searchable<K>> T find(Iterable<T> collection, final K key) throws NoSuchElementException { - + return Iterables.find(collection, new Predicate<T>() { @Override public boolean apply(T input) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,26 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; -import java.util.List; +import org.dom4j.Element; import javax.xml.bind.annotation.XmlAnyElement; +import java.util.List; -import org.dom4j.Element; - /** * <p class="changed_added_4_0">That class represents all faces-config "extension" fields.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class ConfigExtension { private List<Element> extensions; /** * <p class="changed_added_4_0"></p> + * * @return the extensions */ @XmlAnyElement @@ -50,6 +48,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param extensions the extensions to set */ public void setExtensions(List<Element> extensions) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Converter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") public class Converter implements ModelElement<Converter, Key> { @@ -38,6 +36,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public Converter(Key type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -5,8 +5,8 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public interface DescriptionGroup { @@ -24,8 +24,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param description - * the description to set + * @param description the description to set */ public void setDescription(String description); @@ -43,8 +42,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param displayname - * the displayname to set + * @param displayname the displayname to set */ public void setDisplayname(String displayname); @@ -62,15 +60,14 @@ * <p class="changed_added_4_0"> * </p> * - * @param icon - * the icon to set + * @param icon the icon to set */ public void setIcon(Icon icon); /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlType(name = "icon-type", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public static final class Icon { @@ -79,6 +76,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the smallIcon */ @XmlElement(name = "small-icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -88,6 +86,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param smallIcon the smallIcon to set */ public void setSmallIcon(String smallIcon) { @@ -96,6 +95,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the largeIcon */ @XmlElement(name = "large-icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -105,6 +105,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param largeIcon the largeIcon to set */ public void setLargeIcon(String largeIcon) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Event.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; @@ -32,7 +30,6 @@ * component.</p> * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class Event implements ModelElement<Event, Event.Type> { @@ -42,12 +39,13 @@ private ClassDescription tagHandler; /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private final Type type; /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public Event(Type name) { @@ -56,6 +54,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ public Key getType() { @@ -69,6 +68,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the description */ public String getDescription() { @@ -77,6 +77,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param description the description to set */ public void setDescription(String description) { @@ -85,6 +86,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the listenerInterface */ public ClassDescription getListenerInterface() { @@ -93,6 +95,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param listenerInterface the listenerInterface to set */ public void setListenerInterface(ClassDescription listenerInterface) { @@ -101,6 +104,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the sourceInterface */ public ClassDescription getSourceInterface() { @@ -109,6 +113,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param sourceInterface the sourceInterface to set */ public void setSourceInterface(ClassDescription sourceInterface) { @@ -117,6 +122,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the tagHandler */ public ClassDescription getTagHandler() { @@ -125,6 +131,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param tagHandler the tagHandler to set */ public void setTagHandler(ClassDescription tagHandler) { @@ -143,13 +150,14 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public static final class Type extends Key { /** * <p class="changed_added_4_0"></p> + * * @param type */ public Type(String type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; -import java.io.Serializable; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlValue; +import java.io.Serializable; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class EventName implements Serializable { @@ -42,6 +39,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the name */ @XmlValue @@ -51,6 +49,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(String name) { @@ -59,6 +58,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the defaultEvent */ @XmlAttribute(name = "default") @@ -68,6 +68,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param defaultEvent the defaultEvent to set */ public void setDefaultEvent(boolean defaultEvent) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Extensible.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Extensible.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Extensible.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; /** * <p class="changed_added_4_0">That interface marks all faces-config elements that have 'extension' element.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public interface Extensible<E extends ConfigExtension> { /** * <p class="changed_added_4_0">Return extension object that holds CDK-related tags and any other content as well.</p> + * * @return */ public E getExtension(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Facet.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class Facet extends ModelElementBase implements ModelElement<Facet, Facet.Name> { @@ -39,6 +37,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name */ public Facet(Name name) { @@ -47,6 +46,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the name */ public Name getName() { @@ -60,6 +60,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the generate */ public boolean isGenerate() { @@ -68,6 +69,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param generate the generate to set */ public void setGenerate(boolean generate) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/InvalidNameException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/InvalidNameException.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/InvalidNameException.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0">That exception indicates what some name does not meet CDK naming conventions.</p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class InvalidNameException extends CdkException { @@ -44,6 +42,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message */ public InvalidNameException(String message) { @@ -52,6 +51,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param cause */ public InvalidNameException(Throwable cause) { @@ -60,6 +60,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message * @param cause */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Key.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Key.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Key.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import java.io.Serializable; /** * <p class="changed_added_4_0">This is a Key class that should be used to find JSF elements in {@link ComponentLibrary}</p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class Key implements Serializable { @@ -38,6 +36,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type */ public Key(String type) { @@ -46,6 +45,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ public String getType() { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/LibraryVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/LibraryVisitor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/LibraryVisitor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com * @param <R> return type * @param <P> optional parameter type. */ @@ -38,6 +36,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param c * @param param * @return Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Listener.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,22 +21,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") public class Listener implements ModelElement<Listener, Key> { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private final Key type; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Merge.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Merge.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Merge.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import java.lang.annotation.ElementType; @@ -33,8 +31,8 @@ /** * <p class="changed_added_4_0">Marker for model bean property that should be merged with other.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) @@ -43,6 +41,7 @@ /** * <p class="changed_added_4_0">If true, target value should be overwritten, otherwise only null values will bw replaced.</p> + * * @return */ boolean value() default true; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,29 +21,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; -import java.util.Collection; -import java.util.Iterator; - -import org.richfaces.cdk.CdkException; - import com.google.common.base.Predicate; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import org.richfaces.cdk.CdkException; +import java.util.Collection; +import java.util.Iterator; + /** * <p class="changed_added_4_0"> * Base class for all model collections. * </p> * * @author asmirnov(a)exadel.com - * */ public abstract class ModelCollection<E extends ModelElement<? super E, K>, K extends Key> - implements SearchableCollection<E, K>, Visitable, Mergeable<SearchableCollection<E, K>> { + implements SearchableCollection<E, K>, Visitable, Mergeable<SearchableCollection<E, K>> { private final BiMap<K, E> elementsMap = HashBiMap.create(); private final BiMap<E, K> reverseMap = elementsMap.inverse(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -3,4 +3,5 @@ import java.io.Serializable; public interface ModelElement<T extends ModelElement<T, K>, K extends Key> - extends Serializable, Mergeable<T>, Searchable<K>, Visitable {} + extends Serializable, Mergeable<T>, Searchable<K>, Visitable { +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -59,6 +59,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the extension */ @XmlElement(name = "component-extensions") Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Name.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Name.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Name.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import java.util.regex.Pattern; @@ -34,12 +32,11 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class Name { private static final Pattern NAME_PATTERN = Pattern.compile("^(?:(.+)\\.)?(?:(" + Classifier.component + "|" - + Classifier.renderkit + "|" + Classifier.event + "|" - + Classifier.taglib + ")\\.(?:([^\\.]+)\\.)?)?([^\\.]+)$"); + + Classifier.renderkit + "|" + Classifier.event + "|" + + Classifier.taglib + ")\\.(?:([^\\.]+)\\.)?)?([^\\.]+)$"); /** * <p class="changed_added_4_0"> @@ -75,27 +72,26 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public enum Classifier { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ component, /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ renderkit, /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ event, /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ taglib; } @@ -144,9 +140,10 @@ /** * <p class="changed_added_4_0">Utility method that composes library prefix from first elements of array</p> + * * @param prefix buffer that collects prefix. - * @param parts package name parts - * @param size size of prefix part of array. + * @param parts package name parts + * @param size size of prefix part of array. */ private static void fillPrefix(StringBuilder prefix, String[] parts, int size) { for (int i = 0; i < size; i++) { @@ -186,8 +183,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param prefix - * the prefix to set + * @param prefix the prefix to set */ public void setPrefix(String prefix) { this.prefix = prefix; @@ -207,8 +203,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param classifier - * the classifier to set + * @param classifier the classifier to set */ public void setClassifier(Classifier classifier) { this.classifier = classifier; @@ -228,8 +223,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param markup - * the markup to set + * @param markup the markup to set */ public void setMarkup(String markup) { this.markup = markup; @@ -249,8 +243,7 @@ * <p class="changed_added_4_0"> * </p> * - * @param simpleName - * the simpleName to set + * @param simpleName the simpleName to set */ public void setSimpleName(String simpleName) { this.simpleName = simpleName; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,24 +21,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +package org.richfaces.cdk.model; +import com.google.common.collect.Lists; -package org.richfaces.cdk.model; - import java.util.List; -import com.google.common.collect.Lists; - /** * <p class="changed_added_4_0">That class contains properties collection from standard include file.</p> + * * @author asmirnov(a)exadel.com - * */ public class Properties { private List<? extends Property> properties = Lists.newArrayList(); /** * <p class="changed_added_4_0"></p> + * * @return the properties */ public List<? extends Property> getProperties() { @@ -47,6 +46,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param properties the properties to set */ public void setProperties(List<? extends Property> properties) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import org.richfaces.cdk.CdkException; import java.util.List; @@ -33,14 +30,14 @@ /** * That class represents JSF component property. + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class Property extends ModelElementBase implements ModelElement<Property, Property.Name> { /** - * <p class="changed_added_4_0">Is that bean property generate in the class or should be generated ?</p> + * <p class="changed_added_4_0">Is that bean property generate in the class or should be generated ?</p> */ private boolean generate = false; private boolean hidden = false; @@ -54,7 +51,7 @@ private String defaultValue; /** - * <p class="changed_added_4_0">Bean property name of component attribute</p> + * <p class="changed_added_4_0">Bean property name of component attribute</p> */ private final Name name; private String suggestedValue; @@ -62,6 +59,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name */ public Property(Name name) { @@ -79,6 +77,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the name */ public Name getName() { @@ -87,6 +86,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ @Merge @@ -96,6 +96,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(ClassDescription type) { @@ -104,6 +105,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the defaultValue */ @Merge @@ -113,6 +115,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param defaultValue the defaultValue to set */ public void setDefaultValue(String dafaultValue) { @@ -121,6 +124,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the suggestedValue */ @Merge @@ -130,6 +134,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param suggestedValue the suggestedValue to set */ public void setSuggestedValue(String suggestedValue) { @@ -138,6 +143,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the generate */ @Merge @@ -147,6 +153,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param generate the generate to set */ public void setGenerate(boolean exists) { @@ -155,6 +162,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the eventNames */ @Merge @@ -164,6 +172,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param eventNames the eventNames to set */ public void setEventNames(Set<EventName> eventNames) { @@ -172,6 +181,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the hidden */ public boolean isHidden() { @@ -180,6 +190,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param hidden the hidden to set */ public void setHidden(boolean hidden) { @@ -188,6 +199,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the literal */ public boolean isLiteral() { @@ -196,6 +208,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param literal the literal to set */ public void setLiteral(boolean literal) { @@ -204,6 +217,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the required */ public boolean isRequired() { @@ -212,6 +226,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param required the required to set */ public void setRequired(boolean required) { @@ -220,6 +235,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param readOnly the readOnly to set */ public void setReadOnly(boolean readOnly) { @@ -228,6 +244,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the readOnly */ public boolean isReadOnly() { @@ -236,6 +253,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the passThrough */ public boolean isPassThrough() { @@ -244,6 +262,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param passThrough the passThrough to set */ public void setPassThrough(boolean passThrough) { @@ -252,6 +271,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the signature */ @Merge(true) @@ -261,6 +281,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param signature the signature to set */ public void setSignature(List<ClassDescription> signature) { @@ -269,6 +290,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the aliases */ public Set<String> getAliases() { @@ -277,6 +299,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param aliases the aliases to set */ public void setAliases(Set<String> aliases) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKit.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,25 +21,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; -import java.util.Collection; +import org.richfaces.cdk.CdkException; import javax.faces.render.RenderKitFactory; +import java.util.Collection; -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class RenderKit extends ModelElementBase implements ModelElement<RenderKit, RenderKit.Id> { private final SearchableCollection<Renderer, Renderer.Type> renderers = new ModelCollection<Renderer, - Renderer.Type>() { + Renderer.Type>() { @Override public Renderer create(Renderer.Type key) { Renderer renderer = new Renderer(key); @@ -73,6 +70,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the id */ public Id getId() { @@ -81,6 +79,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the renderKitClass */ @Merge @@ -90,6 +89,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param renderKitClass the renderKitClass to set */ public void setRenderKitClass(ClassDescription renderKitClass) { @@ -98,6 +98,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the renderers */ public Collection<Renderer> getRenderers() { @@ -106,6 +107,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the behaviorRenderers */ public SearchableCollection<BehaviorRenderer, BehaviorRenderer.Type> getBehaviorRenderers() { @@ -155,14 +157,15 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public static final class Id extends Key { /** * <p class="changed_added_4_0"></p> + * * @param id */ public Id(String type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Renderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; @@ -30,8 +28,8 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public class Renderer extends ModelElementBase implements ModelElement<Renderer, Renderer.Type> { @@ -39,9 +37,9 @@ private ClassDescription rendererClass; private Template template; private Type type; - + private boolean rendersChildren; - + private Tag tag; /** @@ -50,15 +48,16 @@ * </p> */ private final SearchableCollection<Attribute, Property.Name> attributes = new ModelCollection<Attribute, - Property.Name>() { + Property.Name>() { @Override public Attribute create(Property.Name key) { return new Attribute(key); } }; - - public Renderer() {} + public Renderer() { + } + public Renderer(Type type) { this.type = type; } @@ -73,6 +72,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(Type type) { @@ -85,6 +85,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the template */ @Merge @@ -94,6 +95,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param template the template to set */ public void setTemplate(Template template) { @@ -102,6 +104,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the family */ @Merge @@ -111,6 +114,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param family the family to set */ public void setFamily(String family) { @@ -119,6 +123,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the rendererClass */ public ClassDescription getRendererClass() { @@ -127,6 +132,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param rendererClass the rendererClass to set */ public void setRendererClass(ClassDescription rendererClass) { @@ -135,6 +141,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the rendersChildren */ public boolean isRendersChildren() { @@ -143,6 +150,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param rendersChildren the rendersChildren to set */ public void setRendersChildren(boolean rendersChildren) { @@ -151,6 +159,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the attributes */ public SearchableCollection<Attribute, Property.Name> getAttributes() { @@ -159,6 +168,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the tag */ public Tag getTag() { @@ -167,6 +177,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param tag the tag to set */ public void setTag(Tag tag) { @@ -185,8 +196,8 @@ /** * <p class="changed_added_4_0">Key for lookup renderer in the model.</p> + * * @author asmirnov(a)exadel.com - * */ @SuppressWarnings("serial") public static class Type extends Key { @@ -194,6 +205,7 @@ /** * <p class="changed_added_4_0"></p> * TODO - use family as part of key ? + * * @param type */ public Type(String type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SearchableCollection.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SearchableCollection.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SearchableCollection.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,22 +21,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import java.util.Collection; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public interface SearchableCollection<E extends Searchable, K extends Key> - extends Collection<E>, Visitable, Mergeable<SearchableCollection<E, K>> { + extends Collection<E>, Visitable, Mergeable<SearchableCollection<E, K>> { /** * <p class="changed_added_4_0">Find element in collection by Key</p> + * * @param key * @return element from collection for that key, null if no such element. */ @@ -44,6 +43,7 @@ /** * <p class="changed_added_4_0">Look for ilement in collection by key. If such element exists in collection, return that, otherwise create a new one.</p> + * * @param key * @return */ @@ -51,6 +51,7 @@ /** * <p class="changed_added_4_0">Factory method used to create a component instance.</p> + * * @param key * @return */ @@ -58,6 +59,7 @@ /** * <p class="changed_added_4_0">Return collection of all components keys.</p> + * * @return */ public Iterable<K> keys(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,46 +21,44 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; /** * <p class="changed_added_4_0">That bean represents VDL tag</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class Tag { /** - * <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p> - * TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener} + * <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p> + * TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener} */ private Searchable component; /** - * <p class="changed_added_4_0">Jsp tag class</p> + * <p class="changed_added_4_0">Jsp tag class</p> */ private String jspClass; /** - * <p class="changed_added_4_0">Tag library for which that tag is belong. - * This is bidirectional many to one relation.</p> + * <p class="changed_added_4_0">Tag library for which that tag is belong. + * This is bidirectional many to one relation.</p> */ private TagLibrary library; /** - * <p class="changed_added_4_0">Tag name</p> + * <p class="changed_added_4_0">Tag name</p> */ private String name; /** - * <p class="changed_added_4_0">Facelets VDL tag handler class.</p> + * <p class="changed_added_4_0">Facelets VDL tag handler class.</p> */ private String tagHandlerClass; /** - * <p class="changed_added_4_0">Facelets VDL tag handler base class for generation.</p> + * <p class="changed_added_4_0">Facelets VDL tag handler base class for generation.</p> */ private String tagHandlerSuperClass; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import java.util.ArrayList; @@ -30,18 +28,19 @@ /** * <p class="changed_added_4_0">That bean represents whole tag library.</p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class TagLibrary { /** - * <p class="changed_added_4_0">Collection of tags associated with that library</p> + * <p class="changed_added_4_0">Collection of tags associated with that library</p> */ private final List<Tag> tags = new ArrayList<Tag>(); /** * <p class="changed_added_4_0"></p> + * * @return the tags */ public List<Tag> getTags() { Modified: 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/Trackable.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Trackable.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -2,13 +2,14 @@ /** * <p class="changed_added_4_0">Interface for model components that have related modification time.</p> + * * @author asmirnov(a)exadel.com - * */ public interface Trackable { /** * <p class="changed_added_4_0">Last modification time for model information.</p> + * * @return */ public long lastModified(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Validator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,16 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.model; import org.richfaces.cdk.CdkException; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @SuppressWarnings("serial") public class Validator implements ModelElement<Validator, Key> { @@ -38,6 +36,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public Validator(Key type) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -6,6 +6,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param <R> * @param <P> * @param visitor Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/package-info.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/package-info.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -20,6 +20,6 @@ ) package org.richfaces.cdk.model; +import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAccessType; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/package-info.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/package-info.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,4 +1,3 @@ - /** * <h2>Public CDK API classes.</h2> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el; public final class ELNodeConstants { - - //operators + + //operators public static final String AND_OPERATOR = " && "; public static final String DIV_OPERATOR = " / "; public static final String EQUALITY_OPERATOR = " == "; @@ -40,13 +38,13 @@ public static final String OR_OPERATOR = " || "; public static final String PLUS_OPERATOR = " + "; // - + //constant values public static final String FALSE_VALUE = "false"; public static final String NULL_VALUE = "null"; public static final String TRUE_VALUE = "true"; // - + public static final String ARRAY_INDICATOR = "[L"; public static final String COLON = " : "; public static final String COMMA = ","; @@ -70,5 +68,6 @@ public static final String THIS_PREFIX = "this"; public static final String UTILS_PREFIX = "utils"; - private ELNodeConstants() {} + private ELNodeConstants() { + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el; +import org.jboss.el.parser.*; +import org.richfaces.cdk.parser.el.node.*; + import java.beans.BeanInfo; import java.beans.IndexedPropertyDescriptor; import java.beans.IntrospectionException; @@ -35,77 +36,27 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.el.parser.AstAnd; -import org.jboss.el.parser.AstBracketSuffix; -import org.jboss.el.parser.AstChoice; -import org.jboss.el.parser.AstDeferredExpression; -import org.jboss.el.parser.AstDiv; -import org.jboss.el.parser.AstDynamicExpression; -import org.jboss.el.parser.AstEmpty; -import org.jboss.el.parser.AstEqual; -import org.jboss.el.parser.AstFalse; -import org.jboss.el.parser.AstFloatingPoint; -import org.jboss.el.parser.AstFunction; -import org.jboss.el.parser.AstGreaterThan; -import org.jboss.el.parser.AstGreaterThanEqual; -import org.jboss.el.parser.AstIdentifier; -import org.jboss.el.parser.AstInteger; -import org.jboss.el.parser.AstLessThan; -import org.jboss.el.parser.AstLessThanEqual; -import org.jboss.el.parser.AstLiteralExpression; -import org.jboss.el.parser.AstMethodSuffix; -import org.jboss.el.parser.AstMinus; -import org.jboss.el.parser.AstMod; -import org.jboss.el.parser.AstMult; -import org.jboss.el.parser.AstNegative; -import org.jboss.el.parser.AstNot; -import org.jboss.el.parser.AstNotEqual; -import org.jboss.el.parser.AstNull; -import org.jboss.el.parser.AstOr; -import org.jboss.el.parser.AstPlus; -import org.jboss.el.parser.AstPropertySuffix; -import org.jboss.el.parser.AstString; -import org.jboss.el.parser.AstTrue; -import org.jboss.el.parser.AstValue; -import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.node.AstBracketSuffixTreeNode; -import org.richfaces.cdk.parser.el.node.AstChoiceTreeNode; -import org.richfaces.cdk.parser.el.node.AstDeferredOrDynamicExpressionTreeNode; -import org.richfaces.cdk.parser.el.node.AstEmptyTreeNode; -import org.richfaces.cdk.parser.el.node.AstFloatingPointTreeNode; -import org.richfaces.cdk.parser.el.node.AstFunctionTreeNode; -import org.richfaces.cdk.parser.el.node.AstIdentifierTreeNode; -import org.richfaces.cdk.parser.el.node.AstIntegerTreeNode; -import org.richfaces.cdk.parser.el.node.AstLiteralTreeNode; -import org.richfaces.cdk.parser.el.node.AstMethodSuffixTreeNode; -import org.richfaces.cdk.parser.el.node.AstNegativeTreeNode; -import org.richfaces.cdk.parser.el.node.AstNotTreeNode; -import org.richfaces.cdk.parser.el.node.AstPropertySuffixTreeNode; -import org.richfaces.cdk.parser.el.node.AstStringTreeNode; -import org.richfaces.cdk.parser.el.node.AstValueTreeNode; -import org.richfaces.cdk.parser.el.node.BinaryOperationTreeNode; -import org.richfaces.cdk.parser.el.node.ConstantValueTreeNode; -import org.richfaces.cdk.parser.el.node.ITreeNode; - /** * Class, that encapsulate all functionality, related to Reflection calls, such as loading classes, get property * descriptors etc... - * @author amarkhel * + * @author amarkhel */ public final class ELReflectionUtils { private static final Class<?>[] EMPTY_CLASS_PARAMETERS = new Class<?>[0]; private static Map<String, Map<String, PropertyDescriptor>> resolvedProperties = - new HashMap<String, Map<String, PropertyDescriptor>>(); + new HashMap<String, Map<String, PropertyDescriptor>>(); - private ELReflectionUtils() { } + private ELReflectionUtils() { + } /** * This method determine type of parsed node and create wrapper for them, that extends AbstractTreeNode. * If node type is not recognized - throws ParsingException. + * * @param child - parsed node - * @throws ParsingException - if node type is not recognized. * @return wrapper for parsed node(if node type is recognized), that implement ITreeNode interface. + * @throws ParsingException - if node type is not recognized. */ public static ITreeNode determineNodeType(Node child) throws ParsingException { ITreeNode treeNode = null; @@ -179,13 +130,14 @@ } //TODO: add support for closures - + return treeNode; } /** * This method return PropertyDescriptor by specified propertyName and clazz. - * @param clazz - class to search + * + * @param clazz - class to search * @param propertyName - propertyName to search * @return property descriptor if found. * @throws ParsingException if error occured. @@ -205,6 +157,7 @@ /** * This method resolve all properties of specified class. + * * @param clazz - class to resolve * @return Map<String, PropertyDescriptor>, populated by property descriptors. * @throws ParsingException if error occured. @@ -227,9 +180,10 @@ /** * This method load specified class. + * * @param className - class to load. - * @throws ClassNotFoundException if class not found. * @return loaded class. + * @throws ClassNotFoundException if class not found. */ private static Class<?> loadClass(Class<?> className) throws ClassNotFoundException { Class<?> clazz = null; @@ -253,9 +207,10 @@ /** * This method load class by specified representation of class name.. + * * @param className - string representation of class. - * @throws ClassNotFoundException if class not found. * @return loaded class. + * @throws ClassNotFoundException if class not found. */ private static Class<?> loadClass(String className) throws ClassNotFoundException { Class<?> clazz = null; @@ -277,14 +232,13 @@ * <p>Retrieve the property descriptors for the specified class, * introspecting and caching them the first time a particular bean class * is encountered.</p> - * + * <p/> * <p><strong>FIXME</strong> - Does not work with DynaBeans.</p> * * @param beanClass Bean class for which property descriptors are requested * @return the property descriptors - * @throws ParsingException if error occured. - * - * @exception IllegalArgumentException if <code>beanClass</code> is null + * @throws ParsingException if error occured. + * @throws IllegalArgumentException if <code>beanClass</code> is null */ private static PropertyDescriptor[] getPropertyDescriptors(Class<?> beanClass) throws ParsingException { if (beanClass == null) { @@ -313,11 +267,11 @@ if (descriptors[i] instanceof IndexedPropertyDescriptor) { IndexedPropertyDescriptor descriptor = (IndexedPropertyDescriptor) descriptors[i]; String propName = descriptor.getName().substring(0, 1).toUpperCase() - + descriptor.getName().substring(1); + + descriptor.getName().substring(1); if (descriptor.getReadMethod() == null) { String methodName = descriptor.getIndexedReadMethod() != null - ? descriptor.getIndexedReadMethod().getName() : "get" + propName; + ? descriptor.getIndexedReadMethod().getName() : "get" + propName; Method readMethod = getMatchingAccessibleMethod(beanClass, methodName, EMPTY_CLASS_PARAMETERS); if (readMethod != null) { @@ -341,20 +295,20 @@ * the given parameters. * In other words, it finds a method with the given name * that will take the parameters given.<p> - * + * <p/> * <p>This method is slightly undeterminstic since it loops * through methods names and return the first matching method.</p> - * + * <p/> * <p>This method is used by * {@link * #invokeMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}. - * + * <p/> * <p>This method can match primitive parameter by passing in wrapper classes. * For example, a <code>Boolean</code> will match a primitive <code>boolean</code> * parameter. * - * @param clazz find method in this class - * @param methodName find method with this name + * @param clazz find method in this class + * @param methodName find method with this name * @param parameterTypes find method with compatible parameters * @return The accessible method * @throws ParsingException if error occured. @@ -428,7 +382,7 @@ * reflection) that implements the specified Method. If no such method * can be found, return <code>null</code>.</p> * - * @param clazz The class of the object + * @param clazz The class of the object * @param method The method that we wish to call * @return The accessible method * @throws ParsingException if error occured. @@ -454,7 +408,7 @@ if (!method.getDeclaringClass().isAssignableFrom(clazz)) { throw new IllegalArgumentException(clazz.getName() + " is not assignable from " - + method.getDeclaringClass().getName()); + + method.getDeclaringClass().getName()); } } @@ -486,12 +440,12 @@ * reflection) by scanning through the superclasses. If no such method * can be found, return <code>null</code>.</p> * - * @param clazz Class to be checked - * @param methodName Method name of the method we wish to call + * @param clazz Class to be checked + * @param methodName Method name of the method we wish to call * @param parameterTypes The parameter type signatures */ private static Method getAccessibleMethodFromSuperclass(Class<?> clazz, String methodName, - Class<?>[] parameterTypes) { + Class<?>[] parameterTypes) { Class<?> parentClazz = clazz.getSuperclass(); while (parentClazz != null) { @@ -514,17 +468,17 @@ * reflection) that implements the specified method, by scanning through * all implemented interfaces and subinterfaces. If no such method * can be found, return <code>null</code>.</p> - * + * <p/> * <p> There isn't any good reason why this method must be private. * It is because there doesn't seem any reason why other classes should * call this rather than the higher level methods.</p> * - * @param clazz Parent class for the interfaces to be checked - * @param methodName Method name of the method we wish to call + * @param clazz Parent class for the interfaces to be checked + * @param methodName Method name of the method we wish to call * @param parameterTypes The parameter type signatures */ private static Method getAccessibleMethodFromInterfaceNest(Class<?> clazz, String methodName, - Class<?>[] parameterTypes) { + Class<?>[] parameterTypes) { Method method = null; // Search up the superclass chain @@ -576,7 +530,8 @@ /** * Returns the sum of the object transformation cost for each class in the source * argument list. - * @param srcArgs The source arguments + * + * @param srcArgs The source arguments * @param destArgs The destination arguments * @return The total transformation cost */ @@ -597,7 +552,8 @@ * Gets the number of steps required needed to turn the source class into the * destination class. This represents the number of steps in the object hierarchy * graph. - * @param srcClass The source class + * + * @param srcClass The source class * @param destClass The destination class * @return The cost of transforming an object */ @@ -634,7 +590,7 @@ /** * <p>Determine whether a type can be used as a parameter in a method invocation. * This method handles primitive conversions correctly.</p> - * + * <p/> * <p>In order words, it will match a <code>Boolean</code> to a <code>boolean</code>, * a <code>Long</code> to a <code>long</code>, * a <code>Float</code> to a <code>float</code>, @@ -643,9 +599,8 @@ * Now logic widening matches are allowed. * For example, a <code>Long</code> will not match a <code>int</code>. * - * @param parameterType the type of parameter accepted by the method + * @param parameterType the type of parameter accepted by the method * @param parameterization the type of parameter being tested - * * @return true if the assignement is compatible. */ private static boolean isAssignmentCompatible(Class<?> parameterType, Class<?> parameterization) { @@ -672,9 +627,10 @@ /** * Gets the wrapper object class for the given primitive type class. * For example, passing <code>boolean.class</code> returns <code>Boolean.class</code> + * * @param primitiveType the primitive type class for which a match is to be found * @return the wrapper type associated with the given primitive - * or null if no match is found + * or null if no match is found */ private static Class<?> getPrimitiveWrapper(Class<?> primitiveType) { @@ -702,6 +658,7 @@ /** * Try to make the method accessible + * * @param method The source arguments * @throws ParsingException if error occured during call setAccessible method. */ @@ -733,10 +690,11 @@ /** * Gets the name of read method for specified property name. + * * @param propertyName - property to lookup - * @param visitor - ELVisitor instance - * @throws ParsingException - if property not found or class not found. + * @param visitor - ELVisitor instance * @return String representation of read method of specified property. + * @throws ParsingException - if property not found or class not found. */ public static String getReadMethodName(String propertyName, ELVisitor visitor) throws ParsingException { try { @@ -745,7 +703,7 @@ if (propertyDescriptor == null) { throw new ParsingException("property: " + propertyName + " not found in class: " - + visitor.getLastVariableType()); + + visitor.getLastVariableType()); } Class<?> propertyType = propertyDescriptor.getPropertyType(); @@ -782,7 +740,7 @@ visitor.setCollectionVariableType(readMethod.getReturnType()); String className = visitor.getCollectionVariableType().getName().substring(0, - visitor.getCollectionVariableType().getName().length() - 1).substring(2); + visitor.getCollectionVariableType().getName().length() - 1).substring(2); visitor.setCollectionVariableType(loadClass(className)); } @@ -797,7 +755,6 @@ public void visit(Class<?> clazz) throws ParsingException; } - static class ClassWalkingLogic { private Class<?> clazz; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,21 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el; -import java.util.Map; - import org.jboss.el.parser.AstCompositeExpression; import org.jboss.el.parser.ELParser; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.node.ITreeNode; +import java.util.Map; + /** * Entry point for parsing EL expressions. @see parse() method. + * * @author amarkhel - * */ public final class ELVisitor { private static ELVisitor elVisitor; @@ -42,9 +40,10 @@ Class<?> lastVariableType = null; boolean useConversionToString; boolean useEmptinessCheck; - - private ELVisitor() {} + private ELVisitor() { + } + public static ELVisitor getInstance() { if (elVisitor == null) { elVisitor = new ELVisitor(); @@ -63,14 +62,14 @@ this.useConversionToString = needConversion; } - public boolean isUseEmptinessCheck() { - return useEmptinessCheck; - } - - public void setUseEmptinessCheck(boolean useCheckForEmpty) { - this.useEmptinessCheck = useCheckForEmpty; - } - + public boolean isUseEmptinessCheck() { + return useEmptinessCheck; + } + + public void setUseEmptinessCheck(boolean useCheckForEmpty) { + this.useEmptinessCheck = useCheckForEmpty; + } + public String getLastIndexValue() { return lastIndexValue; } @@ -97,6 +96,7 @@ /** * Parse specified EL expression and return Java code, that represent this expression + * * @param expression - expression to resolve * @param contextMap - Map<String, Class<?>> - context for search classes. * @return generated Java code. @@ -106,11 +106,11 @@ Node ret = ELParser.parse(expression); if (ret instanceof AstCompositeExpression && ret.jjtGetNumChildren() >= 2) { - //AstCompositeExpression with 2+ children is a mixed expression - this.setUseConversionToString(true); + //AstCompositeExpression with 2+ children is a mixed expression + this.setUseConversionToString(true); } - - return this.visit(ret, contextMap); + + return this.visit(ret, contextMap); } private String visit(Node node, Map<String, Class<?>> context) throws ParsingException { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,19 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el; /** * Parsing Exception - * @author amarkhel * + * @author amarkhel */ public class ParsingException extends Exception { private static final long serialVersionUID = 6045782920008419804L; - public ParsingException() {} + public ParsingException() { + } /** * @param message Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,66 +19,65 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el; import java.util.Locale; public final class StringUtils { - private StringUtils() {} + private StringUtils() { + } - private static String toCharExpression(char c) { - String prependingZeroesString; - String hexString = Integer.toHexString(c); - - switch (hexString.length()) { - case 1: - prependingZeroesString = "000"; - break; - case 2: - prependingZeroesString = "00"; - break; - case 3: - prependingZeroesString = "0"; - break; - case 4: - prependingZeroesString = ""; - break; - default: - throw new IllegalArgumentException(); - } - - return "\\u" + prependingZeroesString + hexString.toUpperCase(Locale.US); - } - - public static String getEscapedString(String s) { + private static String toCharExpression(char c) { + String prependingZeroesString; + String hexString = Integer.toHexString(c); + + switch (hexString.length()) { + case 1: + prependingZeroesString = "000"; + break; + case 2: + prependingZeroesString = "00"; + break; + case 3: + prependingZeroesString = "0"; + break; + case 4: + prependingZeroesString = ""; + break; + default: + throw new IllegalArgumentException(); + } + + return "\\u" + prependingZeroesString + hexString.toUpperCase(Locale.US); + } + + public static String getEscapedString(String s) { StringBuilder result = new StringBuilder(); char[] chars = s.toCharArray(); for (char c : chars) { - if (c == '\n') { + if (c == '\n') { result.append("\\n"); - } else if (c == '\r') { + } else if (c == '\r') { result.append("\\r"); - } else if (c == '\t') { + } else if (c == '\t') { result.append("\\t"); - } else if (c == '\f') { - result.append("\\f"); - } else if (c == '\b') { - result.append("\\b"); - } else if (c == '\\') { - result.append("\\\\"); - } else if (c == '"') { - result.append("\\\""); - } else { + } else if (c == '\f') { + result.append("\\f"); + } else if (c == '\b') { + result.append("\\b"); + } else if (c == '\\') { + result.append("\\\\"); + } else if (c == '"') { + result.append("\\\""); + } else { if (c < 0x20 || c > 0x7F) { result.append(toCharExpression(c)); } else { - result.append(c); + result.append(c); } - } + } } return result.toString(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELReflectionUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This abstract class implement some methods of ITreeNode interface to using in subclasses. * * @author amarkhel - * */ public abstract class AbstractTreeNode implements ITreeNode { private Node node; @@ -43,30 +39,30 @@ public AbstractTreeNode(Node node) { this.node = node; } - + /** - * Collects output from visiting child of the current node with the specified index and returns + * Collects output from visiting child of the current node with the specified index and returns * collected string. - * + * * @param childIndex * @param context * @param visitor * @return * @throws ParsingException */ - protected String getChildOutput(int childIndex, Map<String, Class<?>> context, - ELVisitor visitor) throws ParsingException { - - StringBuilder sb = new StringBuilder(); - getChild(childIndex).visit(sb, context, visitor); - - return sb.toString(); + protected String getChildOutput(int childIndex, Map<String, Class<?>> context, + ELVisitor visitor) throws ParsingException { + + StringBuilder sb = new StringBuilder(); + getChild(childIndex).visit(sb, context, visitor); + + return sb.toString(); } /** * Return node of current wrapper. - * @return instance of org.jboss.el.parser.Node * + * @return instance of org.jboss.el.parser.Node */ public Node getNode() { return node; @@ -74,12 +70,12 @@ /** * Visit current node. Generate Java code, that represent current node. + * * @param stringBuilder instance to collect information. - * @param context - context to resolve beans - * @param visitor - ELVisitor - * @throws ParsingException - if error occurred during parsing process. + * @param context - context to resolve beans + * @param visitor - ELVisitor * @return instance of org.jboss.el.parser.Node - * + * @throws ParsingException - if error occurred during parsing process. */ public ITreeNode getChild(int index) throws ParsingException { Node childNode = getNode().jjtGetChild(index); @@ -95,12 +91,12 @@ /** * Return child of wrapped node by specified index. Abstract operation to override in subclasses. + * * @param index - index of child. - * @throws ParsingException - if error occurred(child not found). * @return wrapper for child - * + * @throws ParsingException - if error occurred(child not found). */ public abstract void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException; - + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstBracketSuffix node. * * @author amarkhel - * */ public class AstBracketSuffixTreeNode extends AbstractTreeNode { public AstBracketSuffixTreeNode(Node node) { @@ -47,28 +43,28 @@ String suffixValue = getChildOutput(0, context, visitor); if (visitor.getLastVariableType() != null) { - if (visitor.getLastVariableType().getName().startsWith(ELNodeConstants.ARRAY_INDICATOR)) { - sb.append(ELNodeConstants.LEFT_SQUARE_BRACKET); - sb.append(suffixValue); - sb.append(ELNodeConstants.RIGHT_SQUARE_BRACKET); - visitor.setLastVariableType(visitor.getCollectionVariableType()); - } + if (visitor.getLastVariableType().getName().startsWith(ELNodeConstants.ARRAY_INDICATOR)) { + sb.append(ELNodeConstants.LEFT_SQUARE_BRACKET); + sb.append(suffixValue); + sb.append(ELNodeConstants.RIGHT_SQUARE_BRACKET); + visitor.setLastVariableType(visitor.getCollectionVariableType()); + } - if ((visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_LIST) == 0) - || (visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_MAP) == 0)) { - sb.append(ELNodeConstants.GET_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(suffixValue); - sb.append(ELNodeConstants.RIGHT_BRACKET); - visitor.setLastVariableType(visitor.getCollectionVariableType()); - } + if ((visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_LIST) == 0) + || (visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_MAP) == 0)) { + sb.append(ELNodeConstants.GET_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(suffixValue); + sb.append(ELNodeConstants.RIGHT_BRACKET); + visitor.setLastVariableType(visitor.getCollectionVariableType()); + } } else { - sb.append(ELNodeConstants.GET_ELEMENT_BY_INDEX_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(visitor.getLastIndexValue()); - sb.append(ELNodeConstants.COMMA); - sb.append(suffixValue); - sb.append(ELNodeConstants.RIGHT_BRACKET); + sb.append(ELNodeConstants.GET_ELEMENT_BY_INDEX_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(visitor.getLastIndexValue()); + sb.append(ELNodeConstants.COMMA); + sb.append(suffixValue); + sb.append(ELNodeConstants.RIGHT_BRACKET); } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstChoice node. * * @author amarkhel - * */ public class AstChoiceTreeNode extends AbstractTreeNode { public AstChoiceTreeNode(Node node) { @@ -50,13 +46,13 @@ String condition = getChildOutput(0, context, visitor); String correctConditionBranch = getChildOutput(1, context, visitor); String incorrectConditionBranch = getChildOutput(2, context, visitor); - + sb.append(condition); sb.append(ELNodeConstants.QUESTION_SIGN); sb.append(correctConditionBranch); sb.append(ELNodeConstants.COLON); sb.append(incorrectConditionBranch); - + sb.append(ELNodeConstants.RIGHT_BRACKET); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,27 +19,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstDeferredExpression node. * * @author amarkhel - * */ public class AstDeferredOrDynamicExpressionTreeNode extends AbstractTreeNode { - - public AstDeferredOrDynamicExpressionTreeNode(Node node) { + + public AstDeferredOrDynamicExpressionTreeNode(Node node) { super(node); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstEmpty node. * * @author amarkhel - * */ public class AstEmptyTreeNode extends AbstractTreeNode { public AstEmptyTreeNode(Node node) { @@ -45,8 +41,8 @@ @Override public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { visitor.setUseEmptinessCheck(true); - - StringBuilder sb1 = new StringBuilder(); + + StringBuilder sb1 = new StringBuilder(); ITreeNode treeNode = getChild(0); treeNode.visit(sb1, context, visitor); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,22 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstFloatingPoint node. * * @author amarkhel - * */ public class AstFloatingPointTreeNode extends AbstractTreeNode { public AstFloatingPointTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,24 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.AstFunction; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstFunction node. * * @author amarkhel - * */ public class AstFunctionTreeNode extends AbstractTreeNode { public AstFunctionTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,49 +19,45 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstIdentifier node. * * @author amarkhel - * */ public class AstIdentifierTreeNode extends AbstractTreeNode { - public AstIdentifierTreeNode(Node node) { - super(node); - } + public AstIdentifierTreeNode(Node node) { + super(node); + } - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - String variableName = getNode().getImage(); + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { + String variableName = getNode().getImage(); - if (context.containsKey(variableName)) { - visitor.setLastVariableType(context.get(variableName)); - sb.append(variableName); - } else { - //TODO - what's then? - if (variableName.equals(ELNodeConstants.THIS_PREFIX)) { - sb.append(variableName); - } else if (variableName.equals(ELNodeConstants.UTILS_PREFIX)) { - sb.append(ELNodeConstants.THIS_PREFIX); - sb.append(ELNodeConstants.DOT); - sb.append(ELNodeConstants.GET_UTILS_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(ELNodeConstants.RIGHT_BRACKET); - } else { + if (context.containsKey(variableName)) { + visitor.setLastVariableType(context.get(variableName)); + sb.append(variableName); + } else { + //TODO - what's then? + if (variableName.equals(ELNodeConstants.THIS_PREFIX)) { + sb.append(variableName); + } else if (variableName.equals(ELNodeConstants.UTILS_PREFIX)) { + sb.append(ELNodeConstants.THIS_PREFIX); + sb.append(ELNodeConstants.DOT); + sb.append(ELNodeConstants.GET_UTILS_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(ELNodeConstants.RIGHT_BRACKET); + } else { // throw new ParsingException("No instance found in context for identifier " + variableName); - } - } - } + } + } + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,22 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstInteger node. * * @author amarkhel - * */ public class AstIntegerTreeNode extends AbstractTreeNode { public AstIntegerTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,24 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.parser.el.StringUtils; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstLiteral node. * * @author amarkhel - * */ public class AstLiteralTreeNode extends AbstractTreeNode { public AstLiteralTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstMethodSuffix node. * * @author amarkhel - * */ public class AstMethodSuffixTreeNode extends AbstractTreeNode { public AstMethodSuffixTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstNegative node. * * @author amarkhel - * */ public class AstNegativeTreeNode extends AbstractTreeNode { public AstNegativeTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,23 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstNot node. * * @author amarkhel - * */ public class AstNotTreeNode extends AbstractTreeNode { public AstNotTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,24 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELReflectionUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstPropertySuffix node. * * @author amarkhel - * */ public class AstPropertySuffixTreeNode extends AbstractTreeNode { public AstPropertySuffixTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,12 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.AstString; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; @@ -32,11 +28,12 @@ import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.parser.el.StringUtils; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstString node. * * @author amarkhel - * */ public class AstStringTreeNode extends AbstractTreeNode { public AstStringTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,25 +19,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * This class extend AbstractTreeNode and wrap AstValue node. * * @author amarkhel - * */ public class AstValueTreeNode extends AbstractTreeNode { public AstValueTreeNode(Node node) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,49 +21,47 @@ */ package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * <p>Abstract class for all binary (having two operands) operation expression nodes</p> * <p>For operands <code>A</code> and <code>B</code> and operator <code>x</code> output is <code>(A x B)</code></p> - * + * * @author Nick Belaevski */ public class BinaryOperationTreeNode extends AbstractTreeNode { - private final String operatorString; + private final String operatorString; - public BinaryOperationTreeNode(Node node, String operatorString) { - super(node); + public BinaryOperationTreeNode(Node node, String operatorString) { + super(node); - this.operatorString = operatorString; - } + this.operatorString = operatorString; + } - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) - */ - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, - ELVisitor visitor) throws ParsingException { + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) + */ + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, + ELVisitor visitor) throws ParsingException { - sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(ELNodeConstants.LEFT_BRACKET); String firstChildOutput = getChildOutput(0, context, visitor); - String secondChildOutput = getChildOutput(1, context, visitor); + String secondChildOutput = getChildOutput(1, context, visitor); - sb.append(firstChildOutput); - sb.append(operatorString); - sb.append(secondChildOutput); - - sb.append(ELNodeConstants.RIGHT_BRACKET); - - } - - - + sb.append(firstChildOutput); + sb.append(operatorString); + sb.append(secondChildOutput); + + sb.append(ELNodeConstants.RIGHT_BRACKET); + + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,39 +21,39 @@ */ package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * @author Nick Belaevski - * */ -public class ConstantValueTreeNode extends AbstractTreeNode { +public final class ConstantValueTreeNode extends AbstractTreeNode { - private final String value; + public static final ConstantValueTreeNode NULL_NODE = new ConstantValueTreeNode(ELNodeConstants.NULL_VALUE); - public static final ConstantValueTreeNode NULL_NODE = new ConstantValueTreeNode(ELNodeConstants.NULL_VALUE); - - public static final ConstantValueTreeNode TRUE_NODE = new ConstantValueTreeNode(ELNodeConstants.TRUE_VALUE); - - public static final ConstantValueTreeNode FALSE_NODE = new ConstantValueTreeNode(ELNodeConstants.FALSE_VALUE); + public static final ConstantValueTreeNode TRUE_NODE = new ConstantValueTreeNode(ELNodeConstants.TRUE_VALUE); - private ConstantValueTreeNode(String value) { - super(null); - this.value = value; - } + public static final ConstantValueTreeNode FALSE_NODE = new ConstantValueTreeNode(ELNodeConstants.FALSE_VALUE); - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) - */ - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, - ELVisitor visitor) throws ParsingException { + private final String value; - sb.append(value); - } - + private ConstantValueTreeNode(String value) { + super(null); + this.value = value; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, + * org.richfaces.cdk.parser.el.ELVisitor) + */ + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, + ELVisitor visitor) throws ParsingException { + + sb.append(value); + } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,48 +19,45 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.util.Map; - import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import java.util.Map; + /** * Interface for all wrappers of org.jboss.el.parser.Node class. - * @author amarkhel * + * @author amarkhel */ public interface ITreeNode { /** * Return node of current wrapper. - * @return instance of org.jboss.el.parser.Node * + * @return instance of org.jboss.el.parser.Node */ Node getNode(); /** * Visit current node. Generate Java code, that represent current node. + * * @param stringBuilder instance to collect information. - * @param context - context to resolve beans - * @param visitor - ELVisitor - * @throws ParsingException - if error occurred during parsing process. + * @param context - context to resolve beans + * @param visitor - ELVisitor * @return instance of org.jboss.el.parser.Node - * + * @throws ParsingException - if error occurred during parsing process. */ void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException; /** * Return child of wrapped node by specified index + * * @param index - index of child. - * @throws ParsingException - if error occurred(child not found). * @return wrapper for child - * + * @throws ParsingException - if error occurred(child not found). */ ITreeNode getChild(int index) throws ParsingException; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -25,20 +25,19 @@ /** * @author Nick Belaevski - * */ public class AbstractTemplateMethodBodyStatement implements MethodBodyStatement { - private String templateName; - - protected AbstractTemplateMethodBodyStatement(String templateName) { - super(); - this.templateName = templateName; - } + private String templateName; - @Override - public String getCode(FreeMarkerRenderer renderer) { - return renderer.renderSnippet(templateName, this); - } + protected AbstractTemplateMethodBodyStatement(String templateName) { + super(); + this.templateName = templateName; + } + @Override + public String getCode(FreeMarkerRenderer renderer) { + return renderer.renderSnippet(templateName, this); + } + } Modified: 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/AbstractTemplateMethodBodyStatementsContainer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -25,20 +25,19 @@ /** * @author Nick Belaevski - * */ public class AbstractTemplateMethodBodyStatementsContainer extends MethodBodyStatementsContainer { - private String templateName; - - protected AbstractTemplateMethodBodyStatementsContainer(String templateName) { - super(); - this.templateName = templateName; - } + private String templateName; - @Override - public String getCode(FreeMarkerRenderer renderer) { - return renderer.renderSnippet(templateName, this); - } + protected AbstractTemplateMethodBodyStatementsContainer(String templateName) { + super(); + this.templateName = templateName; + } + @Override + public String getCode(FreeMarkerRenderer renderer) { + return renderer.renderSnippet(templateName, this); + } + } Modified: 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/ConversionToStringMethodBodyStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ConversionToStringMethodBodyStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,11 +23,10 @@ /** * @author Nick Belaevski - * */ public class ConversionToStringMethodBodyStatement extends AbstractTemplateMethodBodyStatement { - public ConversionToStringMethodBodyStatement() { - super("conversion-to-string-method"); - } + public ConversionToStringMethodBodyStatement() { + super("conversion-to-string-method"); + } } Modified: 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/DefineObjectStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,43 +23,42 @@ /** * @author Nick Belaevski - * */ public class DefineObjectStatement extends AbstractTemplateMethodBodyStatement { - private String type; - - private String name; - - private String initializationExpression; - - public DefineObjectStatement(String type, String name, String initializationExpression) { - super("define-object"); - - this.type = type; - this.name = name; - this.initializationExpression = initializationExpression != null ? initializationExpression : ""; - } + private String type; - /** - * @return the type - */ - public String getType() { - return type; - } + private String name; - /** - * @return the name - */ - public String getName() { - return name; - } + private String initializationExpression; - /** - * @return the initializationExpression - */ - public String getInitializationExpression() { - return initializationExpression; - } + public DefineObjectStatement(String type, String name, String initializationExpression) { + super("define-object"); + this.type = type; + this.name = name; + this.initializationExpression = initializationExpression != null ? initializationExpression : ""; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the initializationExpression + */ + public String getInitializationExpression() { + return initializationExpression; + } + } Modified: 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/EmptinessCheckingMethodBodyStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EmptinessCheckingMethodBodyStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,11 +23,10 @@ /** * @author Nick Belaevski - * */ public class EmptinessCheckingMethodBodyStatement extends AbstractTemplateMethodBodyStatement { - public EmptinessCheckingMethodBodyStatement() { - super("emptiness-check-method"); - } + public EmptinessCheckingMethodBodyStatement() { + super("emptiness-check-method"); + } } Modified: 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/EncodeMethodPrefaceStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EncodeMethodPrefaceStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,18 +21,16 @@ */ package org.richfaces.cdk.templatecompiler; - /** * @author Nick Belaevski - * */ public class EncodeMethodPrefaceStatement extends AbstractTemplateMethodBodyStatement { - /** - * @param templateName - */ - public EncodeMethodPrefaceStatement() { - super("encode-method-preface"); - } + /** + * @param templateName + */ + public EncodeMethodPrefaceStatement() { + super("encode-method-preface"); + } } Modified: 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/EndElementStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/EndElementStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -27,8 +27,8 @@ */ public class EndElementStatement extends StartElementStatement { - public EndElementStatement(String elementName) { - super("end-element", elementName); - } + public EndElementStatement(String elementName) { + super("end-element", elementName); + } } Modified: 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/ForEachStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ForEachStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,43 +23,42 @@ /** * @author Nick Belaevski - * */ public class ForEachStatement extends AbstractTemplateMethodBodyStatementsContainer { - private String itemsExpression; - - private String var; - - private String varType; - - public ForEachStatement(String itemsExpression, - String var, String varType) { - super("for-each"); - this.itemsExpression = itemsExpression; - this.var = var; - this.varType = varType; - } + private String itemsExpression; - /** - * @return the itemsExpression - */ - public String getItemsExpression() { - return itemsExpression; - } - - /** - * @return the var - */ - public String getVar() { - return var; - } - - /** - * @return the varType - */ - public String getVarType() { - return varType; - } + private String var; + private String varType; + + public ForEachStatement(String itemsExpression, + String var, String varType) { + super("for-each"); + this.itemsExpression = itemsExpression; + this.var = var; + this.varType = varType; + } + + /** + * @return the itemsExpression + */ + public String getItemsExpression() { + return itemsExpression; + } + + /** + * @return the var + */ + public String getVar() { + return var; + } + + /** + * @return the varType + */ + public String getVarType() { + return varType; + } + } Modified: 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/FreeMarkerRenderer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,14 +1,14 @@ package org.richfaces.cdk.templatecompiler; +import freemarker.template.TemplateException; + import java.io.IOException; import java.io.Writer; -import freemarker.template.TemplateException; - public interface FreeMarkerRenderer { public void writeSnippet(String templateName, Object object, Writer writer) - throws IOException, TemplateException; + throws IOException, TemplateException; public String renderSnippet(String templateName, Object object); Modified: 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/IfElseStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfElseStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,15 +21,14 @@ */ package org.richfaces.cdk.templatecompiler; - /** * @author Nick Belaevski * @since 4.0 */ public class IfElseStatement extends AbstractTemplateMethodBodyStatementsContainer { - public IfElseStatement() { - super("if-else"); - } + public IfElseStatement() { + super("if-else"); + } } Modified: 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/IfStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -24,15 +24,15 @@ import org.richfaces.builder.model.MethodBodyStatementsContainer; public final class IfStatement extends MethodBodyStatementsContainer { - - private String test; - public IfStatement(String test) { - super(); - this.test = test; - } + private String test; - public String getTest() { - return test; - } + public IfStatement(String test) { + super(); + this.test = test; + } + + public String getTest() { + return test; + } } \ No newline at end of file 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 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassConfiguration.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,31 +21,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.templatecompiler; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.HashMap; -import java.util.Map; - -import org.richfaces.cdk.CdkContext; - import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; -import freemarker.template.TemplateHashModel; -import freemarker.template.TemplateModel; -import freemarker.template.TemplateModelException; +import org.richfaces.cdk.CdkContext; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class JavaClassConfiguration extends Configuration implements FreeMarkerRenderer { private static final String TEMPLATES = "/META-INF/templates/java"; @@ -62,11 +56,12 @@ setObjectWrapper(new JavaClassModelWrapper(this)); // Add context variables - this.setSharedVariable("context", new BeanModel(context,new BeansWrapper())); + this.setSharedVariable("context", new BeanModel(context, new BeansWrapper())); } /** * <p class="changed_added_4_0"></p> + * * @return the context */ public CdkContext getContext() { @@ -86,18 +81,18 @@ rootMap.put("responseWriterVariable", RendererClassVisitor.RESPONSE_WRITER_VARIABLE); rootMap.put("clientIdVariable", RendererClassVisitor.CLIENT_ID_VARIABLE); rootMap.put("rendererUtilsVariable", RendererClassVisitor.RENDERER_UTILS_VARIABLE); - + t.process(rootMap, writer); } - + /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.FreeMarkerRenderer#renderSnippet(java.lang.String, java.lang.Object) - */ + * @see org.richfaces.cdk.templatecompiler.FreeMarkerRenderer#renderSnippet(java.lang.String, java.lang.Object) + */ public String renderSnippet(String templateName, Object object) { StringWriter writer = new StringWriter(); try { writeSnippet(templateName, object, writer); - + return writer.toString(); } catch (IOException e) { // TODO: handle exception Modified: 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/JavaClassModelWrapper.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,15 +1,10 @@ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatement; -import org.richfaces.cdk.freemarker.ComponentTemplateModel; -import org.richfaces.cdk.freemarker.PropertyModel; -import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.Property; - import freemarker.ext.beans.BeansWrapper; import freemarker.template.ObjectWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; +import org.richfaces.builder.model.MethodBodyStatement; public class JavaClassModelWrapper extends BeansWrapper implements ObjectWrapper { @@ -18,6 +13,7 @@ public JavaClassModelWrapper(JavaClassConfiguration configuration) { this.configuration = configuration; } + @Override public TemplateModel wrap(Object obj) throws TemplateModelException { @@ -32,8 +28,10 @@ return templateModel; } + /** * <p class="changed_added_4_0"></p> + * * @return the configuration */ public JavaClassConfiguration getConfiguration() { Modified: 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/MethodBodyTemplateModel.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,16 +23,15 @@ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatement; - import freemarker.ext.beans.BeanModel; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; +import org.richfaces.builder.model.MethodBodyStatement; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class MethodBodyTemplateModel extends BeanModel implements TemplateModel { @@ -41,6 +40,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param statement * @param javaClassModelWrapper */ @@ -49,12 +49,12 @@ this.statement = statement; this.modelWrapper = javaClassModelWrapper; } - + @Override public TemplateModel get(String key) throws TemplateModelException { - if("code".equals(key)){ + if ("code".equals(key)) { //TODO - ? - return modelWrapper.wrap(statement.getCode(modelWrapper.getConfiguration())); + return modelWrapper.wrap(statement.getCode(modelWrapper.getConfiguration())); } return super.get(key); } 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 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,10 +23,7 @@ package org.richfaces.cdk.templatecompiler; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; - +import freemarker.template.TemplateException; import org.richfaces.builder.model.JavaClass; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; @@ -37,14 +34,15 @@ import org.richfaces.cdk.model.Renderer; import org.richfaces.cdk.templatecompiler.model.Template; -import freemarker.template.TemplateException; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; /** * <p class="changed_added_4_0"> * </p> - * + * * @author asmirnov(a)exadel.com - * */ public class RendererClassGenerator implements CdkWriter { private CdkContext context; @@ -74,32 +72,33 @@ if (null != template) { // TODO - put real parameters. RendererClassVisitor visitor = new RendererClassVisitor( - template.getInterface(), context.getLoader()); + template.getInterface(), context.getLoader()); visitor.preProcess(); template.getImplementation().visit(visitor); visitor.postProcess(); JavaClass javaClass = visitor.getRendererClass(); String fullName = javaClass.getFullName(); File outFile = context.createOutputFile( - StandardOutputs.RENDERER_CLASSES, fullName.replace( - '.', '/') - + ".java", library.lastModified()); + StandardOutputs.RENDERER_CLASSES, fullName.replace( + '.', '/') + + ".java", library.lastModified()); if (null != outFile) { - PrintWriter outputWriter = null;; + PrintWriter outputWriter = null; + try { - outputWriter = new PrintWriter(outFile); - - JavaClassConfiguration cdkConfiguration = new JavaClassConfiguration(context); - cdkConfiguration.writeSnippet("class", javaClass, outputWriter); + outputWriter = new PrintWriter(outFile); + + JavaClassConfiguration cdkConfiguration = new JavaClassConfiguration(context); + cdkConfiguration.writeSnippet("class", javaClass, outputWriter); } catch (IOException e) { throw new CdkException(e); } catch (TemplateException e) { throw new CdkException(e); - } finally { - if (outputWriter != null) { - outputWriter.close(); - } + } finally { + if (outputWriter != null) { + outputWriter.close(); + } } } Modified: 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/RendererClassVisitor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,25 +23,7 @@ package org.richfaces.cdk.templatecompiler; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import javax.annotation.Generated; -import javax.faces.component.UIComponent; -import javax.faces.component.behavior.Behavior; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.convert.Converter; -import javax.xml.namespace.QName; - +import com.google.common.collect.Lists; import org.richfaces.builder.model.Argument; import org.richfaces.builder.model.JavaClass; import org.richfaces.builder.model.JavaMethod; @@ -65,78 +47,97 @@ import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.templatecompiler.model.TemplateVisitor; -import com.google.common.collect.Lists; +import javax.annotation.Generated; +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.Behavior; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.convert.Converter; +import javax.xml.namespace.QName; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class RendererClassVisitor implements TemplateVisitor { - /** - * - */ - static final String RESPONSE_WRITER_VARIABLE = "responseWriter"; - /** - * - */ - static final String COMPONENT_VARIABLE = "cc"; - /** - * - */ - static final String FACES_CONTEXT_VARIABLE = "facesContext"; - /** - * - */ - static final String CLIENT_ID_VARIABLE = "clientId"; - /** - * - */ - static final String RENDERER_UTILS_VARIABLE = "utils"; - - static final String RENDERER_UTILS_CLASS_NAME = "org.ajax4jsf.renderkit.RendererUtils"; - - private static final Set<String> DEFAULT_NAMESPACES = new HashSet<String>(); - - static { - DEFAULT_NAMESPACES.add("http://richfaces.org/xhtml-el"); - DEFAULT_NAMESPACES.add("http://www.w3.org/1999/xhtml"); - } + /** + * + */ + static final String RESPONSE_WRITER_VARIABLE = "responseWriter"; + /** + * + */ + static final String COMPONENT_VARIABLE = "cc"; + /** + * + */ + static final String FACES_CONTEXT_VARIABLE = "facesContext"; + /** + * + */ + static final String CLIENT_ID_VARIABLE = "clientId"; + /** + * + */ + static final String RENDERER_UTILS_VARIABLE = "utils"; - private static final String[] GUESS_PACKAGES; - - static { - Class<?>[] GUESS_PACKAGES_CLASSES = { - UIComponent.class, - Behavior.class, - Converter.class, - FacesContext.class, - Collection.class, - Object.class, - }; - - GUESS_PACKAGES = new String[GUESS_PACKAGES_CLASSES.length]; - int i = 0; - for (Class<?> guessPackageClass : GUESS_PACKAGES_CLASSES) { - GUESS_PACKAGES[i++] = guessPackageClass.getPackage().getName(); - } - } - + static final String RENDERER_UTILS_CLASS_NAME = "org.ajax4jsf.renderkit.RendererUtils"; + + private static final Set<String> DEFAULT_NAMESPACES = new HashSet<String>(); + + static { + DEFAULT_NAMESPACES.add("http://richfaces.org/xhtml-el"); + DEFAULT_NAMESPACES.add("http://www.w3.org/1999/xhtml"); + } + + private static final String[] GUESS_PACKAGES; + + static { + Class<?>[] guessPackagesClasses = { + UIComponent.class, + Behavior.class, + Converter.class, + FacesContext.class, + Collection.class, + Object.class, + }; + + GUESS_PACKAGES = new String[guessPackagesClasses.length]; + int i = 0; + for (Class<?> guessPackageClass : guessPackagesClasses) { + GUESS_PACKAGES[i++] = guessPackageClass.getPackage().getName(); + } + } + private static final Map<String, Set<String>> ELEMENTS_ATTRIBUTES; + + protected MethodBodyStatementsContainer currentStatement; + private JavaClass rendererClass; private CompositeInterface compositeInterface; - protected MethodBodyStatementsContainer currentStatement; private final LinkedList<MethodBodyStatementsContainer> statements = Lists.newLinkedList(); private Map<String, Class<?>> localsTypesMap; - private ClassLoader classLoader; - private boolean isAddedMethodForConversionToString; - private boolean isAddedMethodForCheckingEmptiness; - + private ClassLoader classLoader; + private boolean isAddedMethodForConversionToString; + private boolean isAddedMethodForCheckingEmptiness; + static { - InputStream serializedAttributesStream = RendererClassVisitor.class.getResourceAsStream("/META-INF/schema/attributes.ser"); + InputStream serializedAttributesStream = + RendererClassVisitor.class.getResourceAsStream("/META-INF/schema/attributes.ser"); try { @@ -157,79 +158,84 @@ } } } - - private void initializeJavaClass() { - this.rendererClass = createJavaClassByName(compositeInterface.getJavaClass()); - this.rendererClass.addModifier(JavaModifier.PUBLIC); + + public RendererClassVisitor(CompositeInterface compositeInterface, ClassLoader classLoader) { + this.compositeInterface = compositeInterface; + this.classLoader = classLoader; + } + + private void initializeJavaClass() { + this.rendererClass = createJavaClassByName(compositeInterface.getJavaClass()); + this.rendererClass.addModifier(JavaModifier.PUBLIC); this.rendererClass.setSuperClass(createJavaClassByName(compositeInterface.getBaseClass())); this.rendererClass.addImport(FacesContext.class); - this.rendererClass.addImport(ResponseWriter.class); + this.rendererClass.addImport(ResponseWriter.class); this.rendererClass.addImport(UIComponent.class); - this.rendererClass.addImport(RENDERER_UTILS_CLASS_NAME); + this.rendererClass.addImport(RENDERER_UTILS_CLASS_NAME); - this.rendererClass.addAnnotation(Generated.class, "\"RichFaces CDK\""); - //TODO remove this after improving Java model - this.rendererClass.addImport(Generated.class); - + this.rendererClass.addAnnotation(Generated.class, "\"RichFaces CDK\""); + //TODO remove this after improving Java model + this.rendererClass.addImport(Generated.class); + this.createMethodContext(); - } + } private void addMethodForConversionToString() { - if (!isAddedMethodForConversionToString) { - isAddedMethodForConversionToString = true; - - JavaMethod conversionMethod = new JavaMethod("convertToString", String.class, - new Argument("object", Object.class)); - - conversionMethod.addModifier(JavaModifier.PRIVATE); - conversionMethod.addModifier(JavaModifier.FINAL); + if (!isAddedMethodForConversionToString) { + isAddedMethodForConversionToString = true; - MethodBody conversionMethodBody = new MethodBody(conversionMethod); - conversionMethod.setMethodBody(conversionMethodBody); - conversionMethodBody.addStatement(new ConversionToStringMethodBodyStatement()); - - rendererClass.addMethod(conversionMethod); - } + JavaMethod conversionMethod = new JavaMethod("convertToString", String.class, + new Argument("object", Object.class)); + + conversionMethod.addModifier(JavaModifier.PRIVATE); + conversionMethod.addModifier(JavaModifier.FINAL); + + MethodBody conversionMethodBody = new MethodBody(conversionMethod); + conversionMethod.setMethodBody(conversionMethodBody); + conversionMethodBody.addStatement(new ConversionToStringMethodBodyStatement()); + + rendererClass.addMethod(conversionMethod); + } } private void addMethodForCheckingEmptiness() { - if (!isAddedMethodForCheckingEmptiness) { - isAddedMethodForCheckingEmptiness = true; + if (!isAddedMethodForCheckingEmptiness) { + isAddedMethodForCheckingEmptiness = true; - JavaMethod checkingMethod = new JavaMethod("isEmpty", boolean.class, - new Argument("object", Object.class)); - - checkingMethod.addModifier(JavaModifier.PRIVATE); - checkingMethod.addModifier(JavaModifier.FINAL); + JavaMethod checkingMethod = new JavaMethod("isEmpty", boolean.class, + new Argument("object", Object.class)); - MethodBody checkingMethodBody = new MethodBody(checkingMethod); - checkingMethod.setMethodBody(checkingMethodBody); - checkingMethodBody.addStatement(new EmptinessCheckingMethodBodyStatement()); - - rendererClass.addMethod(checkingMethod); - } + checkingMethod.addModifier(JavaModifier.PRIVATE); + checkingMethod.addModifier(JavaModifier.FINAL); + + MethodBody checkingMethodBody = new MethodBody(checkingMethod); + checkingMethod.setMethodBody(checkingMethodBody); + checkingMethodBody.addStatement(new EmptinessCheckingMethodBodyStatement()); + + rendererClass.addMethod(checkingMethod); + } } - + private String compileEl(String expression, Class<?> type) { - try { - ELVisitor elVisitor = ELVisitor.getInstance(); - String parsedExpression = elVisitor.parse(expression, localsTypesMap); - - if (elVisitor.isUseConversionToString()) { - addMethodForConversionToString(); - } - - if (elVisitor.isUseEmptinessCheck()) { - addMethodForCheckingEmptiness(); - } - - return parsedExpression + "/* " + expression.trim() + " */"; - } catch (ParsingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException(e.getMessage()); - } + try { + ELVisitor elVisitor = ELVisitor.getInstance(); + String parsedExpression = elVisitor.parse(expression, localsTypesMap); + + if (elVisitor.isUseConversionToString()) { + addMethodForConversionToString(); + } + + if (elVisitor.isUseEmptinessCheck()) { + addMethodForCheckingEmptiness(); + } + + return parsedExpression + "/* " + expression.trim() + " */"; + } catch (ParsingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + throw new RuntimeException(e.getMessage()); + } // // if (Boolean.class.isAssignableFrom(type)) { // //TODO just a stub! @@ -238,59 +244,59 @@ // // return quote(expression) + " /* " + expression.trim() + " */"; } - - private String getElExpressionContainerType(String value) { - // TODO Auto-generated method stub - return Object.class.getName(); - } - private String getElExpressionType(String value) { - // TODO Auto-generated method stub - return String.class.getName(); - } - + private String getElExpressionContainerType(String value) { + // TODO Auto-generated method stub + return Object.class.getName(); + } + + private String getElExpressionType(String value) { + // TODO Auto-generated method stub + return String.class.getName(); + } + private boolean isDefaultNamespace(String namespaceURI) { - //TODO - another namespaces - if (namespaceURI == null || namespaceURI.length() == 0) { - return true; - } - - if (DEFAULT_NAMESPACES.contains(namespaceURI)) { - return true; - } - - return false; + //TODO - another namespaces + if (namespaceURI == null || namespaceURI.length() == 0) { + return true; + } + + if (DEFAULT_NAMESPACES.contains(namespaceURI)) { + return true; + } + + return false; } private void createMethodContext() { - this.currentStatement = new MethodBody(); - this.localsTypesMap = new HashMap<String, Class<?>>(); - localsTypesMap.put(FACES_CONTEXT_VARIABLE, FacesContext.class); - localsTypesMap.put(RESPONSE_WRITER_VARIABLE, ResponseWriter.class); - localsTypesMap.put(COMPONENT_VARIABLE, UIComponent.class); - localsTypesMap.put(CLIENT_ID_VARIABLE, String.class); + this.currentStatement = new MethodBody(); + this.localsTypesMap = new HashMap<String, Class<?>>(); + localsTypesMap.put(FACES_CONTEXT_VARIABLE, FacesContext.class); + localsTypesMap.put(RESPONSE_WRITER_VARIABLE, ResponseWriter.class); + localsTypesMap.put(COMPONENT_VARIABLE, UIComponent.class); + localsTypesMap.put(CLIENT_ID_VARIABLE, String.class); } - + private void flushToEncodeMethod(String encodeMethodName) { - if (!this.currentStatement.isEmpty()) { - Argument facesContextArgument = new Argument(FACES_CONTEXT_VARIABLE, FacesContext.class); - Argument componentArgument = new Argument(COMPONENT_VARIABLE, UIComponent.class); - - JavaMethod javaMethod = new JavaMethod(encodeMethodName, facesContextArgument, componentArgument); - javaMethod.addModifier(JavaModifier.PUBLIC); - javaMethod.addAnnotation(Override.class); - javaMethod.getExceptions().add(IOException.class); - - MethodBody methodBody = (MethodBody) currentStatement; - javaMethod.setMethodBody(methodBody); - - methodBody.addStatement(0, new EncodeMethodPrefaceStatement()); - rendererClass.addMethod(javaMethod); - } + if (!this.currentStatement.isEmpty()) { + Argument facesContextArgument = new Argument(FACES_CONTEXT_VARIABLE, FacesContext.class); + Argument componentArgument = new Argument(COMPONENT_VARIABLE, UIComponent.class); - createMethodContext(); + JavaMethod javaMethod = new JavaMethod(encodeMethodName, facesContextArgument, componentArgument); + javaMethod.addModifier(JavaModifier.PUBLIC); + javaMethod.addAnnotation(Override.class); + javaMethod.getExceptions().add(IOException.class); + + MethodBody methodBody = (MethodBody) currentStatement; + javaMethod.setMethodBody(methodBody); + + methodBody.addStatement(0, new EncodeMethodPrefaceStatement()); + rendererClass.addMethod(javaMethod); + } + + createMethodContext(); } - + private JavaClass createJavaClassByName(String fullName) { String simpleName = null; String packageName = ""; @@ -305,143 +311,142 @@ return new JavaClass(simpleName, new JavaPackage(packageName)); } - - private Class<?> getClasByObjectTypeByName(String type) { - Class<?> result = null; - - int dotIndex = type.indexOf('.'); - if (dotIndex < 0) { - //guess type - for (String guessPackage : GUESS_PACKAGES) { - try { - result = classLoader.loadClass(guessPackage + "." + type); - break; - } catch (ClassNotFoundException e) { - //ignore - } - } - } - - if (result == null) { - try { - classLoader.loadClass(type); - } catch (ClassNotFoundException e) { - //ignore - } - } - if (result == null) { - result = Object.class; - } + private Class<?> getClasByObjectTypeByName(String type) { + Class<?> result = null; - return result; - } + int dotIndex = type.indexOf('.'); + if (dotIndex < 0) { + //guess type + for (String guessPackage : GUESS_PACKAGES) { + try { + result = classLoader.loadClass(guessPackage + "." + type); + break; + } catch (ClassNotFoundException e) { + //ignore + } + } + } - private void defineObject(String type, String name, String initializationExpression) { - currentStatement.addStatement(new DefineObjectStatement(type, name, initializationExpression)); - localsTypesMap.put(name, getClasByObjectTypeByName(type)); - } - + if (result == null) { + try { + classLoader.loadClass(type); + } catch (ClassNotFoundException e) { + //ignore + } + } + if (result == null) { + result = Object.class; + } + + return result; + } + + private void defineObject(String type, String name, String initializationExpression) { + currentStatement.addStatement(new DefineObjectStatement(type, name, initializationExpression)); + localsTypesMap.put(name, getClasByObjectTypeByName(type)); + } + protected void pushStatement(MethodBodyStatementsContainer container) { - currentStatement.addStatement(container); - statements.push(currentStatement); - currentStatement = container; + currentStatement.addStatement(container); + statements.push(currentStatement); + currentStatement = container; } - + protected void popStatement() { - currentStatement = statements.pop(); + currentStatement = statements.pop(); } - public RendererClassVisitor(CompositeInterface compositeInterface, ClassLoader classLoader) { - this.compositeInterface = compositeInterface; - this.classLoader = classLoader; - } - /** * <p class="changed_added_4_0"></p> + * * @return the rendererClass */ public JavaClass getRendererClass() { return this.rendererClass; } - + /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.CdkBodyElement) - */ + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement( + * org.richfaces.cdk.templatecompiler.model.CdkBodyElement) + */ @Override public void startElement(CdkBodyElement cdkBodyElement) throws CdkException { - flushToEncodeMethod("encodeBegin"); + flushToEncodeMethod("encodeBegin"); } /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.CdkBodyElement) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement( + * org.richfaces.cdk.templatecompiler.model.CdkBodyElement) */ @Override public void endElement(CdkBodyElement cdkBodyElement) throws CdkException { - flushToEncodeMethod("encodeChildren"); + flushToEncodeMethod("encodeChildren"); } /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.AnyElement) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement( + * org.richfaces.cdk.templatecompiler.model.AnyElement) */ @Override public void startElement(AnyElement anyElement) throws CdkException { QName elementName = anyElement.getName(); Map<QName, Object> elementAttributes = anyElement.getAttributes(); - + if (!isDefaultNamespace(elementName.getNamespaceURI())) { - //TODO: add support + //TODO: add support } - + currentStatement.addStatement(new StartElementStatement(elementName.getLocalPart())); - + if (elementAttributes != null) { for (Map.Entry<QName, Object> attribute : elementAttributes.entrySet()) { - QName attributeName = attribute.getKey(); - Object attributeValue = attribute.getValue(); - - if (!isDefaultNamespace(attributeName.getNamespaceURI())) { - //TODO: add support - - //TODO: optimize batch attributes encoding - if (Template.CDK_NAMESPACE.equals(attributeName.getNamespaceURI()) && - "passThroughWithExclusions".equals(attributeName.getLocalPart())) { - - //TODO check element namespace - Set<String> attributeSet = ELEMENTS_ATTRIBUTES.get(elementName.getLocalPart()); - if (attributeSet != null) { - //make a copy of original set - TreeSet<String> actualAttributesSet = new TreeSet<String>(attributeSet); - - if (attributeValue != null) { - String[] exclusions = attributeValue.toString().split("\\s+"); - for (String exclusion : exclusions) { - actualAttributesSet.remove(exclusion); - } - } - - if (!actualAttributesSet.isEmpty()) { - currentStatement.addStatement(new WriteAttributesSetStatement(actualAttributesSet)); - } - } - } - - //TODO: cdk:passThrough + QName attributeName = attribute.getKey(); + Object attributeValue = attribute.getValue(); + + if (!isDefaultNamespace(attributeName.getNamespaceURI())) { + //TODO: add support + + //TODO: optimize batch attributes encoding + if (Template.CDK_NAMESPACE.equals(attributeName.getNamespaceURI()) + && "passThroughWithExclusions".equals(attributeName.getLocalPart())) { + + //TODO check element namespace + Set<String> attributeSet = ELEMENTS_ATTRIBUTES.get(elementName.getLocalPart()); + if (attributeSet != null) { + //make a copy of original set + TreeSet<String> actualAttributesSet = new TreeSet<String>(attributeSet); + + if (attributeValue != null) { + String[] exclusions = attributeValue.toString().split("\\s+"); + for (String exclusion : exclusions) { + actualAttributesSet.remove(exclusion); + } + } + + if (!actualAttributesSet.isEmpty()) { + currentStatement.addStatement(new WriteAttributesSetStatement(actualAttributesSet)); + } + } + } + + //TODO: cdk:passThrough } else { - currentStatement.addStatement(new WriteAttributeStatement(attributeName.getLocalPart(), - compileEl(attributeValue.toString(), String.class))); + currentStatement.addStatement(new WriteAttributeStatement(attributeName.getLocalPart(), + compileEl(attributeValue.toString(), String.class))); } - } + } } } /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.AnyElement) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler + * .model.AnyElement) */ @Override public void endElement(AnyElement anyElement) throws CdkException { - QName elementName = anyElement.getName(); + QName elementName = anyElement.getName(); currentStatement.addStatement(new EndElementStatement(elementName.getLocalPart())); } @@ -450,148 +455,160 @@ */ @Override public void visitElement(String text) throws CdkException { - if (text != null) { - String trimmedText = text.trim(); - if (trimmedText.length() != 0) { - currentStatement.addStatement(new WriteTextStatement(compileEl(trimmedText, String.class))); - } - } + if (text != null) { + String trimmedText = text.trim(); + if (trimmedText.length() != 0) { + currentStatement.addStatement(new WriteTextStatement(compileEl(trimmedText, String.class))); + } + } } /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#visitElement(org.richfaces.cdk.templatecompiler.model.CdkCallElement) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#visitElement(org.richfaces.cdk.templatecompiler + * .model.CdkCallElement) */ @Override public void visitElement(CdkCallElement cdkCallElement) throws CdkException { - currentStatement.addStatement(cdkCallElement.getExpression() + ";"); + currentStatement.addStatement(cdkCallElement.getExpression() + ";"); } /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.CdkIfElement) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler + * .model.CdkIfElement) */ - @Override - public void startElement(CdkIfElement cdkIfElement) { - String compiledTestExpression = compileEl(cdkIfElement.getTest(), Boolean.class); - - pushStatement(new IfElseStatement()); - pushStatement(new IfStatement(compiledTestExpression)); - } + @Override + public void startElement(CdkIfElement cdkIfElement) { + String compiledTestExpression = compileEl(cdkIfElement.getTest(), Boolean.class); - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.CdkIfElement) - */ - @Override - public void endElement(CdkIfElement cdkIfElement) { - popStatement(); - popStatement(); - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.CdkChooseElement) - */ - @Override - public void startElement(CdkChooseElement cdkChooseElement) { - pushStatement(new IfElseStatement()); - } + pushStatement(new IfElseStatement()); + pushStatement(new IfStatement(compiledTestExpression)); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.CdkChooseElement) - */ - @Override - public void endElement(CdkChooseElement cdkChooseElement) { - popStatement(); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler + * .model.CdkIfElement) + */ + @Override + public void endElement(CdkIfElement cdkIfElement) { + popStatement(); + popStatement(); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.CdkWhenElement) - */ - @Override - public void startElement(CdkWhenElement cdkWhenElement) { - String compiledTestExpression = compileEl(cdkWhenElement.getTest(), Boolean.class); - - pushStatement(new IfStatement(compiledTestExpression)); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler + * .model.CdkChooseElement) + */ + @Override + public void startElement(CdkChooseElement cdkChooseElement) { + pushStatement(new IfElseStatement()); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.CdkWhenElement) - */ - @Override - public void endElement(CdkWhenElement cdkWhenElement) { - popStatement(); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler + * .model.CdkChooseElement) + */ + @Override + public void endElement(CdkChooseElement cdkChooseElement) { + popStatement(); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.CdkOtherwiseElement) - */ - @Override - public void startElement(CdkOtherwiseElement cdkOtherwiseElement) { - pushStatement(new IfStatement("")); - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.CdkOtherwiseElement) - */ - @Override - public void endElement(CdkOtherwiseElement cdkOtherwiseElement) { - popStatement(); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler + * .model.CdkWhenElement) + */ + @Override + public void startElement(CdkWhenElement cdkWhenElement) { + String compiledTestExpression = compileEl(cdkWhenElement.getTest(), Boolean.class); - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#visitElement(org.richfaces.cdk.templatecompiler.model.CdkObjectElement) - */ - @Override - public void visitElement(CdkObjectElement cdkObjectElement) { - String name = cdkObjectElement.getName(); - - String value = cdkObjectElement.getValue(); - if (value == null || value.length() == 0) { - value = cdkObjectElement.getBodyValue(); - } - - String type = cdkObjectElement.getType(); + pushStatement(new IfStatement(compiledTestExpression)); + } - if (value != null && value.length() != 0) { - if (type == null || type.length() == 0) { - type = getElExpressionType(value); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler + * .model.CdkWhenElement) + */ + @Override + public void endElement(CdkWhenElement cdkWhenElement) { + popStatement(); + } - value = compileEl(value, Object.class); - } - - defineObject(type, name, value); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler + * .model.CdkOtherwiseElement) + */ + @Override + public void startElement(CdkOtherwiseElement cdkOtherwiseElement) { + pushStatement(new IfStatement("")); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler.model.CdkForEachElement) - */ - @Override - public void startElement(CdkForEachElement cdkForEachElement) { - String items = cdkForEachElement.getItems(); - String itemsExpression = compileEl(items, Iterable.class); - pushStatement(new ForEachStatement(itemsExpression, cdkForEachElement.getVar(), - getElExpressionContainerType(items))); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler + * .model.CdkOtherwiseElement) + */ + @Override + public void endElement(CdkOtherwiseElement cdkOtherwiseElement) { + popStatement(); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler.model.CdkForEachElement) - */ - @Override - public void endElement(CdkForEachElement cdkForEachElement) { - popStatement(); - } + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#visitElement(org.richfaces.cdk.templatecompiler + * .model.CdkObjectElement) + */ + @Override + public void visitElement(CdkObjectElement cdkObjectElement) { + String name = cdkObjectElement.getName(); - /** - * - */ - public void preProcess() { + String value = cdkObjectElement.getValue(); + if (value == null || value.length() == 0) { + value = cdkObjectElement.getBodyValue(); + } + + String type = cdkObjectElement.getType(); + + if (value != null && value.length() != 0) { + if (type == null || type.length() == 0) { + type = getElExpressionType(value); + } + + value = compileEl(value, Object.class); + } + + defineObject(type, name, value); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#startElement(org.richfaces.cdk.templatecompiler + * .model.CdkForEachElement) + */ + @Override + public void startElement(CdkForEachElement cdkForEachElement) { + String items = cdkForEachElement.getItems(); + String itemsExpression = compileEl(items, Iterable.class); + pushStatement(new ForEachStatement(itemsExpression, cdkForEachElement.getVar(), + getElExpressionContainerType(items))); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#endElement(org.richfaces.cdk.templatecompiler + * .model.CdkForEachElement) + */ + @Override + public void endElement(CdkForEachElement cdkForEachElement) { + popStatement(); + } + + /** + * + */ + public void preProcess() { initializeJavaClass(); - } + } - /** - * - */ - public void postProcess() { - flushToEncodeMethod("encodeEnd"); - } + /** + * + */ + public void postProcess() { + flushToEncodeMethod("encodeEnd"); + } } 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 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,12 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.templatecompiler; -import java.io.File; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.ModelBuilder; @@ -40,10 +36,12 @@ import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import java.io.File; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class RendererTemplateParser implements ModelBuilder { private CdkContext context; @@ -58,35 +56,35 @@ ComponentLibrary library = new ComponentLibrary(); for (File file : getContext().getSources(StandardSources.RENDERER_TEMPLATES)) { - try { - Template template = parseTemplate(file); - CompositeInterface compositeInterface = template.getInterface(); - // TODO - infer values ? - RenderKit renderKit = library.findOrCreateRenderKit(compositeInterface.getRenderKitId()); - Renderer renderer = renderKit.findOrCreateRenderer(compositeInterface.getRendererType()); - String componentType = compositeInterface.getComponentType(); +// try { + Template template = parseTemplate(file); + CompositeInterface compositeInterface = template.getInterface(); + // TODO - infer values ? + RenderKit renderKit = library.findOrCreateRenderKit(compositeInterface.getRenderKitId()); + Renderer renderer = renderKit.findOrCreateRenderer(compositeInterface.getRendererType()); + String componentType = compositeInterface.getComponentType(); - if (null != componentType) { - Component component = library.findOrCreateComponent(componentType); + if (null != componentType) { + Component component = library.findOrCreateComponent(componentType); - component.getRenderers().add(renderer); - } + component.getRenderers().add(renderer); + } - String family = compositeInterface.getComponentFamily(); + String family = compositeInterface.getComponentFamily(); - if (null != family) { - renderer.setFamily(family); - } - - renderer.setRendererClass(new ClassDescription(compositeInterface.getJavaClass())); - renderer.setTemplate(template); + if (null != family) { + renderer.setFamily(family); + } + + renderer.setRendererClass(new ClassDescription(compositeInterface.getJavaClass())); + renderer.setTemplate(template); // } catch (FileNotFoundException e) { // throw new CdkException(e); // } catch (XMLStreamException e) { // throw new CdkException(e); - } finally { - - } +// } finally { +// +// } } return library; Modified: 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/StartElementStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/StartElementStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,29 +21,28 @@ */ package org.richfaces.cdk.templatecompiler; - /** * @author Nick Belaevski * @since 4.0 */ public class StartElementStatement extends AbstractTemplateMethodBodyStatement { - private String elementName; - - public StartElementStatement(String elementName) { - this("start-element", elementName); - } + private String elementName; - protected StartElementStatement(String templateName, String elementName) { - super(templateName); - this.elementName = elementName; - } + public StartElementStatement(String elementName) { + this("start-element", elementName); + } - /** - * @return the elementName - */ - public String getElementName() { - return elementName; - } + protected StartElementStatement(String templateName, String elementName) { + super(templateName); + this.elementName = elementName; + } + /** + * @return the elementName + */ + public String getElementName() { + return elementName; + } + } Modified: 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/WriteAttributeStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteAttributeStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,29 +21,27 @@ */ package org.richfaces.cdk.templatecompiler; - /** * @author Nick Belaevski - * */ public class WriteAttributeStatement extends AbstractTemplateMethodBodyStatement { - private String attributeName; - - private String valueExpression; + private String attributeName; - public WriteAttributeStatement(String attributeName, String valueExpression) { - super("write-attribute"); - this.attributeName = attributeName; - this.valueExpression = valueExpression; - } - - public String getAttributeName() { - return attributeName; - } - - public String getValueExpression() { - return valueExpression; - } - + private String valueExpression; + + public WriteAttributeStatement(String attributeName, String valueExpression) { + super("write-attribute"); + this.attributeName = attributeName; + this.valueExpression = valueExpression; + } + + public String getAttributeName() { + return attributeName; + } + + public String getValueExpression() { + return valueExpression; + } + } Modified: 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/WriteAttributesSetStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteAttributesSetStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -25,21 +25,20 @@ /** * @author Nick Belaevski - * */ public class WriteAttributesSetStatement extends AbstractTemplateMethodBodyStatement { - private Set<String> attributesSet; + private Set<String> attributesSet; - public WriteAttributesSetStatement(Set<String> attributesSet) { - super("write-attributes-set"); - this.attributesSet = attributesSet; - } - - /** - * @return the attributesSet - */ - public Set<String> getAttributesSet() { - return attributesSet; - } + public WriteAttributesSetStatement(Set<String> attributesSet) { + super("write-attributes-set"); + this.attributesSet = attributesSet; + } + + /** + * @return the attributesSet + */ + public Set<String> getAttributesSet() { + return attributesSet; + } } Modified: 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/WriteTextStatement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/WriteTextStatement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,22 +21,20 @@ */ package org.richfaces.cdk.templatecompiler; - /** * @author Nick Belaevski - * */ public class WriteTextStatement extends AbstractTemplateMethodBodyStatement { - private String textExpression; + private String textExpression; - public WriteTextStatement(String textExpression) { - super("write-text"); - this.textExpression = textExpression; - } - - public String getTextExpression() { - return textExpression; - } + public WriteTextStatement(String textExpression) { + super("write-text"); + this.textExpression = textExpression; + } + public String getTextExpression() { + return textExpression; + } + } Modified: 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/AnyElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,48 +23,44 @@ package org.richfaces.cdk.templatecompiler.model; -import java.util.List; -import java.util.Map; +import org.richfaces.cdk.CdkException; import javax.xml.bind.annotation.XmlAnyAttribute; import javax.xml.namespace.QName; +import java.util.Map; -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class AnyElement extends ModelFragment { - + private QName name; - - private Map<QName,Object> attributes; - + private Map<QName, Object> attributes; + /** * <p class="changed_added_4_0"></p> + * * @return the name */ public QName getName() { return this.name; } - - /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(QName name) { this.name = name; } - - /** * <p class="changed_added_4_0"></p> + * * @return the attributes */ @XmlAnyAttribute @@ -72,10 +68,9 @@ return this.attributes; } - - /** * <p class="changed_added_4_0"></p> + * * @param attributes the attributes to set */ public void setAttributes(Map<QName, Object> attributes) { @@ -86,7 +81,7 @@ public void beforeVisit(TemplateVisitor visitor) throws CdkException { visitor.startElement(this); } - + @Override public void afterVisit(TemplateVisitor visitor) throws CdkException { visitor.endElement(this); Modified: 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/Attribute.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -28,44 +28,45 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ -@XmlType(name="uicomponent-attributeType",namespace=Template.COMPOSITE_NAMESPACE) +@XmlType(name = "uicomponent-attributeType", namespace = Template.COMPOSITE_NAMESPACE) public class Attribute { - - @XmlAttribute(required=true) + + @XmlAttribute(required = true) private String name; - + @XmlAttribute private String displayName; - + @XmlAttribute private String shortDescription; - - @XmlAttribute(name="default") + + @XmlAttribute(name = "default") private String defaultValue; - - @XmlAttribute(name="method-signature") + + @XmlAttribute(name = "method-signature") private String methodSignature; - + @XmlAttribute private String targets; - + @XmlAttribute private boolean required; - + @XmlAttribute private boolean preferred; - + @XmlAttribute private boolean expert; @XmlAttribute private String type = Object.class.getName(); - + /** * <p class="changed_added_4_0"></p> + * * @return the name */ public String getName() { @@ -74,6 +75,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(String name) { @@ -82,6 +84,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the displayName */ public String getDisplayName() { @@ -90,6 +93,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param displayName the displayName to set */ public void setDisplayName(String displayName) { @@ -98,6 +102,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the shortDescription */ public String getShortDescription() { @@ -106,6 +111,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param shortDescription the shortDescription to set */ public void setShortDescription(String shortDescription) { @@ -114,6 +120,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the defaultValue */ public String getDefaultValue() { @@ -122,6 +129,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param defaultValue the defaultValue to set */ public void setDefaultValue(String defaultValue) { @@ -130,6 +138,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the methodSignature */ public String getMethodSignature() { @@ -138,6 +147,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param methodSignature the methodSignature to set */ public void setMethodSignature(String methodSignature) { @@ -146,6 +156,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the targets */ public String getTargets() { @@ -154,6 +165,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param targets the targets to set */ public void setTargets(String applyTo) { @@ -162,6 +174,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the required */ public boolean isRequired() { @@ -170,6 +183,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param required the required to set */ public void setRequired(boolean required) { @@ -178,6 +192,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the preffered */ public boolean isPreferred() { @@ -186,6 +201,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param preffered the preffered to set */ public void setPreferred(boolean preffered) { @@ -194,6 +210,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the expert */ public boolean isExpert() { @@ -202,26 +219,29 @@ /** * <p class="changed_added_4_0"></p> + * * @param expert the expert to set */ public void setExpert(boolean expert) { this.expert = expert; } - + /** * <p class="changed_added_4_0"></p> - * @return the type - */ + * + * @return the type + */ //TODO: add handling - public String getType() { - return type; - } - - /** + public String getType() { + return type; + } + + /** * <p class="changed_added_4_0"></p> - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } + * + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } } Modified: 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/CdkBodyElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,23 +23,23 @@ package org.richfaces.cdk.templatecompiler.model; +import org.richfaces.cdk.CdkException; + import javax.xml.bind.annotation.XmlRootElement; -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlRootElement(name = "body", namespace = Template.CDK_NAMESPACE) public class CdkBodyElement extends ModelFragment { - @Override + @Override public void beforeVisit(TemplateVisitor visitor) throws CdkException { visitor.startElement(this); } - + @Override public void afterVisit(TemplateVisitor visitor) throws CdkException { visitor.endElement(this); Modified: 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/CdkCallElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,26 +23,27 @@ package org.richfaces.cdk.templatecompiler.model; +import org.richfaces.cdk.CdkException; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ -(a)XmlRootElement(name=&quot;call&quot;,namespace=Template.CDK_NAMESPACE) +@XmlRootElement(name = "call", namespace = Template.CDK_NAMESPACE) public class CdkCallElement implements ModelElement { private String expression; - + public CdkCallElement() { } /** * <p class="changed_added_4_0"></p> + * * @return the expression */ @XmlAttribute @@ -52,6 +53,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param expression the expression to set */ public void setExpression(String expression) { @@ -60,10 +62,9 @@ @Override public void visit(TemplateVisitor visitor) throws CdkException { - + visitor.visitElement(this); - + } - - + } Modified: 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/CdkChooseElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,46 +21,44 @@ */ package org.richfaces.cdk.templatecompiler.model; -import java.util.Iterator; -import java.util.List; +import org.richfaces.cdk.CdkException; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; -import org.richfaces.cdk.CdkException; - /** * @author Nick Belaevski * @since 4.0 */ -@XmlRootElement(name="choose", namespace=Template.JSTL_CORE_NAMESPACE) +@XmlRootElement(name = "choose", namespace = Template.JSTL_CORE_NAMESPACE) public class CdkChooseElement extends ModelFragment { - @XmlElements({ - @XmlElement(name="when", namespace=Template.JSTL_CORE_NAMESPACE, type = CdkWhenElement.class), - @XmlElement(name="otherwise", namespace=Template.JSTL_CORE_NAMESPACE, type = CdkOtherwiseElement.class) - }) - @Override - public List<Object> getChildren() { - return super.getChildren(); - } - - @Override - public void setChildren(List<Object> body) { - super.setChildren(body); - } + @XmlElements({ + @XmlElement(name = "when", namespace = Template.JSTL_CORE_NAMESPACE, type = CdkWhenElement.class), + @XmlElement(name = "otherwise", namespace = Template.JSTL_CORE_NAMESPACE, type = CdkOtherwiseElement.class) + }) + @Override + public List<Object> getChildren() { + return super.getChildren(); + } - /* (non-Javadoc) - * @see org.richfaces.cdk.templatecompiler.model.ModelFragment#visit(org.richfaces.cdk.templatecompiler.model.TemplateVisitor) - */ - @Override - public void beforeVisit(TemplateVisitor visitor) throws CdkException { - visitor.startElement(this); - } - - @Override - public void afterVisit(TemplateVisitor visitor) throws CdkException { - visitor.endElement(this); - } + @Override + public void setChildren(List<Object> body) { + super.setChildren(body); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.templatecompiler.model.ModelFragment#visit(org.richfaces.cdk.templatecompiler.model.TemplateVisitor) + */ + @Override + public void beforeVisit(TemplateVisitor visitor) throws CdkException { + visitor.startElement(this); + } + + @Override + public void afterVisit(TemplateVisitor visitor) throws CdkException { + visitor.endElement(this); + } } Modified: 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/CdkConditionalJstlElementBase.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkConditionalJstlElementBase.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -29,21 +29,21 @@ */ public abstract class CdkConditionalJstlElementBase extends ModelFragment { - @XmlAttribute(required = true) - private String test; - - /** - * @return the test - */ - public String getTest() { - return test; - } - - /** - * @param test the test to set - */ - public void setTest(String test) { - this.test = test; - } + @XmlAttribute(required = true) + private String test; + /** + * @return the test + */ + public String getTest() { + return test; + } + + /** + * @param test the test to set + */ + public void setTest(String test) { + this.test = test; + } + } Modified: 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/CdkForEachElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,11 +21,11 @@ */ package org.richfaces.cdk.templatecompiler.model; +import org.richfaces.cdk.CdkException; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.richfaces.cdk.CdkException; - /** * @author Nick Belaevski * @since 4.0 @@ -33,47 +33,47 @@ @XmlRootElement(name = "forEach", namespace = Template.JSTL_CORE_NAMESPACE) public class CdkForEachElement extends ModelFragment { - private String items; - - private String var; - - /** - * @return the items - */ - @XmlAttribute - public String getItems() { - return items; - } + private String items; - /** - * @param items the items to set - */ - public void setItems(String items) { - this.items = items; - } + private String var; - /** - * @return the var - */ - @XmlAttribute - public String getVar() { - return var; - } + /** + * @return the items + */ + @XmlAttribute + public String getItems() { + return items; + } - /** - * @param var the var to set - */ - public void setVar(String var) { - this.var = var; - } + /** + * @param items the items to set + */ + public void setItems(String items) { + this.items = items; + } - @Override - public void beforeVisit(TemplateVisitor visitor) throws CdkException { - visitor.startElement(this); - } - - @Override - public void afterVisit(TemplateVisitor visitor) throws CdkException { - visitor.endElement(this); - } + /** + * @return the var + */ + @XmlAttribute + public String getVar() { + return var; + } + + /** + * @param var the var to set + */ + public void setVar(String var) { + this.var = var; + } + + @Override + public void beforeVisit(TemplateVisitor visitor) throws CdkException { + visitor.startElement(this); + } + + @Override + public void afterVisit(TemplateVisitor visitor) throws CdkException { + visitor.endElement(this); + } } Modified: 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/CdkIfElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,24 +21,24 @@ */ package org.richfaces.cdk.templatecompiler.model; +import org.richfaces.cdk.CdkException; + import javax.xml.bind.annotation.XmlRootElement; -import org.richfaces.cdk.CdkException; - /** * @author Nick Belaevski * @since 4.0 */ -@XmlRootElement(name="if", namespace=Template.JSTL_CORE_NAMESPACE) +@XmlRootElement(name = "if", namespace = Template.JSTL_CORE_NAMESPACE) public class CdkIfElement extends CdkConditionalJstlElementBase { - @Override - public void beforeVisit(TemplateVisitor visitor) throws CdkException { - visitor.startElement(this); - } - - @Override - public void afterVisit(TemplateVisitor visitor) throws CdkException { - visitor.endElement(this); - } + @Override + public void beforeVisit(TemplateVisitor visitor) throws CdkException { + visitor.startElement(this); + } + + @Override + public void afterVisit(TemplateVisitor visitor) throws CdkException { + visitor.endElement(this); + } } Modified: 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/CdkObjectElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,90 +21,90 @@ */ package org.richfaces.cdk.templatecompiler.model; +import org.richfaces.cdk.CdkException; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; -import org.richfaces.cdk.CdkException; - /** * @author Nick Belaevski * @since 4.0 */ @XmlRootElement(name = "object", namespace = Template.CDK_NAMESPACE) public class CdkObjectElement implements ModelElement { - - @XmlAttribute(required = true) - private String name; - - /** - * @return the bodyValue - */ - public String getBodyValue() { - return bodyValue; - } - /** - * @param bodyValue the bodyValue to set - */ - public void setBodyValue(String bodyValue) { - this.bodyValue = bodyValue; - } + @XmlAttribute(required = true) + private String name; - @XmlAttribute - private String value; + @XmlAttribute + private String value; - @XmlValue - private String bodyValue; - - @XmlAttribute(required = true) - private String type; + @XmlValue + private String bodyValue; - /** - * @return the name - */ - public String getName() { - return name; - } + @XmlAttribute(required = true) + private String type; - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + /** + * @return the bodyValue + */ + public String getBodyValue() { + return bodyValue; + } - /** - * @return the value - */ - public String getValue() { - return value; - } + /** + * @param bodyValue the bodyValue to set + */ + public void setBodyValue(String bodyValue) { + this.bodyValue = bodyValue; + } - /** - * @param value the value to set - */ - public void setValue(String value) { - this.value = value; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @return the type - */ - public String getType() { - return type; - } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } + /** + * @return the value + */ + public String getValue() { + return value; + } - @Override - public void visit(TemplateVisitor visitor) throws CdkException { - visitor.visitElement(this); - } + /** + * @param value the value to set + */ + public void setValue(String value) { + this.value = value; + } + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + @Override + public void visit(TemplateVisitor visitor) throws CdkException { + visitor.visitElement(this); + } + } Modified: 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/CdkOtherwiseElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkOtherwiseElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -29,13 +29,13 @@ */ public class CdkOtherwiseElement extends ModelFragment { - @Override - public void beforeVisit(TemplateVisitor visitor) throws CdkException { - visitor.startElement(this); - } + @Override + public void beforeVisit(TemplateVisitor visitor) throws CdkException { + visitor.startElement(this); + } - @Override - public void afterVisit(TemplateVisitor visitor) throws CdkException { - visitor.endElement(this); - } + @Override + public void afterVisit(TemplateVisitor visitor) throws CdkException { + visitor.endElement(this); + } } Modified: 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/CdkWhenElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkWhenElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -29,13 +29,13 @@ */ public class CdkWhenElement extends CdkConditionalJstlElementBase { - @Override - public void beforeVisit(TemplateVisitor visitor) throws CdkException { - visitor.startElement(this); - } - - @Override - public void afterVisit(TemplateVisitor visitor) throws CdkException { - visitor.endElement(this); - } + @Override + public void beforeVisit(TemplateVisitor visitor) throws CdkException { + visitor.startElement(this); + } + + @Override + public void afterVisit(TemplateVisitor visitor) throws CdkException { + visitor.endElement(this); + } } Modified: 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/CompositeImplementation.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,15 +23,14 @@ package org.richfaces.cdk.templatecompiler.model; - import javax.xml.bind.annotation.XmlType; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ -(a)XmlType(name=&quot;ImplementationType&quot;,namespace=Template.COMPOSITE_NAMESPACE) +@XmlType(name = "ImplementationType", namespace = Template.COMPOSITE_NAMESPACE) public class CompositeImplementation extends ModelFragment { - + } Modified: 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/CompositeInterface.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,29 +23,28 @@ package org.richfaces.cdk.templatecompiler.model; -import java.util.List; - import javax.faces.render.RenderKitFactory; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlType; +import java.util.List; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ -(a)XmlType(name=&quot;InterfaceType&quot;,namespace=Template.COMPOSITE_NAMESPACE) +@XmlType(name = "InterfaceType", namespace = Template.COMPOSITE_NAMESPACE) public class CompositeInterface { - + private String componentType; - + private String componentFamily; - + private List<Attribute> attributes; private List<ResourceDependency> resourceDependencies; - + private String renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT; private String javaClass; @@ -53,20 +52,22 @@ private String baseClass; private String rendererType; - + private boolean rendersChildren = true; - + /** * <p class="changed_added_4_0"></p> + * * @return the componentType */ - @XmlElement(name="component-type",namespace=Template.CDK_NAMESPACE) + @XmlElement(name = "component-type", namespace = Template.CDK_NAMESPACE) public String getComponentType() { return this.componentType; } /** * <p class="changed_added_4_0"></p> + * * @param componentType the componentType to set */ public void setComponentType(String componentType) { @@ -75,15 +76,17 @@ /** * <p class="changed_added_4_0"></p> + * * @return the family */ - @XmlElement(name="component-family",namespace=Template.CDK_NAMESPACE) + @XmlElement(name = "component-family", namespace = Template.CDK_NAMESPACE) public String getComponentFamily() { return this.componentFamily; } /** * <p class="changed_added_4_0"></p> + * * @param family the family to set */ public void setComponentFamily(String family) { @@ -92,15 +95,17 @@ /** * <p class="changed_added_4_0"></p> + * * @return the attributes */ - @XmlElement(name="attribute",namespace=Template.COMPOSITE_NAMESPACE) + @XmlElement(name = "attribute", namespace = Template.COMPOSITE_NAMESPACE) public List<Attribute> getAttributes() { return this.attributes; } /** * <p class="changed_added_4_0"></p> + * * @param attributes the attributes to set */ public void setAttributes(List<Attribute> attributes) { @@ -109,34 +114,38 @@ /** * <p class="changed_added_4_0"></p> - * @return the resourceDependencies - */ + * + * @return the resourceDependencies + */ @XmlElementWrapper(name = "resource-dependencies", namespace = Template.CDK_NAMESPACE) - @XmlElement(name="resource-dependency", namespace=Template.CDK_NAMESPACE) - public List<ResourceDependency> getResourceDependencies() { - return resourceDependencies; - } - - /** + @XmlElement(name = "resource-dependency", namespace = Template.CDK_NAMESPACE) + public List<ResourceDependency> getResourceDependencies() { + return resourceDependencies; + } + + /** * <p class="changed_added_4_0"></p> - * @param resourceDependencies the resourceDependencies to set - */ - public void setResourceDependencies( - List<ResourceDependency> resourceDependencies) { - this.resourceDependencies = resourceDependencies; - } - + * + * @param resourceDependencies the resourceDependencies to set + */ + public void setResourceDependencies( + List<ResourceDependency> resourceDependencies) { + this.resourceDependencies = resourceDependencies; + } + /** * <p class="changed_added_4_0"></p> + * * @return the renderKitId */ - @XmlElement(name="renderkit-id",namespace=Template.CDK_NAMESPACE) + @XmlElement(name = "renderkit-id", namespace = Template.CDK_NAMESPACE) public String getRenderKitId() { return this.renderKitId; } /** * <p class="changed_added_4_0"></p> + * * @param renderKitId the renderKitId to set */ public void setRenderKitId(String renderKitId) { @@ -145,15 +154,17 @@ /** * <p class="changed_added_4_0"></p> + * * @return the javaClass */ - @XmlElement(name="class",namespace=Template.CDK_NAMESPACE) + @XmlElement(name = "class", namespace = Template.CDK_NAMESPACE) public String getJavaClass() { return this.javaClass; } /** * <p class="changed_added_4_0"></p> + * * @param javaClass the javaClass to set */ public void setJavaClass(String javaClass) { @@ -162,15 +173,17 @@ /** * <p class="changed_added_4_0"></p> + * * @return the rendererType */ - @XmlElement(name="renderer-type",namespace=Template.CDK_NAMESPACE) + @XmlElement(name = "renderer-type", namespace = Template.CDK_NAMESPACE) public String getRendererType() { return this.rendererType; } /** * <p class="changed_added_4_0"></p> + * * @param rendererType the rendererType to set */ public void setRendererType(String rendererType) { @@ -179,35 +192,38 @@ /** * <p class="changed_added_4_0"></p> + * * @return the baseClass */ - @XmlElement(name="superclass",namespace=Template.CDK_NAMESPACE) + @XmlElement(name = "superclass", namespace = Template.CDK_NAMESPACE) public String getBaseClass() { return this.baseClass; } /** * <p class="changed_added_4_0"></p> + * * @param baseClass the baseClass to set */ public void setBaseClass(String baseClass) { this.baseClass = baseClass; } - + /** * <p class="changed_added_4_0"></p> - * @return the rendersChildren - */ + * + * @return the rendersChildren + */ //TODO: add handling - @XmlElement(name="renders-children",namespace=Template.CDK_NAMESPACE) - public boolean isRendersChildren() { - return rendersChildren; - } - - /** - * @param rendersChildren the rendersChildren to set - */ - public void setRendersChildren(boolean rendersChildren) { - this.rendersChildren = rendersChildren; - } + @XmlElement(name = "renders-children", namespace = Template.CDK_NAMESPACE) + public boolean isRendersChildren() { + return rendersChildren; + } + + /** + * @param rendersChildren the rendersChildren to set + */ + public void setRendersChildren(boolean rendersChildren) { + this.rendersChildren = rendersChildren; + } } Modified: 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/ElementsHandler.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,11 +23,15 @@ package org.richfaces.cdk.templatecompiler.model; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + import javax.xml.XMLConstants; import javax.xml.bind.JAXB; import javax.xml.bind.ValidationEventHandler; import javax.xml.bind.annotation.DomHandler; -import javax.xml.bind.annotation.W3CDomHandler; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -36,48 +40,43 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentFragment; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ -public class ElementsHandler implements DomHandler<ModelElement, DOMResult> { +public class ElementsHandler implements DomHandler<ModelElement, DOMResult> { private DocumentBuilder builder; /** * Default constructor. - * + * <p/> * It is up to a JAXB provider to decide which DOM implementation * to use or how that is configured. */ public ElementsHandler() { DocumentBuilderFactory docFactory = DocumentBuilderFactory - .newInstance(); + .newInstance(); // Create Document Builder try { this.builder = docFactory.newDocumentBuilder(); } catch (ParserConfigurationException e) { throw new IllegalArgumentException("No documentBuilderFactory"); - }; + } } /** * Constructor that allows applications to specify which DOM implementation * to be used. * - * @param builder - * must not be null. JAXB uses this {@link DocumentBuilder} to create - * a new element. + * @param builder must not be null. JAXB uses this {@link DocumentBuilder} to create + * a new element. */ public ElementsHandler(DocumentBuilder builder) { - if(builder==null) + if (builder == null) { throw new IllegalArgumentException(); + } this.builder = builder; } @@ -86,16 +85,18 @@ } public void setBuilder(DocumentBuilder builder) { - if(builder==null) + if (builder == null) { throw new IllegalArgumentException(); + } this.builder = builder; } public DOMResult createUnmarshaller(ValidationEventHandler errorHandler) { - if(builder==null) + if (builder == null) { return new DOMResult(); - else + } else { return new DOMResult(builder.newDocument()); + } } @Override @@ -103,7 +104,8 @@ Element domElement = getDomElement(rt); AnyElement element = JAXB.unmarshal(new DOMSource(domElement), AnyElement.class); String prefix = domElement.getPrefix(); - QName name = new QName(domElement.getNamespaceURI(),domElement.getLocalName(),null!=prefix?prefix:XMLConstants.DEFAULT_NS_PREFIX); + QName name = new QName(domElement.getNamespaceURI(), domElement.getLocalName(), + null != prefix ? prefix : XMLConstants.DEFAULT_NS_PREFIX); element.setName(name); return element; } @@ -112,18 +114,18 @@ // JAXP spec is ambiguous about what really happens in this case, // so work defensively Node n = r.getNode(); - if( n instanceof Document ) { - return ((Document)n).getDocumentElement(); + if (n instanceof Document) { + return ((Document) n).getDocumentElement(); } - - if( n instanceof Element ) { + + if (n instanceof Element) { return (Element) n; } - - if( n instanceof DocumentFragment ) { - return (Element)n.getChildNodes().item(0); + + if (n instanceof DocumentFragment) { + return (Element) n.getChildNodes().item(0); } - + // if the result object contains something strange, // it is not a user problem, but it is a JAXB provider's problem. // That's why we throw a runtime exception. Modified: 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/LeafModelElement.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,16 +1,15 @@ package org.richfaces.cdk.templatecompiler.model; -import java.util.List; - import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlMixed; +import java.util.List; public interface LeafModelElement extends ModelElement { /* (non-Javadoc) * @see org.richfaces.cdk.templatecompiler.model.ModelElement#getChildren() */ - @XmlAnyElement(lax=true,value=ElementsHandler.class) + @XmlAnyElement(lax = true, value = ElementsHandler.class) @XmlMixed public List<Object> getChildren(); Modified: 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/ModelBase.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,14 +23,14 @@ package org.richfaces.cdk.templatecompiler.model; +import com.google.common.collect.Lists; + import java.util.List; -import com.google.common.collect.Lists; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class ModelBase { @@ -38,6 +38,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the children */ public List<ModelBase> getChildren() { @@ -46,6 +47,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param children the children to set */ public void setChildren(List<ModelBase> children) { Modified: 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/ModelFragment.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,69 +1,68 @@ package org.richfaces.cdk.templatecompiler.model; -import java.util.List; +import org.richfaces.cdk.CdkException; import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlSeeAlso; +import java.util.List; -import org.richfaces.cdk.CdkException; - /** * <p class="changed_added_4_0">All classes that are used in template bodey should be presented * in the {@link XmlSeeAlso} annotation </p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @XmlSeeAlso({ - CdkCallElement.class, - CdkBodyElement.class, - CdkIfElement.class, - CdkObjectElement.class, - CdkChooseElement.class, - CdkForEachElement.class + CdkCallElement.class, + CdkBodyElement.class, + CdkIfElement.class, + CdkObjectElement.class, + CdkChooseElement.class, + CdkForEachElement.class }) public class ModelFragment implements LeafModelElement { - private List<Object> children; + private List<Object> children; + //TODO filter unhandled elements from known namespaces + @XmlAnyElement(lax = true, value = ElementsHandler.class) + @XmlMixed + public List<Object> getChildren() { + return this.children; + } - //TODO filter unhandled elements from known namespaces - @XmlAnyElement(lax=true, value=ElementsHandler.class) - @XmlMixed - public List<Object> getChildren() { - return this.children; - } + /** + * <p class="changed_added_4_0"></p> + * + * @param body the body to set + */ + public void setChildren(List<Object> body) { + this.children = body; + } - /** - * <p class="changed_added_4_0"></p> - * @param body the body to set - */ - public void setChildren(List<Object> body) { - this.children = body; - } + @Override + public void visit(TemplateVisitor visitor) throws CdkException { + beforeVisit(visitor); + List<Object> childrenList = getChildren(); + if (childrenList != null) { + for (Object child : childrenList) { + if (child instanceof String) { + visitor.visitElement((String) child); + } else if (child instanceof ModelElement) { + ((ModelElement) child).visit(visitor); + } else { + throw new CdkException("Unknown type of element in renderer template " + child.getClass()); + } + } + } + afterVisit(visitor); + } - @Override - public void visit(TemplateVisitor visitor) throws CdkException { - beforeVisit(visitor); - List<Object> childrenList = getChildren(); - if (childrenList != null) { - for (Object child : childrenList) { - if (child instanceof String) { - visitor.visitElement((String) child); - } else if (child instanceof ModelElement) { - ((ModelElement) child).visit(visitor); - } else { - throw new CdkException("Unknown type of element in renderer template "+child.getClass()); - } - } - } - afterVisit(visitor); - } + public void afterVisit(TemplateVisitor visitor) throws CdkException { + } - public void afterVisit(TemplateVisitor visitor) throws CdkException { - } + public void beforeVisit(TemplateVisitor visitor) throws CdkException { + } - public void beforeVisit(TemplateVisitor visitor) throws CdkException { - } - } \ No newline at end of file Modified: 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/ResourceDependency.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,10 +21,9 @@ */ package org.richfaces.cdk.templatecompiler.model; -import java.text.MessageFormat; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; +import java.text.MessageFormat; /** * @author Nick Belaevski @@ -33,65 +32,72 @@ @XmlType(name = "resourceDependencyType", namespace = Template.CDK_NAMESPACE) public class ResourceDependency { - private String name; - - private String library; - - private String target = "head"; + private String name; - /** + private String library; + + private String target = "head"; + + /** * <p class="changed_added_4_0"></p> - * @return the name - */ - @XmlAttribute(name = "name", required = true) - public String getName() { - return name; - } + * + * @return the name + */ + @XmlAttribute(name = "name", required = true) + public String getName() { + return name; + } - /** + /** * <p class="changed_added_4_0"></p> - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + * + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } - /** + /** * <p class="changed_added_4_0"></p> - * @return the libraryName - */ - @XmlAttribute(name = "library") - public String getLibrary() { - return library; - } + * + * @return the libraryName + */ + @XmlAttribute(name = "library") + public String getLibrary() { + return library; + } - /** + /** * <p class="changed_added_4_0"></p> - * @param library the libraryName to set - */ - public void setLibrary(String library) { - this.library = library; - } + * + * @param library the libraryName to set + */ + public void setLibrary(String library) { + this.library = library; + } - /** + /** * <p class="changed_added_4_0"></p> - * @return the target - */ - @XmlAttribute(name = "target") - public String getTarget() { - return target; - } + * + * @return the target + */ + @XmlAttribute(name = "target") + public String getTarget() { + return target; + } - /** + /** * <p class="changed_added_4_0"></p> - * @param target the target to set - */ - public void setTarget(String target) { - this.target = target; - } - - @Override - public String toString() { - return MessageFormat.format("ResourceDependency[name={0}, library={1}, target={2}]", getName(), getLibrary(), getTarget()); - } + * + * @param target the target to set + */ + public void setTarget(String target) { + this.target = target; + } + + @Override + public String toString() { + return MessageFormat.format("ResourceDependency[name={0}, library={1}, target={2}]", + getName(), getLibrary(), getTarget()); + } } Modified: 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/Template.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -28,53 +28,58 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ -(a)XmlRootElement(name=&quot;root&quot;,namespace=Template.CDK_NAMESPACE) +@XmlRootElement(name = "root", namespace = Template.CDK_NAMESPACE) public class Template { - - public static final String JSTL_CORE_NAMESPACE = "http://java.sun.com/jsp/jstl/core"; - - public static final String CDK_NAMESPACE="http://richfaces.org/cdk"; - - public static final String COMPOSITE_NAMESPACE="http://java.sun.com/jsf/composite"; - private CompositeInterface _interface; - - private CompositeImplementation _implementation; + public static final String JSTL_CORE_NAMESPACE = "http://java.sun.com/jsp/jstl/core"; + + public static final String CDK_NAMESPACE = "http://richfaces.org/cdk"; + + public static final String COMPOSITE_NAMESPACE = "http://java.sun.com/jsf/composite"; + + private CompositeInterface compositeInterface; + + private CompositeImplementation compositeImplementation; + /** * <p class="changed_added_4_0"></p> + * * @return the interface */ - @XmlElement(name="interface",namespace=COMPOSITE_NAMESPACE) + @XmlElement(name = "interface", namespace = COMPOSITE_NAMESPACE) public CompositeInterface getInterface() { - return this._interface; + return this.compositeInterface; } /** * <p class="changed_added_4_0"></p> + * * @param interface1 the interface to set */ public void setInterface(CompositeInterface interface1) { - this._interface = interface1; + this.compositeInterface = interface1; } /** * <p class="changed_added_4_0"></p> + * * @return the implementation */ - @XmlElement(name="implementation",namespace=COMPOSITE_NAMESPACE) + @XmlElement(name = "implementation", namespace = COMPOSITE_NAMESPACE) public CompositeImplementation getImplementation() { - return this._implementation; + return this.compositeImplementation; } /** * <p class="changed_added_4_0"></p> + * * @param implementation the implementation to set */ public void setImplementation(CompositeImplementation implementation) { - this._implementation = implementation; + this.compositeImplementation = implementation; } } Modified: 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/TemplateVisitor.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/TemplateVisitor.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -27,8 +27,8 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public interface TemplateVisitor { @@ -44,26 +44,26 @@ void endElement(CdkBodyElement cdkBodyElement) throws CdkException; - void startElement(CdkIfElement cdkIfElement); + void startElement(CdkIfElement cdkIfElement); - void endElement(CdkIfElement cdkIfElement); + void endElement(CdkIfElement cdkIfElement); - void startElement(CdkWhenElement cdkWhenElement); + void startElement(CdkWhenElement cdkWhenElement); - void endElement(CdkWhenElement cdkWhenElement); + void endElement(CdkWhenElement cdkWhenElement); - void startElement(CdkChooseElement cdkChooseElement); + void startElement(CdkChooseElement cdkChooseElement); - void endElement(CdkChooseElement cdkChooseElement); + void endElement(CdkChooseElement cdkChooseElement); - void startElement(CdkOtherwiseElement cdkOtherwiseElement); + void startElement(CdkOtherwiseElement cdkOtherwiseElement); - void endElement(CdkOtherwiseElement cdkOtherwiseElement); + void endElement(CdkOtherwiseElement cdkOtherwiseElement); - void visitElement(CdkObjectElement cdkObjectElement); + void visitElement(CdkObjectElement cdkObjectElement); - void startElement(CdkForEachElement cdkForEachElement); + void startElement(CdkForEachElement cdkForEachElement); - void endElement(CdkForEachElement cdkForEachElement); + void endElement(CdkForEachElement cdkForEachElement); } Modified: 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/templatecompiler/model/package-info.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/package-info.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -7,16 +7,13 @@ */ @XmlAccessorType(XmlAccessType.NONE) @javax.xml.bind.annotation.XmlSchema(namespace = Template.CDK_NAMESPACE, - xmlns = {(a)javax.xml.bind.annotation.XmlNs(prefix = "cdk", - namespaceURI = Template.CDK_NAMESPACE), - @javax.xml.bind.annotation.XmlNs(prefix = "cc", - namespaceURI = Template.COMPOSITE_NAMESPACE)}) - + xmlns = {(a)javax.xml.bind.annotation.XmlNs(prefix = "cdk", + namespaceURI = Template.CDK_NAMESPACE), + @javax.xml.bind.annotation.XmlNs(prefix = "cc", + namespaceURI = Template.COMPOSITE_NAMESPACE)}) package org.richfaces.cdk.templatecompiler.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSchemaTypes; -import javax.xml.bind.annotation.XmlSchemaType; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,27 +21,26 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.util; import org.richfaces.cdk.model.InvalidNameException; /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public final class PropertyUtils { - private PropertyUtils() {} + private PropertyUtils() { + } public static String methodToName(String methodName) throws InvalidNameException { if (null != methodName) { if (methodName.length() > 3 && Character.isUpperCase(methodName.charAt(3)) - && (methodName.startsWith("set") || methodName.startsWith("get"))) { + && (methodName.startsWith("set") || methodName.startsWith("get"))) { return Strings.firstToLowerCase(methodName.substring(3)); } else if (methodName.length() > 2 && Character.isUpperCase(methodName.charAt(2)) - && methodName.startsWith("is")) { + && methodName.startsWith("is")) { return Strings.firstToLowerCase(methodName.substring(2)); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Strings.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Strings.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/Strings.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,14 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.util; /** * <p class="changed_added_4_0">String manipulation utils.</p> + * * @author asmirnov(a)exadel.com - * */ public final class Strings { private Strings() { @@ -38,7 +36,8 @@ /** * <p class="changed_added_4_0">Remove characters from string end</p> - * @param in input string + * + * @param in input string * @param size number of characters to remove. * @return */ @@ -53,6 +52,7 @@ /** * <p class="changed_added_4_0">Change case of the first character to lower, as it required by the Java Beans property and setter/getter method name conventions:</p> * <p>"PropertyFoo" will be changed to "propertyFoo"</p> + * * @param in * @return {@code in} with first character changed to lower case. */ @@ -67,6 +67,7 @@ /** * <p class="changed_added_4_0">Change case of the first character to upper, as it required by the Java Beans property and setter/getter method name conventions:</p> * <p>"propertyFoo" will be changed to "PropertyFoo"</p> + * * @param in * @return {@code in} with first character changed to lower case. */ @@ -80,6 +81,7 @@ /** * <p class="changed_added_4_0">Check string for null or empty value</p> + * * @param type * @return true if {@code type} is null or zero-length string. */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,28 +21,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; +import com.google.common.collect.ImmutableMap; +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkContext.SourceType; +import org.richfaces.cdk.StandardSources; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.ext.EntityResolver2; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; - import java.net.URI; -import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkContext.SourceType; - -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.ext.EntityResolver2; - -import com.google.common.collect.ImmutableMap; - /** * <p class="changed_added_4_0"> * That class resolves entities used by CDK ( standard JSF schemas, extensions, @@ -50,7 +45,6 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class CdkEntityResolver implements EntityResolver2 { // configure a validating SAX2.0 parser (Xerces2) @@ -67,32 +61,32 @@ private static final String SYSTEM_PREFIX = "/META-INF/schema"; private static final String URN_SYSTEM = "urn:system:"; private static final ImmutableMap<String, String> SYSTEM_ENTITIES = ImmutableMap - .<String, String> builder() - .put("http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd", - URN_SYSTEM + "/web-facesconfig_2_0.xsd") - .put("http://java.sun.com/xml/ns/javaee/web-facesuicomponent_2_0.xsd", - URN_SYSTEM + "/web-facesuicomponent_2_0.xsd") - .put("http://java.sun.com/xml/ns/javaee/web-partialresponse_2_0.xsd", - URN_SYSTEM + "/web-partialresponse_2_0.xsd") - .put("http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd", - URN_SYSTEM + "/web-facesconfig_1_2.xsd") - .put("http://java.sun.com/xml/ns/javaee/javaee_5.xsd", - URN_SYSTEM + "/javaee_5.xsd") - .put( - "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd", - URN_SYSTEM + "/javaee_web_services_1_2.xsd") - .put( - "http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd", - URN_SYSTEM + "/javaee_web_services_client_1_2.xsd").put( - "http://www.w3.org/2001/03/XMLSchema.dtd", - URN_SYSTEM + "/XMLSchema.dtd").put( - "http://www.w3.org/2001/03/xml.xsd", - URN_SYSTEM + "/xml.xsd").put( - "http://richfaces.org/cdk/cdk-template.xsd", - URN_SYSTEM + "/cdk-template.xsd").put( - "http://richfaces.org/cdk/xhtml-el.xsd", - URN_SYSTEM + "/xhtml-el.xsd").build(); - + .<String, String>builder() + .put("http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd", + URN_SYSTEM + "/web-facesconfig_2_0.xsd") + .put("http://java.sun.com/xml/ns/javaee/web-facesuicomponent_2_0.xsd", + URN_SYSTEM + "/web-facesuicomponent_2_0.xsd") + .put("http://java.sun.com/xml/ns/javaee/web-partialresponse_2_0.xsd", + URN_SYSTEM + "/web-partialresponse_2_0.xsd") + .put("http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd", + URN_SYSTEM + "/web-facesconfig_1_2.xsd") + .put("http://java.sun.com/xml/ns/javaee/javaee_5.xsd", + URN_SYSTEM + "/javaee_5.xsd") + .put( + "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd", + URN_SYSTEM + "/javaee_web_services_1_2.xsd") + .put( + "http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd", + URN_SYSTEM + "/javaee_web_services_client_1_2.xsd").put( + "http://www.w3.org/2001/03/XMLSchema.dtd", + URN_SYSTEM + "/XMLSchema.dtd").put( + "http://www.w3.org/2001/03/xml.xsd", + URN_SYSTEM + "/xml.xsd").put( + "http://richfaces.org/cdk/cdk-template.xsd", + URN_SYSTEM + "/cdk-template.xsd").put( + "http://richfaces.org/cdk/xhtml-el.xsd", + URN_SYSTEM + "/xhtml-el.xsd").build(); + private final CdkContext context; public CdkEntityResolver(CdkContext context) { @@ -121,7 +115,7 @@ @Override public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId) throws SAXException, IOException { - + String temSystemId = systemId; // perform conversions with baseURI Modified: 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/FacesConfigGenerator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; import org.richfaces.cdk.CdkContext; @@ -39,12 +37,12 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class FacesConfigGenerator implements CdkWriter { - private static final String FACES_CONFIG_XML = "META-INF/faces-config.xml"; public static final String FACES_SCHEMA_LOCATION = ComponentLibrary.FACES_CONFIG_NAMESPACE + " " - + ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; + + ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; + + private static final String FACES_CONFIG_XML = "META-INF/faces-config.xml"; private CdkContext context; private JAXBBinding jaxbBinding; private FacesConfigAdapter libraryAdapter; @@ -73,7 +71,7 @@ // TODO - check modification time. File facesConfigXml = context.createOutputFile(StandardOutputs.FACES_CONFIG, FACES_CONFIG_XML, - library.lastModified()); + library.lastModified()); if (null != facesConfigXml) { try { @@ -83,7 +81,7 @@ jaxbBinding.marshal(facesConfigXml, FACES_SCHEMA_LOCATION, libraryAdapter.marshal(library)); } catch (Exception e) { if (e instanceof CdkException) { - throw(CdkException) e; + throw (CdkException) e; } else { throw new CdkException(e); } Modified: 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/FacesConfigNamespacePreffixMapper.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigNamespacePreffixMapper.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; import org.richfaces.cdk.model.ComponentLibrary; @@ -31,8 +29,8 @@ /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class FacesConfigNamespacePreffixMapper /* extends NamespacePrefixMapper */ { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; import org.richfaces.cdk.CdkContext; @@ -36,8 +34,8 @@ /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class FacesConfigParser implements ModelBuilder { private CdkContext context; @@ -45,6 +43,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the context */ public CdkContext getContext() { @@ -64,7 +63,7 @@ library.getComponents().addAll(unmarshal.getComponents()); library.getRenderKits().addAll(unmarshal.getRenderKits()); - + // TODO - merge changes into library. // library.getRenderers().addAll(unmarshal.getRenderers()); // library.getValidators().addAll(unmarshal.getValidators); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,13 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; -import java.util.Collection; -import java.util.Collections; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; @@ -35,6 +30,9 @@ import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.model.Properties; +import java.util.Collection; +import java.util.Collections; + /** * <p class="changed_added_4_0"> * That class parses xml document with fragment of faces-config ( eg, standard @@ -42,13 +40,13 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class FragmentParser implements CdkWorker { private JAXBBinding binding; private CdkContext context; - public FragmentParser() {} + public FragmentParser() { + } /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,13 +21,34 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig; +import com.google.common.collect.ImmutableSet; +import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer; +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.model.Key; +import org.richfaces.cdk.model.ModelElement; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.UnmarshallerHandler; +import javax.xml.bind.util.ValidationEventCollector; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; import java.beans.Introspector; import java.beans.PropertyDescriptor; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -35,49 +56,17 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; - import java.lang.reflect.Constructor; import java.lang.reflect.Method; - import java.net.URI; import java.net.URISyntaxException; - import java.util.Collection; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.UnmarshallerHandler; -import javax.xml.bind.util.ValidationEventCollector; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamResult; - -import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer; - -import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.CdkWorker; -import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Extensible; -import org.richfaces.cdk.model.Key; -import org.richfaces.cdk.model.ModelElement; - -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; - -import com.google.common.collect.ImmutableSet; - /** * <p class="changed_added_4_0"> * </p> * * @author asmirnov(a)exadel.com - * */ public class JAXBBinding implements CdkWorker { private static final FacesConfigNamespacePreffixMapper PREFFIX_MAPPER = new FacesConfigNamespacePreffixMapper(); @@ -86,7 +75,8 @@ private CdkContext context; private CdkEntityResolver resolver; - public JAXBBinding() { } + public JAXBBinding() { + } /** * <p class="changed_added_4_0"> @@ -262,14 +252,10 @@ * object to adapter. * </p> * - * @param <A> - * type of adapter object - * @param <T> - * type of model object. - * @param adapterClass - * adapter class. - * @param modelObject - * model object class. + * @param <A> type of adapter object + * @param <T> type of model object. + * @param adapterClass adapter class. + * @param modelObject model object class. * @return initialized instance of adapter object. */ public static <A, T> A createAdapter(Class<A> adapterClass, T modelObject) throws CdkException { @@ -289,7 +275,7 @@ } public static <A, T extends ModelElement<? super T, K>, K extends Key> T createModelElement(Class<T> modelClass, - A adapter, K key) throws CdkException { + A adapter, K key) throws CdkException { try { Constructor<T> constructor = modelClass.getConstructor(key.getClass()); @@ -359,11 +345,11 @@ */ private static <D> ConfigExtension createExtension(D destination) throws NoSuchMethodException, InstantiationException, IllegalAccessException { - + Method method = destination.getClass().getMethod("getExtension"); Class<? extends ConfigExtension> destinationExtensionType = (Class<? extends ConfigExtension>) method.getReturnType(); - + return destinationExtensionType.newInstance(); } @@ -392,7 +378,7 @@ Method readMethod = sourceProperty.getReadMethod(); if (!IGNORE_PROPERTIES.contains(name) && name.equals(sourceProperty.getName()) - && null != readMethod) { + && null != readMethod) { Class<?> targetType = targetProperty.getPropertyType(); Class<?> sourceType = sourceProperty.getPropertyType(); Object propertyValue = readMethod.invoke(source); Modified: 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/AttributeAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,20 +21,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.Attribute; import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class AttributeAdapter extends XmlAdapter<AttributeBean, Attribute> { @Override Modified: 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/AttributeBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,22 +21,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Extensible; import org.richfaces.cdk.xmlconfig.model.PropertyBean.PropertyExtension; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class AttributeBean extends DescriptionGroupBean implements Extensible<PropertyBean.PropertyExtension> { private String defaultValue; @@ -47,6 +45,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the name */ @XmlElement(name = "attribute-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -56,6 +55,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(String name) { @@ -64,6 +64,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ @XmlElement(name = "attribute-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -74,6 +75,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(ClassDescription type) { @@ -82,6 +84,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the defaultValue */ @XmlElement(name = "default-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -91,6 +94,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param defaultValue the defaultValue to set */ public void setDefaultValue(String defaultValue) { @@ -99,6 +103,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the suggestedValue */ @XmlElement(name = "suggested-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -108,6 +113,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param suggestedValue the suggestedValue to set */ public void setSuggestedValue(String suggestedValue) { @@ -122,6 +128,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param extension the extension to set */ @Override Modified: 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/BehaviorRendererAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.BehaviorRenderer; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class BehaviorRendererAdapter extends XmlAdapter<BehaviorRendererBean, BehaviorRenderer> { @Override Modified: 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/BehaviorRendererBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,22 +21,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +package org.richfaces.cdk.xmlconfig.model; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; -package org.richfaces.cdk.xmlconfig.model; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlType(name = "faces-config-client-behavior-rendererType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public class BehaviorRendererBean { @@ -45,6 +43,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ @XmlElement(name = "client-behavior-renderer-type", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -54,6 +53,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(String type) { @@ -62,6 +62,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the rendererClass */ @XmlElement(name = "client-behavior-renderer-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -72,6 +73,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param rendererClass the rendererClass to set */ public void setRendererClass(ClassDescription rendererClass) { @@ -80,10 +82,11 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ - public static class BehaviorRendererExtension extends ConfigExtension {} + public static class BehaviorRendererExtension extends ConfigExtension { + } /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,18 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.ClassDescription; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class ClassAdapter extends XmlAdapter<ClassBean, ClassDescription> { @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +package org.richfaces.cdk.xmlconfig.model; +import org.richfaces.cdk.model.ComponentLibrary; -package org.richfaces.cdk.xmlconfig.model; - import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.richfaces.cdk.model.ComponentLibrary; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlType(name = "fully-qualified-classType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public class ClassBean { @@ -41,6 +39,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the name */ @XmlValue @@ -50,6 +49,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(String name) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.Component; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class ComponentAdapter extends XmlAdapter<ComponentBean, Component> { @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,17 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import com.google.common.collect.Lists; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; @@ -39,12 +31,16 @@ import org.richfaces.cdk.model.Facet; import org.richfaces.cdk.model.Property; -import com.google.common.collect.Lists; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.List; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlType(name = "faces-config-componentType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public class ComponentBean extends ExtensibleBean<ComponentBean.ComponentExtension> { @@ -55,6 +51,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ @XmlElement(name = "component-type", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -64,6 +61,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(String type) { @@ -72,6 +70,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the componentClass */ @XmlElement(name = "component-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -82,6 +81,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param componentClass the componentClass to set */ public void setComponentClass(ClassDescription className) { @@ -90,25 +90,27 @@ /** * <p class="changed_added_4_0"></p> + * * @return the attributes */ @XmlElements({@XmlElement( name = "property", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = PropertyBean.class - ) , @XmlElement( + ), @XmlElement( name = "attribute", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = AttributeBean.class - ) }) + )}) -// @XmlElement(name="attributes",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) +// @XmlElement(name="attributes",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) public List<Property> getAttributes() { return attributes; } /** * <p class="changed_added_4_0"></p> + * * @param attributes the attributes to set */ public void setAttributes(List<Property> property) { @@ -117,6 +119,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the facets */ @XmlElement(name = "facet", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -127,6 +130,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param facets the facets to set */ public void setFacets(List<Facet> facets) { @@ -135,6 +139,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the extension */ @XmlElement(name = "component-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -157,6 +162,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param family the family to set */ public void setFamily(String family) { @@ -165,6 +171,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the family */ @XmlElement(name = "component-family", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -174,6 +181,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the baseClass */ @XmlElement(name = "base-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -184,6 +192,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param baseClass the baseClass to set */ public void setBaseClass(ClassDescription baseClass) { @@ -192,6 +201,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the generate */ @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -201,6 +211,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param generate the generate to set */ public void setGenerate(boolean generate) { @@ -209,6 +220,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param rendererTypes the rendererTypes to set */ @XmlElement(name = "renderer-type", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -218,6 +230,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the rendererTypes */ public List<String> getRendererTypes() { @@ -226,6 +239,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the events */ @XmlElement(name = "fires", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -236,6 +250,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param events the events to set */ public void setEvents(List<Event> events) { Modified: 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/DescriptionGroupBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -1,10 +1,10 @@ package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.XmlElement; - import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.DescriptionGroup; +import javax.xml.bind.annotation.XmlElement; + public class DescriptionGroupBean implements DescriptionGroup { private String description; private String displayname; @@ -16,6 +16,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the icon */ @XmlElement(name = "icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -25,6 +26,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param icon the icon to set */ public final void setIcon(Icon icon) { @@ -33,6 +35,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the description */ @XmlElement(name = "description", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -42,6 +45,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param description the description to set */ public final void setDescription(String description) { @@ -50,6 +54,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the displayname */ @XmlElement(name = "display-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -59,6 +64,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param displayname the displayname to set */ public final void setDisplayname(String displayname) { 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 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.Event; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class EventAdapter extends XmlAdapter<EventBean, Event> { @Override Modified: 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/EventBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,21 +21,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +package org.richfaces.cdk.xmlconfig.model; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; -package org.richfaces.cdk.xmlconfig.model; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.ComponentLibrary; - /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlType(name = "faces-eventType", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) public class EventBean { @@ -47,6 +45,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ @XmlElement(name = "event-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -56,6 +55,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(String type) { @@ -64,6 +64,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the description */ @XmlElement(name = "description", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -73,6 +74,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param description the description to set */ public void setDescription(String description) { @@ -81,6 +83,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the listenerInterface */ @XmlElement(name = "listener-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -91,6 +94,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param listenerInterface the listenerInterface to set */ public void setListenerInterface(ClassDescription listenerInterface) { @@ -99,6 +103,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the sourceInterface */ @XmlElement(name = "source-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -109,6 +114,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param sourceInterface the sourceInterface to set */ public void setSourceInterface(ClassDescription sourceInterface) { @@ -117,6 +123,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the tagHandler */ @XmlElement(name = "tag-handler-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -127,6 +134,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param tagHandler the tagHandler to set */ public void setTagHandler(ClassDescription tagHandler) { Modified: 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/ExtensibleBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensibleBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.ConfigExtension; @@ -30,14 +28,15 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class ExtensibleBean<E extends ConfigExtension> extends DescriptionGroupBean implements Extensible<E> { private E extension; /** * <p class="changed_added_4_0"></p> + * * @return the extension */ public E getExtension() { @@ -46,6 +45,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param extension the extension to set */ public void setExtension(E extension) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class FacesConfigAdapter extends XmlAdapter<FacesConfigBean, ComponentLibrary> { @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,17 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import java.util.List; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import com.google.common.collect.Lists; import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; @@ -39,12 +31,16 @@ import org.richfaces.cdk.model.Extensible; import org.richfaces.cdk.model.RenderKit; -import com.google.common.collect.Lists; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.List; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ @XmlRootElement(name = "faces-config", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public class FacesConfigBean implements Extensible<FacesConfigBean.FacesConfigExtension> { @@ -59,6 +55,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the version */ @XmlAttribute @@ -68,6 +65,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param version the version to set */ public void setVersion(String version) { @@ -76,6 +74,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the components */ public List<Component> getComponents() { @@ -84,6 +83,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param components the components to set */ public void setComponents(List<Component> components) { @@ -92,6 +92,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the renderKits */ public List<RenderKit> getRenderKits() { @@ -100,6 +101,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param renderKits the renderKits to set */ public void setRenderKits(List<RenderKit> renderKits) { @@ -108,6 +110,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the extension */ @XmlElement(name = "faces-config-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -117,6 +120,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param extension the extension to set */ public void setExtension(FacesConfigExtension extension) { @@ -134,6 +138,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param events the events to set */ public void setEvents(List<Event> events) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.Facet; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class FacetAdapter extends XmlAdapter<FacetBean, Facet> { @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,25 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.XmlElement; - import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import javax.xml.bind.annotation.XmlElement; + /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class FacetBean extends ExtensibleBean<FacetBean.FacetExtension> { private String name; /** * <p class="changed_added_4_0"></p> + * * @return the name */ @XmlElement(name = "facet-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -49,6 +48,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(String name) { @@ -57,6 +57,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the extension */ @XmlElement(name = "facet-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -71,14 +72,15 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public static final class FacetExtension extends ConfigExtension { private boolean generate; /** * <p class="changed_added_4_0"></p> + * * @return the generate */ @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -88,6 +90,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param generate the generate to set */ public void setGenerate(boolean generate) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Properties.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,25 +21,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import java.util.List; +import com.google.common.collect.Lists; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.Property; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Property; - -import com.google.common.collect.Lists; - /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ @XmlRootElement(name = "properties", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) public class Properties { @@ -47,21 +43,23 @@ /** * <p class="changed_added_4_0"></p> + * * @return the property */ @XmlElements({@XmlElement( name = "property", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = PropertyBean.class - ) , @XmlElement(name = "attribute", type = PropertyBean.class) }) + ), @XmlElement(name = "attribute", type = PropertyBean.class)}) -// @XmlElement(name="property",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) +// @XmlElement(name="property",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE) public List<Property> getProperty() { return property; } /** * <p class="changed_added_4_0"></p> + * * @param property the property to set */ public void setProperty(List<Property> property) { Modified: 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/PropertyAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class PropertyAdapter extends XmlAdapter<PropertyBean, Property> { @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,29 +21,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import java.util.List; -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.EventName; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.List; +import java.util.Set; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class PropertyBean extends ExtensibleBean<PropertyBean.PropertyExtension> { private String defaultValue; @@ -53,6 +49,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the name */ @XmlElement(name = "property-name", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -62,6 +59,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param name the name to set */ public void setName(String name) { @@ -70,6 +68,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the type */ @XmlElement(name = "property-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -80,6 +79,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param type the type to set */ public void setType(ClassDescription type) { @@ -88,6 +88,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the defaultValue */ @XmlElement(name = "default-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -97,6 +98,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param defaultValue the defaultValue to set */ public void setDefaultValue(String defaultValue) { @@ -105,6 +107,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the suggestedValue */ @XmlElement(name = "suggested-value", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -114,6 +117,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param suggestedValue the suggestedValue to set */ public void setSuggestedValue(String suggestedValue) { @@ -133,8 +137,8 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public static class PropertyExtension extends ConfigExtension { private boolean passThrough = false; @@ -149,6 +153,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the generate */ @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -158,6 +163,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param generate the generate to set */ public void setGenerate(boolean generate) { @@ -166,6 +172,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the hidden */ @XmlElement(name = "hidden", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -175,6 +182,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param hidden the hidden to set */ public void setHidden(boolean hidden) { @@ -183,6 +191,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the literal */ @XmlElement(name = "literal", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -192,6 +201,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param literal the literal to set */ public void setLiteral(boolean literal) { @@ -200,6 +210,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the required */ @XmlElement(name = "required", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -209,6 +220,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param required the required to set */ public void setRequired(boolean required) { @@ -217,6 +229,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the readOnly */ @XmlElement(name = "read-only", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -226,6 +239,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param readOnly the readOnly to set */ public void setReadOnly(boolean readOnly) { @@ -234,6 +248,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the passThrough */ @XmlElement(name = "pass-through", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -243,6 +258,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param passThrough the passThrough to set */ public void setPassThrough(boolean passThrough) { @@ -251,6 +267,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the eventNames */ @XmlElement(name = "event-name", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -260,6 +277,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param eventNames the eventNames to set */ public void setEventNames(Set<EventName> eventNames) { @@ -268,6 +286,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the signature */ @XmlElementWrapper(name = "signature", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -279,6 +298,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param signature the signature to set */ public void setSignature(List<ClassDescription> signature) { @@ -287,6 +307,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the aliases */ @XmlElement(name = "alias", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -296,6 +317,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param aliases the aliases to set */ public void setAliases(Set<String> aliases) { Modified: 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/RenderKitAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.RenderKit; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class RenderKitAdapter extends XmlAdapter<RenderKitBean, RenderKit> { @Override Modified: 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/RenderKitBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,29 +21,24 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import java.util.List; - -import javax.faces.render.RenderKitFactory; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import com.google.common.collect.Lists; import org.richfaces.cdk.model.BehaviorRenderer; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.Renderer; -import com.google.common.collect.Lists; +import javax.faces.render.RenderKitFactory; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.List; /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> { @XmlElement(name = "render-kit-id", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -60,6 +55,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the renderkitClass */ public ClassDescription getRenderkitClass() { @@ -68,6 +64,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param renderkitClass the renderkitClass to set */ public void setRenderkitClass(ClassDescription renderkitClass) { @@ -76,6 +73,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the id */ public String getId() { @@ -84,6 +82,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param id the id to set */ public void setId(String id) { @@ -92,6 +91,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the renderers */ public List<Renderer> getRenderers() { @@ -100,6 +100,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param renderers the renderers to set */ public void setRenderers(List<Renderer> renderers) { @@ -108,6 +109,7 @@ /** * <p class="changed_added_4_0"></p> + * * @return the extension */ @XmlElement(name = "render-kit-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -117,6 +119,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param extension the extension to set */ public void setExtension(RenderKitExtension extension) { @@ -125,8 +128,9 @@ /** * <p class="changed_added_4_0"></p> + * * @author asmirnov(a)exadel.com - * */ - public static class RenderKitExtension extends ConfigExtension {} + public static class RenderKitExtension extends ConfigExtension { + } } Modified: 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/RendererAdapter.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,19 +21,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlconfig.model; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.richfaces.cdk.model.Renderer; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import javax.xml.bind.annotation.adapters.XmlAdapter; + /** * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com * + * @author asmirnov(a)exadel.com */ public class RendererAdapter extends XmlAdapter<RendererBean, Renderer> { @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -23,31 +23,27 @@ package org.richfaces.cdk.xmlconfig.model; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import com.google.common.collect.Lists; import org.richfaces.cdk.model.Attribute; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Property; import org.richfaces.cdk.model.Tag; -import com.google.common.collect.Lists; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.List; /** * <p class="changed_added_4_0"> * </p> - * + * * @author asmirnov(a)exadel.com - * */ @XmlType(name = "faces-config-rendererType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public class RendererBean extends - ExtensibleBean<RendererBean.RendererExtension> { + ExtensibleBean<RendererBean.RendererExtension> { private List<Attribute> attributes = Lists.newArrayList(); private String family; @@ -57,7 +53,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the type */ @XmlElement(name = "renderer-type", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -68,9 +64,8 @@ /** * <p class="changed_added_4_0"> * </p> - * - * @param type - * the type to set + * + * @param type the type to set */ public void setType(String type) { this.type = type; @@ -79,7 +74,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the family */ @XmlElement(name = "component-family", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -90,9 +85,8 @@ /** * <p class="changed_added_4_0"> * </p> - * - * @param family - * the family to set + * + * @param family the family to set */ public void setFamily(String family) { this.family = family; @@ -101,7 +95,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the rendererClass */ @XmlElement(name = "renderer-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -113,9 +107,8 @@ /** * <p class="changed_added_4_0"> * </p> - * - * @param rendererClass - * the rendererClass to set + * + * @param rendererClass the rendererClass to set */ public void setRendererClass(ClassDescription rendererClass) { this.rendererClass = rendererClass; @@ -124,7 +117,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the attributes */ @XmlElement(name = "attribute", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = AttributeBean.class) @@ -135,9 +128,8 @@ /** * <p class="changed_added_4_0"> * </p> - * - * @param attributes - * the attributes to set + * + * @param attributes the attributes to set */ public void setAttributes(List<Attribute> attributes) { this.attributes = attributes; @@ -146,7 +138,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the extension */ @XmlElement(name = "renderer-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @@ -162,9 +154,8 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @author asmirnov(a)exadel.com - * */ public static class RendererExtension extends ConfigExtension { private Tag tag; @@ -174,7 +165,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the tag */ @XmlElement(name = "tag", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -185,9 +176,8 @@ /** * <p class="changed_added_4_0"> * </p> - * - * @param tag - * the tag to set + * + * @param tag the tag to set */ public void setTag(Tag tag) { this.tag = tag; @@ -196,7 +186,7 @@ /** * <p class="changed_added_4_0"> * </p> - * + * * @return the rendersChildren */ @XmlElement(name = "renders-children", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE) @@ -207,9 +197,8 @@ /** * <p class="changed_added_4_0"> * </p> - * - * @param rendersChildren - * the rendersChildren to set + * + * @param rendersChildren the rendersChildren to set */ public void setRendersChildren(boolean rendersChildren) { this.rendersChildren = rendersChildren; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -7,23 +7,23 @@ */ @XmlAccessorType(XmlAccessType.NONE) @javax.xml.bind.annotation.XmlSchema(namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - location = ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION, - xmlns = {(a)javax.xml.bind.annotation.XmlNs(prefix = "cdk", - namespaceURI = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)}) + location = ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION, + xmlns = {(a)javax.xml.bind.annotation.XmlNs(prefix = "cdk", + namespaceURI = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)}) @XmlJavaTypeAdapters({@XmlJavaTypeAdapter(type = Property.class, value = PropertyAdapter.class), - @XmlJavaTypeAdapter(type = Attribute.class, value = AttributeAdapter.class), - @XmlJavaTypeAdapter(type = ClassDescription.class, value = ClassAdapter.class), - @XmlJavaTypeAdapter(type = ComponentLibrary.class, value = FacesConfigAdapter.class) + @XmlJavaTypeAdapter(type = Attribute.class, value = AttributeAdapter.class), + @XmlJavaTypeAdapter(type = ClassDescription.class, value = ClassAdapter.class), + @XmlJavaTypeAdapter(type = ComponentLibrary.class, value = FacesConfigAdapter.class) }) package org.richfaces.cdk.xmlconfig.model; +import org.richfaces.cdk.model.Attribute; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.Property; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; -import org.richfaces.cdk.model.Attribute; -import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Property; - Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils; -import java.util.Comparator; - import org.w3c.dom.Node; +import java.util.Comparator; + /** * @author Nick Belaevski * @since 3.2.2 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/ParsingException.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -5,7 +5,7 @@ public class ParsingException extends CdkException { /** - * <p class="changed_added_4_0"></p> + * <p class="changed_added_4_0"></p> */ private static final long serialVersionUID = 1629210103196620913L; @@ -18,6 +18,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message */ public ParsingException(String message) { @@ -26,6 +27,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param cause */ public ParsingException(Throwable cause) { @@ -34,6 +36,7 @@ /** * <p class="changed_added_4_0"></p> + * * @param message * @param cause */ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,35 +19,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; - import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + class ArrayNodeList implements NodeList { private Node[] nodes; @@ -69,13 +64,11 @@ } } - /** * This class must read XML file from input stream and can extract body of root * element for include into target in generation. * * @author shura - * */ public class XMLBody { private Element rootElement; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,10 +19,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -30,19 +37,8 @@ import java.util.List; import java.util.Set; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - /** * @author Maksim Kaszynski - * */ public class XMLBodyMerge implements NodeList { private Document document = null; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils; -import java.io.StringWriter; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.NodeList; import javax.xml.transform.ErrorListener; import javax.xml.transform.Transformer; @@ -31,14 +31,10 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import java.io.StringWriter; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentFragment; -import org.w3c.dom.NodeList; - /** * @author Maksim Kaszynski - * */ public class XMLBodySerializer { public String serialize(NodeList childNodes, Document xmlDocument) throws ParsingException { @@ -54,9 +50,14 @@ Transformer transformer = transformerFactory.newTransformer(); transformer.setErrorListener(new ErrorListener() { - public void error(TransformerException exception) throws TransformerException {} - public void fatalError(TransformerException exception) throws TransformerException {} - public void warning(TransformerException exception) throws TransformerException {} + public void error(TransformerException exception) throws TransformerException { + } + + public void fatalError(TransformerException exception) throws TransformerException { + } + + public void warning(TransformerException exception) throws TransformerException { + } }); transformer.setOutputProperty("indent", "yes"); transformer.setOutputProperty("omit-xml-declaration", "yes"); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,21 +19,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils; -import java.util.Comparator; +import org.w3c.dom.Node; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import java.util.Comparator; -import org.w3c.dom.Node; - /** * @author Maksim Kaszynski - * */ public class XPathComparator implements Comparator<Node> { private XPathCompatorCriterion[] criteria; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Attribute.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Attribute.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Attribute.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd; /** * @author Maksim Kaszynski - * */ public class Attribute extends Node { public Attribute(String name) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinition.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinition.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinition.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,18 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd; import java.net.URL; - import java.util.HashMap; import java.util.Map; /** * @author Maksim Kaszynski - * */ public class DocumentDefinition { private Map<String, Element> elements = new HashMap<String, Element>(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,17 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd; -import java.net.URL; - import org.richfaces.cdk.xmlutils.dtd.wutka.WutkaDefinitionFactory; +import java.net.URL; + /** * @author Maksim Kaszynski - * */ public abstract class DocumentDefinitionFactory { private static DocumentDefinitionFactory instance = new WutkaDefinitionFactory(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Element.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Element.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Element.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd; import java.util.HashMap; @@ -28,7 +26,6 @@ /** * @author Maksim Kaszynski - * */ public class Element extends Node { private Map<String, Attribute> attributes = new HashMap<String, Attribute>(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Node.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Node.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/Node.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,14 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd; /** * Reduced DOM - * @author Maksim Kaszynski * + * @author Maksim Kaszynski */ public class Node { private String name; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -19,16 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd.wutka; -import java.net.URL; - -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - +import com.wutka.dtd.DTD; +import com.wutka.dtd.DTDAttribute; +import com.wutka.dtd.DTDElement; +import com.wutka.dtd.DTDParser; import org.richfaces.cdk.Logger; import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.xmlutils.dtd.Attribute; @@ -36,14 +32,13 @@ import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; import org.richfaces.cdk.xmlutils.dtd.Element; -import com.wutka.dtd.DTD; -import com.wutka.dtd.DTDAttribute; -import com.wutka.dtd.DTDElement; -import com.wutka.dtd.DTDParser; +import java.net.URL; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * @author Maksim Kaszynski - * */ public class WutkaDefinitionFactory extends DocumentDefinitionFactory { private final Logger log = LoggerFactory.getLogger(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,17 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.xmlutils.dtd.xerces; -import java.io.IOException; - -import java.net.URL; - -import java.util.HashMap; -import java.util.Map; - import org.apache.xerces.impl.Constants; import org.apache.xerces.parsers.XMLGrammarPreparser; import org.apache.xerces.xni.XNIException; @@ -40,12 +31,16 @@ import org.apache.xerces.xni.grammars.XSGrammar; import org.apache.xerces.xni.parser.XMLInputSource; import org.apache.xerces.xs.XSModel; - import org.richfaces.cdk.Logger; import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + /** * <p class="changed_added_4_0"> * That class implements {@link DocumentDefinitionFactory} that parses XML @@ -53,11 +48,12 @@ * </p> * * @author asmirnov(a)exadel.com - * */ public class XercesDefinitionFactory extends DocumentDefinitionFactory { - /** Namespaces feature id (http://xml.org/sax/features/namespaces). */ + /** + * Namespaces feature id (http://xml.org/sax/features/namespaces). + */ public static final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces"; /** @@ -73,27 +69,39 @@ */ public static final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema"; - /** Validation feature id (http://xml.org/sax/features/validation). */ + /** + * Validation feature id (http://xml.org/sax/features/validation). + */ public static final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation"; - /** Property identifier: symbol table. */ + /** + * Property identifier: symbol table. + */ public static final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY; - /** Property identifier: grammar pool . */ + /** + * Property identifier: grammar pool . + */ public static final String GRAMMAR_POOL = Constants.XERCES_PROPERTY_PREFIX + Constants.XMLGRAMMAR_POOL_PROPERTY; - /** Property identifier: error reporter. */ + /** + * Property identifier: error reporter. + */ public static final String ERROR_REPORTER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY; - /** Property identifier: error handler. */ + /** + * Property identifier: error handler. + */ public static final String ERROR_HANDLER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_HANDLER_PROPERTY; - /** Property identifier: entity resolver. */ + /** + * Property identifier: entity resolver. + */ public static final String ENTITY_RESOLVER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY; // feature: continue-after-fatal-error public static final String CONTINUE_AFTER_FATAL_ERROR = Constants.XERCES_FEATURE_PREFIX - + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE; + + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE; private final Logger log = LoggerFactory.getLogger(); private Map<URL, DocumentDefinition> definitions = new HashMap<URL, DocumentDefinition>(); Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-12-04 19:28:29 UTC (rev 16066) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-12-04 20:11:46 UTC (rev 16067) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.builder.mojo; import org.apache.maven.model.FileSet; @@ -32,32 +30,44 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.DirectoryScanner; - import org.richfaces.builder.maven.MavenLogger; -import org.richfaces.cdk.*; +import org.richfaces.cdk.CdkContextBase; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.LibraryBuilder; +import org.richfaces.cdk.LoggerFactory; +import org.richfaces.cdk.ModelValidator; +import org.richfaces.cdk.NamingConventions; +import org.richfaces.cdk.RichFacesConventions; +import org.richfaces.cdk.StandardOutputFolders; +import org.richfaces.cdk.StandardSources; +import org.richfaces.cdk.ValidatorImpl; import org.richfaces.cdk.model.ComponentLibrary; import java.io.File; - import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; /** * <p class="changed_added_4_0"> * </p> * * @author asmirnov(a)exadel.com - * * @goal generate * @requiresDependencyResolution compile * @phase generate-sources */ public class GenerateMojo extends AbstractMojo { - private static final String[] JAVA_INCLUDES = new String[] {"**/*.java"}; + private static final String[] JAVA_INCLUDES = new String[]{"**/*.java"}; private static final String MAIN_CONFIG = "src/main/config"; private static final String MAIN_TEMPLATES = "src/main/templates"; private static final String[] STRINGS_ARRAY = new String[0]; @@ -85,6 +95,7 @@ * The list of JSF configuration files that will be processed by CDK. * By default, CDK looks for all files in the <code>src/main/config</code> folder * with "xml" extension. + * * @parameter */ protected FileSet[] facesConfigs; @@ -113,8 +124,7 @@ /** * Directory where the output Java Files will be located. * - * @parameter - * expression="${project.build.directory}/generated-sources/main/resources" + * @parameter expression="${project.build.directory}/generated-sources/main/resources" */ protected File outputResourcesDirectory; @@ -126,8 +136,7 @@ /** * Directory where the output Java Files will be located. * - * @parameter - * expression="${project.build.directory}/generated-sources/test/resources" + * @parameter expression="${project.build.directory}/generated-sources/test/resources" */ protected File outputTestResourcesDirectory; @@ -142,6 +151,7 @@ /** * List of filename patterns that will be excluded from process by annotations processor. * By default, all *.java files will be processed. + * * @parameter */ protected String[] sourceExcludes; @@ -149,6 +159,7 @@ /** * List of filename patterns that will be included to process by annotations processor. * By default, all *.java files will be processed. + * * @parameter */ protected String[] sourceIncludes; @@ -157,6 +168,7 @@ * The list of Renderer template files that will be processed by CDK. * By default, CDK looks for all files in the <code>src/main/templates</code> folder * with "xml" extension. + * * @parameter */ protected FileSet[] templates; @@ -173,11 +185,11 @@ */ @Override public void execute() throws MojoExecutionException, MojoFailureException { - if ("pom".equals(project.getPackaging())) { - getLog().info("Skipping 'pom' packaging project: " + project.getModel().getId()); - return; - } - + if ("pom".equals(project.getPackaging())) { + getLog().info("Skipping 'pom' packaging project: " + project.getModel().getId()); + return; + } + // Setup logger. LoggerFactory.setLogger(new MavenLogger(getLog())); @@ -303,6 +315,7 @@ /** * <p class="changed_added_4_0">This utility method sets output directory for particular type. * I such directory does not exist, it is created.</p> + * * @param context * @param directory * @param type @@ -324,14 +337,14 @@ } private File resolveRelativePath(File file) { - File result = file; - if (!result.isAbsolute()) { - result = new File(project.getBasedir(), result.getPath()); - } - - return result; + File result = file; + if (!result.isAbsolute()) { + result = new File(project.getBasedir(), result.getPath()); + } + + return result; } - + private Iterable<File> findTemplateFiles() throws MojoExecutionException { if (null == templates) { File defaultDirectory = resolveRelativePath(new File(MAIN_TEMPLATES)); @@ -341,7 +354,7 @@ fileSet.setDirectory(MAIN_TEMPLATES); fileSet.addInclude(XML_INCLUDES); - templates = new FileSet[] {fileSet}; + templates = new FileSet[]{fileSet}; } } @@ -373,7 +386,7 @@ fileSet.setDirectory(MAIN_CONFIG); fileSet.addInclude(XML_INCLUDES); - facesConfigs = new FileSet[] {fileSet}; + facesConfigs = new FileSet[]{fileSet}; } } @@ -390,7 +403,7 @@ urls[i++] = new File(outputDirectory).toURI().toURL(); - for (Iterator<String> iter = classpathElements.iterator(); iter.hasNext(); ) { + for (Iterator<String> iter = classpathElements.iterator(); iter.hasNext();) { String element = iter.next(); urls[i++] = new File(element).toURI().toURL(); @@ -437,10 +450,10 @@ String[] includes = (String[]) fileSet.getIncludes().toArray(STRINGS_ARRAY); String[] excludes = (String[]) fileSet.getExcludes().toArray(STRINGS_ARRAY); File fileSetDirectory = resolveRelativePath(new File(fileSet.getDirectory())); - String[] scan = doScan(includes, excludes, fileSetDirectory); + String[] scan = doScan(includes, excludes, fileSetDirectory); for (String filename : scan) { - files.add(resolveRelativePath(new File(fileSetDirectory, filename))); + files.add(resolveRelativePath(new File(fileSetDirectory, filename))); } } }