Author: Alex.Kolonitsky Date: 2010-03-22 07:44:47 -0400 (Mon, 22 Mar 2010) New Revision: 16645 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ Removed: root/cdk/trunk/plugins/generator/src/main/java/org/ajax4jsf/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/dtd/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/templatecompiler/ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/types/ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/CdkConfiguration.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.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/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/builder/model/Argument.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ClassImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaAnnotation.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaClass.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaComment.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaConstructor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaField.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaLanguageElement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaModifier.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPackage.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPrimitive.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBody.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementsContainer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/RuntimeImport.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELNodeConstants.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELParserUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ParsingException.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstBracketSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstChoiceTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFloatingPointTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFunctionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIdentifierTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIntegerTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstMethodSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNegativeTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstPropertySuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ITreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean2.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ELParserTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/UIComponent.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java Log: RF-8232 Tags support Change stucture Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -34,7 +34,7 @@ import java.util.Map; import org.richfaces.cdk.apt.AptModule; -import org.richfaces.cdk.freemarker.FreeMakerModule; +import org.richfaces.cdk.generate.freemarker.FreeMakerModule; import org.richfaces.cdk.generate.java.ClassGeneratorModule; import org.richfaces.cdk.generate.java.taghandler.TagHandlerModule; import org.richfaces.cdk.generate.taglib.TaglibModule; Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker (from rev 16644, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/CdkConfiguration.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/CdkConfiguration.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import org.richfaces.cdk.Logger; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMakerModule.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import com.google.inject.AbstractModule; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -23,7 +23,7 @@ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import freemarker.template.Configuration; import freemarker.template.Template; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/LibraryModelWrapper.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -23,7 +23,7 @@ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import org.richfaces.cdk.model.ModelElementBase; import org.richfaces.cdk.model.TagModel; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -23,7 +23,7 @@ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -23,7 +23,7 @@ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/TagTemplateModel.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.freemarker; +package org.richfaces.cdk.generate.freemarker; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -29,7 +29,7 @@ import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Output; import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.freemarker.FreeMarkerRenderer; +import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer; import org.richfaces.cdk.model.BehaviorModel; import org.richfaces.cdk.model.ComponentLibrary; 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -32,7 +32,7 @@ import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Output; import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.freemarker.FreeMarkerRenderer; +import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -29,7 +29,7 @@ import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Output; import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.freemarker.FreeMarkerRenderer; +import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConverterModel; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -29,7 +29,7 @@ import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Output; import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.freemarker.FreeMarkerRenderer; +import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ValidatorModel; 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/AbstractTemplateMethodBodyStatementsContainer.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,7 +21,7 @@ */ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatementsContainer; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatementsContainer; /** * @author Nick Belaevski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/BaseTemplateMethodBodyStatement.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,7 +21,7 @@ */ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatement; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement; /** * @author Nick Belaevski 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,7 +21,7 @@ */ package org.richfaces.cdk.templatecompiler; -import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.Type; /** * @author Nick Belaevski 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/IfStatement.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,7 +21,7 @@ */ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatementsContainer; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatementsContainer; public final class IfStatement extends MethodBodyStatementsContainer { 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -1,6 +1,6 @@ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatement; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement; import freemarker.ext.beans.BeansWrapper; import freemarker.template.ObjectWrapper; 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -23,7 +23,7 @@ package org.richfaces.cdk.templatecompiler; -import org.richfaces.builder.model.MethodBodyStatement; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement; import freemarker.ext.beans.BeanModel; import freemarker.template.TemplateModel; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -25,7 +25,7 @@ import com.google.inject.Inject; import freemarker.template.TemplateException; -import org.richfaces.builder.model.JavaClass; +import org.richfaces.cdk.templatecompiler.builder.model.JavaClass; import org.richfaces.cdk.*; import org.richfaces.cdk.model.*; import org.richfaces.cdk.model.RendererModel.Type; 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 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -27,13 +27,13 @@ import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import org.richfaces.builder.model.Argument; -import org.richfaces.builder.model.JavaClass; -import org.richfaces.builder.model.JavaField; -import org.richfaces.builder.model.JavaMethod; -import org.richfaces.builder.model.JavaModifier; -import org.richfaces.builder.model.MethodBody; -import org.richfaces.builder.model.MethodBodyStatementsContainer; +import org.richfaces.cdk.templatecompiler.builder.model.Argument; +import org.richfaces.cdk.templatecompiler.builder.model.JavaClass; +import org.richfaces.cdk.templatecompiler.builder.model.JavaField; +import org.richfaces.cdk.templatecompiler.builder.model.JavaMethod; +import org.richfaces.cdk.templatecompiler.builder.model.JavaModifier; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBody; +import org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatementsContainer; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.Logger; import org.richfaces.cdk.attributes.Attribute; @@ -42,12 +42,12 @@ import org.richfaces.cdk.attributes.SchemaSet; import org.richfaces.cdk.model.EventName; import org.richfaces.cdk.model.PropertyBase; -import org.richfaces.cdk.parser.el.ELParserUtils; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.HelperMethod; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELParserUtils; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.HelperMethod; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; import static org.richfaces.cdk.templatecompiler.QNameComparator.QNAME_COMPARATOR; import org.richfaces.cdk.templatecompiler.model.AnyElement; import org.richfaces.cdk.templatecompiler.model.CdkBodyElement; Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model (from rev 16644, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/Argument.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/Argument.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/Argument.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * Representation of method argument Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ClassImport.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/ClassImport.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/ClassImport.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * @author Maksim Kaszynski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaAnnotation.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaAnnotation.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaAnnotation.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.ArrayList; import java.util.Arrays; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaClass.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaClass.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaClass.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.ArrayList; import java.util.Comparator; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaComment.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaComment.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaComment.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * Java comment representation Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaConstructor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaConstructor.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaConstructor.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * Constructor method Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaField.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaField.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaField.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaImport.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaImport.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaImport.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * @author Maksim Kaszynski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaLanguageElement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaLanguageElement.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaLanguageElement.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.ArrayList; import java.util.List; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaMethod.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.ArrayList; import java.util.Arrays; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaModifier.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaModifier.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaModifier.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * @author Maksim Kaszynski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPackage.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPackage.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPackage.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * @author Maksim Kaszynski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPrimitive.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/JavaPrimitive.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaPrimitive.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.HashMap; import java.util.Map; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBody.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBody.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBody.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.HashSet; import java.util.Set; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatement.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatement.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementImpl.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementImpl.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementsContainer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/MethodBodyStatementsContainer.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; import java.util.ArrayList; import java.util.List; @@ -59,7 +59,7 @@ } /* (non-Javadoc) - * @see org.richfaces.builder.model.MethodBodyStatement#getCode() + * @see org.richfaces.cdk.templatecompiler.builder.model.MethodBodyStatement#getCode() */ @Override public String getCode(FreeMarkerRenderer renderer) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/RuntimeImport.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/model/RuntimeImport.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/RuntimeImport.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.builder.model; +package org.richfaces.cdk.templatecompiler.builder.model; /** * Implementation of import taht cannot be resolved in design time Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el (from rev 16644, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELNodeConstants.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELNodeConstants.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el; +package org.richfaces.cdk.templatecompiler.el; public final class ELNodeConstants { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELParserUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELParserUtils.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el; +package org.richfaces.cdk.templatecompiler.el; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -70,29 +70,29 @@ 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.BinaryArithmeticIntegerOperationTreeNode; -import org.richfaces.cdk.parser.el.node.BinaryArithmeticOperationTreeNode; -import org.richfaces.cdk.parser.el.node.BinaryBooleanOperationTreeNode; -import org.richfaces.cdk.parser.el.node.BinaryBooleanResultOperationTreeNode; -import org.richfaces.cdk.parser.el.node.ConstantValueTreeNode; -import org.richfaces.cdk.parser.el.node.EqualityTestTreeNode; -import org.richfaces.cdk.parser.el.node.ITreeNode; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.node.AstBracketSuffixTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstChoiceTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstDeferredOrDynamicExpressionTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstEmptyTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstFloatingPointTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstFunctionTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstIdentifierTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstIntegerTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstLiteralTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstMethodSuffixTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstNegativeTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstNotTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstPropertySuffixTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstStringTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.AstValueTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.BinaryArithmeticIntegerOperationTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.BinaryArithmeticOperationTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.BinaryBooleanOperationTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.BinaryBooleanResultOperationTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.ConstantValueTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.EqualityTestTreeNode; +import org.richfaces.cdk.templatecompiler.el.node.ITreeNode; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * Class, that encapsulate all functionality, related to Reflection calls, such as loading classes, get property Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el; +package org.richfaces.cdk.templatecompiler.el; -import static org.richfaces.cdk.parser.el.HelperMethod.TO_STRING_CONVERSION; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION; import static org.richfaces.cdk.util.JavaUtils.getEscapedString; import java.text.MessageFormat; @@ -32,8 +32,8 @@ 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 org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.node.ITreeNode; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * Entry point for parsing EL expressions. @see parse() method. * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/HelperMethod.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,12 +19,12 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el; +package org.richfaces.cdk.templatecompiler.el; -import static org.richfaces.cdk.parser.el.ELNodeConstants.CONVERT_TO_BOOLEAN_FUNCTION; -import static org.richfaces.cdk.parser.el.ELNodeConstants.CONVERT_TO_STRING_FUNCTION; -import static org.richfaces.cdk.parser.el.ELNodeConstants.IS_EMPTY_FUNCTION; -import static org.richfaces.cdk.parser.el.ELNodeConstants.IS_EQUAL_FUNCTION; +import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.CONVERT_TO_BOOLEAN_FUNCTION; +import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.CONVERT_TO_STRING_FUNCTION; +import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.IS_EMPTY_FUNCTION; +import static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.IS_EQUAL_FUNCTION; import java.util.EnumSet; import java.util.Set; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ParsingException.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ParsingException.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ParsingException.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el; +package org.richfaces.cdk.templatecompiler.el; /** * Parsing Exception Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/Type.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/Type.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el; +package org.richfaces.cdk.templatecompiler.el; import java.util.Collection; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBinaryOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractBinaryOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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.Type; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; /** * <p> @@ -55,8 +55,8 @@ /* * (non-Javadoc) * - * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, - * org.richfaces.cdk.parser.el.ELVisitor) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, + * org.richfaces.cdk.templatecompiler.el.ELVisitor) */ @Override public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractMethodTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,18 +19,18 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import java.util.ArrayList; import java.util.List; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELNodeConstants; -import org.richfaces.cdk.parser.el.ELParserUtils; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELParserUtils; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AbstractTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELParserUtils; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELParserUtils; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This abstract class implement some methods of ITreeNode interface to using in subclasses. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstBracketSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstBracketSuffixTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,15 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstBracketSuffix node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstChoiceTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstChoiceTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,14 +21,14 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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.Type; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; /** * This class extend AbstractTreeNode and wrap AstChoice node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; -import static org.richfaces.cdk.parser.el.HelperMethod.TO_STRING_CONVERSION; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION; 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.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstDeferredExpression node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,15 +21,15 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; -import static org.richfaces.cdk.parser.el.HelperMethod.EMPTINESS_CHECK; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EMPTINESS_CHECK; 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.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstEmpty node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFloatingPointTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFloatingPointTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,14 +21,14 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstFloatingPoint node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFunctionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstFunctionTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,15 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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 org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; import org.richfaces.cdk.util.Strings; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIdentifierTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIdentifierTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; /** * This class extend AbstractTreeNode and wrap AstIdentifier node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIntegerTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstIntegerTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,13 +21,13 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstInteger node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,14 +21,14 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; import static org.richfaces.cdk.util.JavaUtils.getEscapedString; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstLiteral node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstMethodSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstMethodSuffixTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; /** * This class extend AbstractTreeNode and wrap AstMethodSuffix node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNegativeTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNegativeTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,13 +21,13 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; /** * This class extend AbstractTreeNode and wrap AstNegative node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,13 +21,13 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; 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.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; /** * This class extend AbstractTreeNode and wrap AstNot node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstPropertySuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstPropertySuffixTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,18 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import java.beans.PropertyDescriptor; import java.lang.reflect.Method; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELNodeConstants; -import org.richfaces.cdk.parser.el.ELParserUtils; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELParserUtils; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstPropertySuffix node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -21,15 +21,15 @@ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.AstString; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; import static org.richfaces.cdk.util.JavaUtils.getEscapedString; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstString node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstValueTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; /** * This class extend AbstractTreeNode and wrap AstValue node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticIntegerOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticIntegerOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,14 +19,14 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski @@ -43,7 +43,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) */ @Override protected Type getOperationType(Type firstArgumentType, @@ -52,7 +52,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.templatecompiler.el.ELVisitor) */ @Override protected String getCoercedChildOutput(int childIndex, ELVisitor visitor) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryArithmeticOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski @@ -42,7 +42,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) */ @Override protected Type getOperationType(Type firstArgumentType, @@ -60,7 +60,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getCoercedChildOutput(int, java.util.Map, org.richfaces.cdk.templatecompiler.el.ELVisitor) */ @Override protected String getCoercedChildOutput(int childIndex, ELVisitor visitor) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski @@ -42,7 +42,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) */ @Override protected Type getOperationType(Type firstArgumentType, Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanResultOperationTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/BinaryBooleanResultOperationTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski @@ -42,7 +42,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractBinaryOperationTreeNode#getOperationType(java.lang.reflect.Type, java.lang.reflect.Type) */ @Override protected Type getOperationType(Type firstArgumentType, Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ConstantValueTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,14 +19,14 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.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.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski @@ -58,8 +58,8 @@ /* * (non-Javadoc) * - * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, - * org.richfaces.cdk.parser.el.ELVisitor) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, + * org.richfaces.cdk.templatecompiler.el.ELVisitor) */ @Override public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/EqualityTestTreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,16 +19,16 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; -import static org.richfaces.cdk.parser.el.HelperMethod.EQUALS_CHECK; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EQUALS_CHECK; 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.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski @@ -72,7 +72,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) + * @see org.richfaces.cdk.templatecompiler.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.templatecompiler.el.ELVisitor) */ @Override public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ITreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/ITreeNode.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.node; +package org.richfaces.cdk.templatecompiler.el.node; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import org.richfaces.cdk.templatecompiler.el.ParsingException; /** * Interface for all wrappers of org.jboss.el.parser.Node class. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ComplexType.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,17 +19,17 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.types; +package org.richfaces.cdk.templatecompiler.el.types; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.util.ArrayUtils; + import java.lang.reflect.Array; import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.util.ArrayUtils; - /** * @author Nick Belaevski * @@ -54,7 +54,7 @@ /* * (non-Javadoc) * - * @see org.richfaces.cdk.parser.el.Type#getImportsList() + * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsList() */ @Override public Collection<Class<?>> getImportsList() { @@ -71,7 +71,7 @@ /* * (non-Javadoc) * - * @see org.richfaces.cdk.parser.el.Type#isNullType() + * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType() */ @Override public boolean isNullType() { @@ -81,7 +81,7 @@ /* * (non-Javadoc) * - * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments() */ @Override public Type[] getTypeArguments() { @@ -104,7 +104,7 @@ /* * (non-Javadoc) * - * @see org.richfaces.cdk.parser.el.Type#getCode() + * @see org.richfaces.cdk.templatecompiler.el.Type#getCode() */ @Override public String getCode() { @@ -178,7 +178,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getRawType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType() */ @Override public Class<?> getRawType() { @@ -199,7 +199,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isArray() + * @see org.richfaces.cdk.templatecompiler.el.Type#isArray() */ @Override public boolean isArray() { @@ -207,7 +207,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type) */ @Override public boolean isAssignableFrom(Type anotherType) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/NullType.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,12 +19,12 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.types; +package org.richfaces.cdk.templatecompiler.el.types; import java.util.Collection; import java.util.Collections; -import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.Type; /** * @author Nick Belaevski @@ -42,7 +42,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getCode() + * @see org.richfaces.cdk.templatecompiler.el.Type#getCode() */ @Override public String getCode() { @@ -50,7 +50,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getImportsIterator() + * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsIterator() */ @Override public Collection<Class<?>> getImportsList() { @@ -58,7 +58,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isNullType() + * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType() */ @Override public boolean isNullType() { @@ -66,7 +66,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getRawType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType() */ @Override public Class<?> getRawType() { @@ -74,7 +74,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments() */ @Override public Type[] getTypeArguments() { @@ -90,7 +90,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getContainerType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getContainerType() */ @Override public Type getContainerType() { @@ -98,7 +98,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isArray() + * @see org.richfaces.cdk.templatecompiler.el.Type#isArray() */ @Override public boolean isArray() { @@ -106,7 +106,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type) */ @Override public boolean isAssignableFrom(Type anotherType) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/PlainClassType.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/PlainClassType.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.types; +package org.richfaces.cdk.templatecompiler.el.types; import java.text.MessageFormat; import java.util.Arrays; import java.util.Collection; -import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.Type; /** * @author Nick Belaevski @@ -46,7 +46,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getCode() + * @see org.richfaces.cdk.templatecompiler.el.Type#getCode() */ @Override public String getCode() { @@ -54,7 +54,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getImportsIterator() + * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsIterator() */ @Override public Collection<Class<?>> getImportsList() { @@ -62,7 +62,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isNullType() + * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType() */ @Override public boolean isNullType() { @@ -70,7 +70,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getRawType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType() */ @Override public Class<?> getRawType() { @@ -78,7 +78,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments() */ @Override public Type[] getTypeArguments() { @@ -130,7 +130,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getCompositeType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getCompositeType() */ @Override public Type getContainerType() { @@ -138,7 +138,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isArray() + * @see org.richfaces.cdk.templatecompiler.el.Type#isArray() */ @Override public boolean isArray() { @@ -146,7 +146,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type) */ @Override public boolean isAssignableFrom(Type anotherType) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ReferencedType.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,13 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.types; +package org.richfaces.cdk.templatecompiler.el.types; import java.text.MessageFormat; import java.util.Collection; import java.util.Collections; -import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.Type; /** * @author Nick Belaevski @@ -46,7 +46,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getCode() + * @see org.richfaces.cdk.templatecompiler.el.Type#getCode() */ @Override public String getCode() { @@ -54,7 +54,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getImportsList() + * @see org.richfaces.cdk.templatecompiler.el.Type#getImportsList() */ @Override public Collection<Class<?>> getImportsList() { @@ -62,7 +62,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getRawType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getRawType() */ @Override public Class<?> getRawType() { @@ -70,7 +70,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isNullType() + * @see org.richfaces.cdk.templatecompiler.el.Type#isNullType() */ @Override public boolean isNullType() { @@ -78,7 +78,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + * @see org.richfaces.cdk.templatecompiler.el.Type#getTypeArguments() */ @Override public Type[] getTypeArguments() { @@ -130,7 +130,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getCompositeType() + * @see org.richfaces.cdk.templatecompiler.el.Type#getCompositeType() */ @Override public Type getContainerType() { @@ -138,7 +138,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isArray() + * @see org.richfaces.cdk.templatecompiler.el.Type#isArray() */ @Override public boolean isArray() { @@ -146,7 +146,7 @@ } /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + * @see org.richfaces.cdk.templatecompiler.el.Type#isAssignableFrom(org.richfaces.cdk.templatecompiler.el.Type) */ @Override public boolean isAssignableFrom(Type anotherType) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/TypesFactory.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.types; +package org.richfaces.cdk.templatecompiler.el.types; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; @@ -43,7 +43,7 @@ import org.richfaces.cdk.JavaLogger; import org.richfaces.cdk.Logger; -import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.templatecompiler.el.Type; import org.richfaces.cdk.util.ArrayUtils; /** Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -32,8 +32,8 @@ import org.richfaces.cdk.Mock; import org.richfaces.cdk.Output; import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.freemarker.CdkConfiguration; -import org.richfaces.cdk.freemarker.LibraryModelWrapper; +import org.richfaces.cdk.generate.freemarker.CdkConfiguration; +import org.richfaces.cdk.generate.freemarker.LibraryModelWrapper; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.EventName; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.richfaces.cdk.CdkTestRunner; -import org.richfaces.cdk.freemarker.PropertyModel; +import org.richfaces.cdk.generate.freemarker.PropertyModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConverterModel; Copied: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test (from rev 16644, root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test) Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.test; +package org.richfaces.cdk.templatecompiler.parser.el.test; import java.util.ArrayList; import java.util.HashMap; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean2.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean2.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/Bean2.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.test; +package org.richfaces.cdk.templatecompiler.parser.el.test; public class Bean2 { private String string; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ELParserTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/ELParserTest.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,29 +19,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.test; +package org.richfaces.cdk.templatecompiler.parser.el.test; +import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.richfaces.cdk.parser.el.HelperMethod.EMPTINESS_CHECK; -import static org.richfaces.cdk.parser.el.HelperMethod.EQUALS_CHECK; -import static org.richfaces.cdk.parser.el.HelperMethod.TO_BOOLEAN_CONVERSION; -import static org.richfaces.cdk.parser.el.HelperMethod.TO_STRING_CONVERSION; +import org.junit.Before; +import org.junit.Test; +import org.richfaces.cdk.templatecompiler.el.ELVisitor; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EMPTINESS_CHECK; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EQUALS_CHECK; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_BOOLEAN_CONVERSION; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION; +import org.richfaces.cdk.templatecompiler.el.ParsingException; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; - public class ELParserTest { private ELVisitor visitor; @@ -625,7 +624,7 @@ private void parseExpression(String expression, Class<?> returnType) throws ParsingException { Map<String, Type> contextMap = new HashMap<String, Type>(); - contextMap.put("action", TypesFactory.getType(org.richfaces.cdk.parser.el.test.Bean.class)); + contextMap.put("action", TypesFactory.getType(org.richfaces.cdk.templatecompiler.parser.el.test.Bean.class)); contextMap.put("clientId", TypesFactory.getType(String.class)); contextMap.put("test", TypesFactory.getType(boolean.class)); contextMap.put("otherTest", TypesFactory.getType(boolean.class)); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypesFactoryTest.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/TypesFactoryTest.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.richfaces.cdk.parser.el.test; +package org.richfaces.cdk.templatecompiler.parser.el.test; import static org.junit.Assert.*; @@ -28,8 +28,8 @@ import java.util.Map; import org.junit.Test; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.parser.el.types.TypesFactory; +import org.richfaces.cdk.templatecompiler.el.Type; +import org.richfaces.cdk.templatecompiler.el.types.TypesFactory; /** * @author Nick Belaevski Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/UIComponent.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/UIComponent.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/parser/el/test/UIComponent.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.cdk.parser.el.test; +package org.richfaces.cdk.templatecompiler.parser.el.test; public class UIComponent { private boolean rendered; Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-03-20 00:14:21 UTC (rev 16644) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-03-22 11:44:47 UTC (rev 16645) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import org.richfaces.PartialStateHolderHelper; -import org.richfaces.cdk.freemarker.PropertyModel; +import org.richfaces.cdk.generate.freemarker.PropertyModel; /** *