Author: alexsmirnov Date: 2010-05-21 15:35:20 -0400 (Fri, 21 May 2010) New Revision: 17188 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRendererModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelSet.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SimpleVisitor.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ValidatorProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.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/generate/java/taghandler/TagHandlerGeneratorVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassName.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesComponent.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesId.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Named.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/QNameComparator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateVisitorFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/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/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/AstLiteralTreeNode.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/EqualityTestTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/RendererTemplateParserTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java Log: optimise model Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,15 +23,15 @@ package org.richfaces.cdk; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; + /** * <p class="changed_added_4_0"> * </p> 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,13 +22,17 @@ package org.richfaces.cdk; -import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.collect.Maps; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Stage; -import com.google.inject.name.Names; +import static com.google.common.base.Preconditions.*; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.util.Collections; +import java.util.Locale; +import java.util.Map; + import org.richfaces.cdk.apt.AptModule; import org.richfaces.cdk.generate.freemarker.FreeMakerModule; import org.richfaces.cdk.generate.java.ClassGeneratorModule; @@ -39,14 +43,12 @@ import org.richfaces.cdk.templatecompiler.TemplateModule; import org.richfaces.cdk.xmlconfig.XmlModule; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.Writer; -import java.nio.charset.Charset; -import java.util.Collections; -import java.util.Locale; -import java.util.Map; +import com.google.common.collect.Maps; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Stage; +import com.google.inject.name.Names; /** * @author asmirnov Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,18 +1,18 @@ package org.richfaces.cdk; +import java.net.URI; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.InvalidNameException; import org.richfaces.cdk.model.Name; +import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.model.Name.Classifier; -import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.util.Strings; -import java.net.URI; -import java.util.regex.Pattern; -import java.util.regex.Matcher; - /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,14 +25,16 @@ package org.richfaces.cdk.apt; -import com.google.inject.Inject; +import java.util.Set; + +import javax.tools.JavaCompiler.CompilationTask; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.LibraryBuilder; import org.richfaces.cdk.Logger; -import javax.tools.JavaCompiler.CompilationTask; -import java.util.Set; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,8 @@ package org.richfaces.cdk.apt; -import com.google.inject.AbstractModule; -import com.google.inject.Singleton; -import com.google.inject.multibindings.Multibinder; +import javax.annotation.processing.Processor; + import org.richfaces.cdk.LibraryBuilder; import org.richfaces.cdk.apt.processors.AttributesProcessor; import org.richfaces.cdk.apt.processors.AttributesProcessorImpl; @@ -40,7 +39,9 @@ import org.richfaces.cdk.apt.processors.TagLibProcessor; import org.richfaces.cdk.apt.processors.ValidatorProcessor; -import javax.annotation.processing.Processor; +import com.google.inject.AbstractModule; +import com.google.inject.Singleton; +import com.google.inject.multibindings.Multibinder; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,32 +1,33 @@ package org.richfaces.cdk.apt; -import com.google.inject.Inject; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor; -import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.InvalidNameException; -import org.richfaces.cdk.util.PropertyUtils; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; -import javax.lang.model.element.AnnotationMirror; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.ElementFilter; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.InvalidNameException; +import org.richfaces.cdk.util.PropertyUtils; + +import com.google.inject.Inject; + public class AptSourceUtils implements SourceUtils { private static final Set<String> PROPERTIES = new HashSet<String>(Arrays.asList("getEventNames", "getDefaultEventName", "getClientBehaviors", "getFamily")); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,14 +23,11 @@ package org.richfaces.cdk.apt; -import com.google.inject.Inject; -import org.richfaces.cdk.CdkProcessingException; -import org.richfaces.cdk.LibraryBuilder; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.ModelBuilder; -import org.richfaces.cdk.ModelValidator; -import org.richfaces.cdk.apt.processors.CdkAnnotationProcessor; -import org.richfaces.cdk.model.ComponentLibrary; +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.Collections; +import java.util.Set; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.ProcessingEnvironment; @@ -41,12 +38,16 @@ import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; -import java.util.Collections; -import java.util.Set; +import org.richfaces.cdk.CdkProcessingException; +import org.richfaces.cdk.LibraryBuilder; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.ModelBuilder; +import org.richfaces.cdk.ModelValidator; +import org.richfaces.cdk.apt.processors.CdkAnnotationProcessor; +import org.richfaces.cdk.model.ComponentLibrary; +import com.google.inject.Inject; + /** * <p class="changed_added_4_0"> * Base class for all CDK Annotation processors. That class provides access to current CDK context and utility methods Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,18 +23,19 @@ package org.richfaces.cdk.apt; -import com.google.inject.ProvidedBy; -import org.richfaces.cdk.model.ClassName; +import java.lang.annotation.Annotation; +import java.util.List; +import java.util.Set; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; -import java.lang.annotation.Annotation; -import java.util.Set; -import java.util.List; +import org.richfaces.cdk.model.ClassName; +import com.google.inject.ProvidedBy; + /** * <p class="changed_added_4_0">This class provides utility methods to analayze java classes. This implementation uses APT API to get * information about Java code.</p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,13 +23,13 @@ package org.richfaces.cdk.apt; +import javax.annotation.processing.ProcessingEnvironment; + import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.Singleton; -import javax.annotation.processing.ProcessingEnvironment; - /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,35 +23,37 @@ package org.richfaces.cdk.apt; -import com.google.inject.Inject; -import org.richfaces.cdk.CdkClassLoader; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.FileManager; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.Output; -import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.Source; -import org.richfaces.cdk.Sources; +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Locale; import javax.annotation.processing.Processor; import javax.tools.Diagnostic; -import javax.tools.Diagnostic.Kind; import javax.tools.DiagnosticListener; import javax.tools.JavaCompiler; -import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; import javax.tools.ToolProvider; -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Locale; +import javax.tools.Diagnostic.Kind; +import javax.tools.JavaCompiler.CompilationTask; +import org.richfaces.cdk.CdkClassLoader; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.FileManager; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.Output; +import org.richfaces.cdk.Outputs; +import org.richfaces.cdk.Source; +import org.richfaces.cdk.Sources; + +import com.google.inject.Inject; + /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,10 +23,10 @@ package org.richfaces.cdk.apt.processors; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.model.BeanModelBase; -import javax.lang.model.element.TypeElement; - /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,9 +1,19 @@ package org.richfaces.cdk.apt.processors; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.google.inject.Inject; -import com.google.inject.Provider; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.MirroredTypeException; +import javax.lang.model.type.MirroredTypesException; +import javax.lang.model.type.TypeMirror; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.Logger; import org.richfaces.cdk.annotations.Attribute; @@ -19,18 +29,10 @@ import org.richfaces.cdk.xmlconfig.CdkEntityResolver; import org.richfaces.cdk.xmlconfig.FragmentParser; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Name; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.MirroredTypeException; -import javax.lang.model.type.MirroredTypesException; -import javax.lang.model.type.TypeMirror; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.google.inject.Inject; +import com.google.inject.Provider; public class AttributesProcessorImpl implements AttributesProcessor { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/EmptyAnnotationValueVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,12 +22,13 @@ package org.richfaces.cdk.apt.processors; +import java.util.List; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.AnnotationValueVisitor; import javax.lang.model.element.VariableElement; import javax.lang.model.type.TypeMirror; -import java.util.List; /** * @author akolonitsky Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ProcessorBase.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,5 +1,9 @@ package org.richfaces.cdk.apt.processors; +import javax.lang.model.element.Element; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.annotations.Description; import org.richfaces.cdk.annotations.Tag; @@ -11,10 +15,6 @@ import org.richfaces.cdk.model.TagModel; import org.richfaces.cdk.util.Strings; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; - import com.google.inject.Inject; import com.google.inject.Provider; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ValidatorProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ValidatorProcessor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ValidatorProcessor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,17 +21,18 @@ package org.richfaces.cdk.apt.processors; +import java.lang.annotation.Annotation; + +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.annotations.JsfValidator; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.ValidatorModel; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import java.lang.annotation.Annotation; - /** * @author akolonitsky * @since Jan 13, 2010 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/generate/freemarker/FreeMakerModule.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMakerModule.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -24,6 +24,7 @@ package org.richfaces.cdk.generate.freemarker; import com.google.inject.AbstractModule; + import freemarker.template.Configuration; import freemarker.template.ObjectWrapper; 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/generate/freemarker/FreeMarkerRenderer.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/FreeMarkerRenderer.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,9 +25,10 @@ package org.richfaces.cdk.generate.freemarker; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; +import java.io.File; +import java.io.IOException; +import java.io.Writer; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -35,9 +36,9 @@ import org.richfaces.cdk.model.ModelElementBase; import org.richfaces.cdk.model.Trackable; -import java.io.File; -import java.io.IOException; -import java.io.Writer; +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; /** * <p class="changed_added_4_0">Base class for all output file buildes that use FreeMarker as template engine.</p> 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/generate/freemarker/ModelElementBaseTemplateModel.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/ModelElementBaseTemplateModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,24 +25,26 @@ package org.richfaces.cdk.generate.freemarker; +import java.util.ArrayList; +import java.util.Collection; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.TreeSet; + +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.ModelElementBase; +import org.richfaces.cdk.model.PropertyBase; + import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; + import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.EventName; -import org.richfaces.cdk.model.ModelElementBase; -import org.richfaces.cdk.model.PropertyBase; -import java.util.ArrayList; -import java.util.Collection; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.TreeSet; - /** * <p class="changed_added_4_0"> * </p> 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/generate/freemarker/PropertyModel.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,13 +25,14 @@ package org.richfaces.cdk.generate.freemarker; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.PropertyBase; +import org.richfaces.cdk.util.Strings; + import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.PropertyBase; -import org.richfaces.cdk.util.Strings; /** * <p class="changed_added_4_0"></p> 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/generate/freemarker/TagTemplateModel.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/TagTemplateModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,6 +22,11 @@ package org.richfaces.cdk.generate.freemarker; +import java.util.ArrayList; +import java.util.Collection; +import java.util.NoSuchElementException; +import java.util.Set; + import org.richfaces.cdk.model.BehaviorModel; import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ConverterModel; @@ -31,11 +36,6 @@ import org.richfaces.cdk.model.TagModel; import org.richfaces.cdk.model.ValidatorModel; -import java.util.ArrayList; -import java.util.Collection; -import java.util.NoSuchElementException; -import java.util.Set; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,8 +22,8 @@ package org.richfaces.cdk.generate.java; -import com.google.inject.Inject; -import freemarker.template.Configuration; +import java.util.Collection; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -33,8 +33,10 @@ import org.richfaces.cdk.model.BehaviorModel; import org.richfaces.cdk.model.ComponentLibrary; -import java.util.Collection; +import com.google.inject.Inject; +import freemarker.template.Configuration; + /** * @author akolonitsky * @since Jan 21, 2010 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,8 +25,8 @@ package org.richfaces.cdk.generate.java; -import com.google.inject.Inject; -import freemarker.template.Configuration; +import java.util.Collection; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -36,8 +36,10 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; -import java.util.Collection; +import com.google.inject.Inject; +import freemarker.template.Configuration; + /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,8 +22,8 @@ package org.richfaces.cdk.generate.java; -import com.google.inject.Inject; -import freemarker.template.Configuration; +import java.util.Collection; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -33,8 +33,10 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConverterModel; -import java.util.Collection; +import com.google.inject.Inject; +import freemarker.template.Configuration; + /** * @author akolonitsky * @since Jan 20, 2010 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,8 +22,8 @@ package org.richfaces.cdk.generate.java; -import com.google.inject.Inject; -import freemarker.template.Configuration; +import java.util.Collection; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -33,8 +33,10 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ValidatorModel; -import java.util.Collection; +import com.google.inject.Inject; +import freemarker.template.Configuration; + /** * @author akolonitsky * @since Jan 15, 2010 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerGeneratorVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,8 +25,8 @@ import org.richfaces.cdk.model.BehaviorModel; import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ConverterModel; -import org.richfaces.cdk.model.EmptyVisitor; import org.richfaces.cdk.model.ModelElementBase; +import org.richfaces.cdk.model.SimpleVisitor; import org.richfaces.cdk.model.TagModel; import org.richfaces.cdk.model.ValidatorModel; @@ -36,7 +36,7 @@ * @author akolonitsky * @since Feb 22, 2010 */ -public class TagHandlerGeneratorVisitor extends EmptyVisitor<Boolean,Boolean> { +public class TagHandlerGeneratorVisitor extends SimpleVisitor<Boolean,Boolean> { private final TagHandlerClassGenerator tagGenerator; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,9 +22,10 @@ package org.richfaces.cdk.generate.java.taghandler; +import org.richfaces.cdk.CdkWriter; + import com.google.inject.AbstractModule; import com.google.inject.multibindings.Multibinder; -import org.richfaces.cdk.CdkWriter; /** * @author akolonitsky Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -32,9 +32,9 @@ import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ConverterModel; import org.richfaces.cdk.model.DescriptionGroup; -import org.richfaces.cdk.model.EmptyVisitor; import org.richfaces.cdk.model.FunctionModel; import org.richfaces.cdk.model.PropertyBase; +import org.richfaces.cdk.model.SimpleVisitor; import org.richfaces.cdk.model.TagModel; import org.richfaces.cdk.model.ValidatorModel; import org.richfaces.cdk.model.RendererModel.Type; @@ -44,14 +44,21 @@ * @author akolonitsky * @since Feb 3, 2010 */ -public class TaglibGeneratorVisitor extends EmptyVisitor<Boolean,ComponentLibrary> { +public class TaglibGeneratorVisitor extends SimpleVisitor<Boolean,ComponentLibrary> { private static final String COMPONENT = "component"; private static final String COMPONENT_TYPE = "component-type"; private static final String RENDERER_TYPE = "renderer-type"; private static final String HANDLER_CLASS = "handler-class"; + /** + * <p class="changed_added_4_0">Generated document. + * IDEA - set document as visitor patameter, to reuse this object instance.</p> + */ private Document document = DocumentHelper.createDocument(); + /** + * <p class="changed_added_4_0">faces-config element in document.</p> + */ private Element faceletTaglib; @@ -75,9 +82,9 @@ faceletTaglib.addAttribute("xsi:schemaLocation", "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"); faceletTaglib.addAttribute("version", "2.0"); - faceletTaglib.addAttribute("id", componentLibrary.getTaglib().getShortName()); + faceletTaglib.addAttribute("id", model.getTaglib().getShortName()); - faceletTaglib.addElement("namespace").addText(componentLibrary.getTaglib().getUri()); + faceletTaglib.addElement("namespace").addText(model.getTaglib().getUri()); return null; } @@ -138,6 +145,7 @@ } /** + * This method generates validator tag. * <pre> * &lt;tag&gt; * &lt;tag-name>formatValidator&lt;/tag-name&gt; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,10 @@ package org.richfaces.cdk.generate.taglib; +import org.richfaces.cdk.CdkWriter; + import com.google.inject.AbstractModule; import com.google.inject.multibindings.Multibinder; -import org.richfaces.cdk.CdkWriter; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,7 +22,9 @@ package org.richfaces.cdk.generate.taglib; -import com.google.inject.Inject; +import java.io.IOException; +import java.io.Writer; + import org.dom4j.Document; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; @@ -34,8 +36,7 @@ import org.richfaces.cdk.Outputs; import org.richfaces.cdk.model.ComponentLibrary; -import java.io.IOException; -import java.io.Writer; +import com.google.inject.Inject; /** * @author akolonitsky Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BeanModelBase.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,7 +22,6 @@ package org.richfaces.cdk.model; -import java.util.Collection; import java.util.Comparator; /** @@ -35,7 +34,7 @@ public class BeanModelBase extends DescriptionGroupBase { private final ModelCollection<PropertyBase> attributes = - ModelCollection.<PropertyBase> create(new Comparator<PropertyBase>() { + ModelSet.<PropertyBase> create(new Comparator<PropertyBase>() { @Override public int compare(PropertyBase o1, PropertyBase o2) { @@ -54,7 +53,7 @@ * * @return the attributes */ - public Collection<PropertyBase> getAttributes() { + public ModelCollection<PropertyBase> getAttributes() { return attributes; } @@ -67,7 +66,7 @@ * @return */ public PropertyBase getAttribute(final String name) { - return attributes.find(new Named.NamedPredicate(name)); + return attributes.find(new Named.NamePredicate(name)); } public PropertyBase getOrCreateAttribute(String attributeName) { Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,136 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.model; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -@SuppressWarnings("serial") -public class BehaviorRenderer implements ModelElement<BehaviorRenderer>, FacesComponent { - private ClassName baseClass; - private ClassName targetClass; - private boolean generate; - private FacesId id; - - public BehaviorRenderer(FacesId type) { - this.id = type; - } - - public BehaviorRenderer() { - } - - /** - * <p class="changed_added_4_0"></p> - * @param id the id to set - */ - public void setId(FacesId type) { - this.id = type; - } - - - /** - * <p class="changed_added_4_0"></p> - * @return the id - */ - public FacesId getId() { - return id; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the targetClass - */ - @Merge - public ClassName getTargetClass() { - return targetClass; - } - - /** - * <p class="changed_added_4_0"></p> - * @param targetClass the targetClass to set - */ - public void setTargetClass(ClassName rendererClass) { - this.targetClass = rendererClass; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the baseClass - */ - @Merge - public ClassName getBaseClass() { - return this.baseClass; - } - - /** - * <p class="changed_added_4_0"></p> - * @param baseClass the baseClass to set - */ - public void setBaseClass(ClassName baseClass) { - this.baseClass = baseClass; - } - - /** - * <p class="changed_added_4_0"></p> - * @return the generate - */ - public boolean isGenerate() { - return this.generate; - } - - /** - * <p class="changed_added_4_0"></p> - * @param generate the generate to set - */ - public void setGenerate(boolean generate) { - this.generate = generate; - } - - @Override - public void merge(BehaviorRenderer other) { - ComponentLibrary.merge(this, other); - } - - @Override - public <R,D> R accept(Visitor<R,D> visitor, D data) { - return visitor.visitBehaviorRenderer(this,data); - } - - @Override - public boolean same(BehaviorRenderer other) { - if (null != getId() && null != other.getId()) { - // Both types not null, compare them. - return getId().equals(other.getId()); - } - // one or both types are null, compare classes. - if (null != getTargetClass() && getTargetClass().equals(other.getTargetClass())) { - return true; - } - return false; - } -} Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRendererModel.java (from rev 17182, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRenderer.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRendererModel.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRendererModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -0,0 +1,136 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +package org.richfaces.cdk.model; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +@SuppressWarnings("serial") +public class BehaviorRendererModel implements ModelElement<BehaviorRendererModel>, FacesComponent { + private ClassName baseClass; + private ClassName targetClass; + private boolean generate; + private FacesId id; + + public BehaviorRendererModel(FacesId type) { + this.id = type; + } + + public BehaviorRendererModel() { + } + + /** + * <p class="changed_added_4_0"></p> + * @param id the id to set + */ + public void setId(FacesId type) { + this.id = type; + } + + + /** + * <p class="changed_added_4_0"></p> + * @return the id + */ + public FacesId getId() { + return id; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the targetClass + */ + @Merge + public ClassName getTargetClass() { + return targetClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @param targetClass the targetClass to set + */ + public void setTargetClass(ClassName rendererClass) { + this.targetClass = rendererClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the baseClass + */ + @Merge + public ClassName getBaseClass() { + return this.baseClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @param baseClass the baseClass to set + */ + public void setBaseClass(ClassName baseClass) { + this.baseClass = baseClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the generate + */ + public boolean isGenerate() { + return this.generate; + } + + /** + * <p class="changed_added_4_0"></p> + * @param generate the generate to set + */ + public void setGenerate(boolean generate) { + this.generate = generate; + } + + @Override + public void merge(BehaviorRendererModel other) { + ComponentLibrary.merge(this, other); + } + + @Override + public <R,D> R accept(Visitor<R,D> visitor, D data) { + return visitor.visitBehaviorRenderer(this,data); + } + + @Override + public boolean same(BehaviorRendererModel other) { + if (null != getId() && null != other.getId()) { + // Both types not null, compare them. + return getId().equals(other.getId()); + } + // one or both types are null, compare classes. + if (null != getTargetClass() && getTargetClass().equals(other.getTargetClass())) { + return true; + } + return false; + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/BehaviorRendererModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassName.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassName.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassName.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,10 +23,11 @@ package org.richfaces.cdk.model; -import com.google.common.collect.ImmutableMap; +import java.io.Serializable; + import org.richfaces.cdk.util.Strings; -import java.io.Serializable; +import com.google.common.collect.ImmutableMap; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -59,22 +59,22 @@ "http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"; private static final long serialVersionUID = -6055670836731899832L; - private final ModelCollection<ComponentModel> components = ModelCollection.<ComponentModel> create(); + private final ModelCollection<ComponentModel> components = ModelSet.<ComponentModel> create(); /** * <p class="changed_added_4_0"> * JSF renderer associated with that library * </p> */ - private final ModelCollection<RenderKitModel> renderKits = ModelCollection.<RenderKitModel> create(); + private final ModelCollection<RenderKitModel> renderKits = ModelSet.<RenderKitModel> create(); - private final ModelCollection<ConverterModel> converters = ModelCollection.<ConverterModel> create(); + private final ModelCollection<ConverterModel> converters = ModelSet.<ConverterModel> create(); - private final ModelCollection<ValidatorModel> validators = ModelCollection.<ValidatorModel> create(); + private final ModelCollection<ValidatorModel> validators = ModelSet.<ValidatorModel> create(); - private final ModelCollection<ListenerModel> listeners = ModelCollection.<ListenerModel> create(); + private final ModelCollection<ListenerModel> listeners = ModelSet.<ListenerModel> create(); - private final ModelCollection<FunctionModel> functions = ModelCollection.<FunctionModel> create(); + private final ModelCollection<FunctionModel> functions = ModelSet.<FunctionModel> create(); private long lastModified = Long.MIN_VALUE; @@ -83,9 +83,9 @@ * Application level events fired by the component * </p> */ - private final ModelCollection<EventModel> events = ModelCollection.<EventModel> create(); + private final ModelCollection<EventModel> events = ModelSet.<EventModel> create(); - private final ModelCollection<BehaviorModel> behaviors = ModelCollection.<BehaviorModel> create(); + private final ModelCollection<BehaviorModel> behaviors = ModelSet.<BehaviorModel> create(); private ConfigExtension extension; @@ -125,13 +125,13 @@ * @return */ public RenderKitModel addRenderKit(String renderKitId) { - RenderKitModel.Id renderKitType = new RenderKitModel.Id(renderKitId); + FacesId renderKitType = new FacesId(renderKitId); RenderKitModel renderKit = addRenderKit(renderKitType); return renderKit; } - public RenderKitModel addRenderKit(RenderKitModel.Id renderKitType) { + public RenderKitModel addRenderKit(FacesId renderKitType) { RenderKitModel renderKit = getRenderKit(renderKitType); if (null == renderKit) { @@ -148,7 +148,7 @@ * * @return the components */ - public Collection<ComponentModel> getComponents() { + public ModelCollection<ComponentModel> getComponents() { return components; } @@ -171,11 +171,11 @@ * * @return the renderKits */ - public Collection<RenderKitModel> getRenderKits() { + public ModelCollection<RenderKitModel> getRenderKits() { return renderKits; } - public RenderKitModel getRenderKit(RenderKitModel.Id id) { + public RenderKitModel getRenderKit(FacesId id) { if (null != id) { for (RenderKitModel renderKit : renderKits) { if (id.equals(renderKit.getId())) { @@ -186,14 +186,14 @@ return null; } - public void addRenderer(RenderKitModel.Id renderKitId, RendererModel rendererModel) { + public void addRenderer(FacesId renderKitId, RendererModel rendererModel) { RenderKitModel renderKit = addRenderKit(renderKitId); renderKit.getRenderers().add(rendererModel); } public void addRenderer(String renderKitId, RendererModel rendererModel) { - this.addRenderer(new RenderKitModel.Id(renderKitId), rendererModel); + this.addRenderer(new FacesId(renderKitId), rendererModel); } public RendererModel getRenderer(String componentFamily, String componentType) { @@ -238,7 +238,7 @@ * * @return the converters */ - public Collection<ConverterModel> getConverters() { + public ModelCollection<ConverterModel> getConverters() { return converters; } @@ -248,7 +248,7 @@ * * @return the validators */ - public Collection<ValidatorModel> getValidators() { + public ModelCollection<ValidatorModel> getValidators() { return validators; } @@ -258,7 +258,7 @@ * * @return the behaviors */ - public Collection<BehaviorModel> getBehaviors() { + public ModelCollection<BehaviorModel> getBehaviors() { return behaviors; } @@ -268,7 +268,7 @@ * * @return the listeners */ - public Collection<ListenerModel> getListeners() { + public ModelCollection<ListenerModel> getListeners() { return listeners; } @@ -278,7 +278,7 @@ * * @return the events */ - public Collection<EventModel> getEvents() { + public ModelCollection<EventModel> getEvents() { return events; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,7 +1,5 @@ package org.richfaces.cdk.model; -import java.util.Collection; - import org.richfaces.cdk.model.RendererModel.Type; /** @@ -19,14 +17,14 @@ * Facets recognised by the component * </p> */ - private final ModelCollection<FacetModel> facets = ModelCollection.<FacetModel>create(); + private final ModelCollection<FacetModel> facets = ModelSet.<FacetModel>create(); /** * <p class="changed_added_4_0"> * Application level events fired by the component * </p> */ - private final ModelCollection<EventModel> events = ModelCollection.<EventModel>create(); + private final ModelCollection<EventModel> events = ModelSet.<EventModel>create(); /** * <p class="changed_added_4_0"> @@ -160,12 +158,12 @@ * <p class="changed_added_4_0"></p> * @return the facets */ - public Collection<FacetModel> getFacets() { + public ModelCollection<FacetModel> getFacets() { return facets; } public FacetModel getFacet(final String name) { - return facets.find(new Named.NamedPredicate(name)); + return facets.find(new Named.NamePredicate(name)); } public FacetModel getOrCreateFacet(String name) { @@ -182,7 +180,7 @@ * <p class="changed_added_4_0"></p> * @return the events */ - public Collection<EventModel> getEvents() { + public ModelCollection<EventModel> getEvents() { return events; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -24,11 +24,12 @@ package org.richfaces.cdk.model; -import org.w3c.dom.Element; +import java.util.List; import javax.xml.bind.annotation.XmlAnyElement; -import java.util.List; +import org.w3c.dom.Element; + /** * <p class="changed_added_4_0">That class represents all faces-config "extension" fields.</p> * Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright , Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.richfaces.cdk.model; - -/** - * Implementation for easy on inheritance. - * - * @author akolonitsky - * @since Feb 22, 2010 - */ -public abstract class EmptyVisitor<R,D> implements Visitor<R,D>{ - - public R visitComponentLibrary(ComponentLibrary model, D param) { - return null; - } - - public R visitComponent(ComponentModel model, D param) { - return null; - } - - public R visitConverter(ConverterModel model, D param) { - return null; - } - - public R visitValidator(ValidatorModel model, D param) { - return null; - } - - public R visitBehavior(BehaviorModel model, D param) { - return null; - } - - public R visitFacet(FacetModel model, D param) { - return null; - } - - public R visitEvent(EventModel model, D param) { - return null; - } - - public R visitBehaviorRenderer(BehaviorRenderer model, D param) { - return null; - } - - public R visitProperty(PropertyBase model, D param) { - return null; - } - - public R visitRenderKit(RenderKitModel model, D param) { - return null; - } - - public R visitRender(RendererModel model, D param) { - return null; - } - - public R visitListener(ListenerModel model, D param) { - return null; - } - - @Override - public R visitFunction(FunctionModel model, D param) { - // Do nothing - return null; - } - - @SuppressWarnings("unchecked") - public R visit(ModelElement model, D param) { - return null; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,10 @@ package org.richfaces.cdk.model; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlValue; -import java.io.Serializable; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesComponent.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesComponent.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesComponent.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,6 +1,12 @@ package org.richfaces.cdk.model; +import javax.faces.render.ClientBehaviorRenderer; +import org.richfaces.cdk.util.ComparatorUtils; + +import com.google.common.base.Predicate; + + /** * <p class="changed_added_4_0">This Interface describes all JSF objects that can be generated by cdk:</p> * <ul> @@ -16,8 +22,46 @@ */ public interface FacesComponent { + /** + * <p class="changed_added_4_0">This predicate can be used to lookup component in {@link ModelCollection} by id.</p> + * @author asmirnov(a)exadel.com + * + */ + public static final class ComponentPredicate implements Predicate<FacesComponent> { + + private final FacesId id; + + /** + * <p class="changed_added_4_0"></p> + * @param id + */ + public ComponentPredicate(FacesId id) { + this.id = id; + } + + /** + * <p class="changed_added_4_0"></p> + * @param name + */ + public ComponentPredicate(String name) { + this.id = FacesId.parseId(name); + } + + @Override + public boolean apply(FacesComponent input) { + return ComparatorUtils.nullSafeEquals(input.getId(), this.id); + } + } + /** + * <p class="changed_added_4_0"></p> + * @return + */ public FacesId getId(); + /** + * <p class="changed_added_4_0"></p> + * @param id + */ public void setId(FacesId id); /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesId.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesId.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/FacesId.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,10 +23,10 @@ package org.richfaces.cdk.model; +import java.io.Serializable; + import org.richfaces.cdk.util.Strings; -import java.io.Serializable; - /** * <p class="changed_added_4_0">This is a FacesId class that should be used to find JSF elements in {@link ComponentLibrary}</p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,213 +1,19 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - package org.richfaces.cdk.model; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; - import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; +import com.google.common.base.Predicate; + /** - * <p class="changed_added_4_0"> - * Base class for all model collections. This collection use {@link Mergeable#same(Object)} method instead of equals - * to lookup objects in the {@link #contains(Object)} and {@link #remove(Object)} methods. In addition, it merges same objects instead of replace in the {@link #add(ModelElement)} method. - * </p> - * + * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com + * + * @param <E> */ -public class ModelCollection<E extends ModelElement<? super E>> implements Collection<E>, Visitable { +public interface ModelCollection<E extends ModelElement<? super E>> extends Collection<E>, Visitable { - private final List<E> elements = Lists.newArrayList(); - - private Comparator<E> comparator; - + public E find(final Predicate<? super E> predicate); - /** - * <p class="changed_added_4_0"></p> - * @return the comparator - */ - public Comparator<E> getComparator() { - return this.comparator; - } + public <R,D> R accept(R result, Visitor<R,D> visitor, D data); - /** - * <p class="changed_added_4_0"></p> - * @param comparator the comparator to set - */ - public void setComparator(Comparator<E> comparator) { - this.comparator = comparator; - } - - public static <T extends ModelElement<? super T>> ModelCollection<T> create() { - return new ModelCollection<T>(); - } - - public static <T extends ModelElement<? super T>> ModelCollection<T> create(Comparator<T> comparator) { - ModelCollection<T> collection = new ModelCollection<T>(); - collection.setComparator(comparator); - return collection; - } - - public E find(final Predicate<? super E> predicate) { - try { - return Iterables.find(elements, predicate); - } catch (NoSuchElementException e) { - return null; - } - } - - @Override - public boolean add(E e) { - if (null == e) { - throw new NullPointerException(); - } - for (E element : elements) { - if (element.same(e)) { - element.merge(e); - return false; - } - } - return elements.add(e); - } - - @Override - public boolean addAll(Collection<? extends E> c) { - boolean changed = false; - - for (E e : c) { - changed |= add(e); - } - - return changed; - } - - @Override - public void clear() { - elements.clear(); - } - - @SuppressWarnings("unchecked") - @Override - public boolean contains(Object o) { - if (null != o) { - Class<? extends Object> clazz = o.getClass(); - for (E element : elements) { - if (clazz.isInstance(element) && element.same((E) o)) { - return true; - } - } - } - return false; - } - - @Override - public boolean containsAll(Collection<?> c) { - return elements.containsAll(c); - } - - @Override - public boolean isEmpty() { - return elements.isEmpty(); - } - - @Override - public Iterator<E> iterator() { - if(null == comparator){ - return elements.iterator(); - } else { - List<E> list = Lists.newArrayList(elements); - Collections.sort(list, comparator); - return Iterators.unmodifiableIterator(list.iterator()); - } - } - - @Override - public boolean remove(Object o) { - if (null != o) { - Class<? extends Object> clazz = o.getClass(); - for (E element : elements) { - if (clazz.isInstance(element) && element.same((E) o)) { - elements.remove(element); - return true; - } - } - - } - return false; - } - - @Override - public boolean removeAll(Collection<?> c) { - boolean changed = false; - - for (Object e : c) { - changed |= remove(e); - } - - return changed; - } - - @Override - public boolean retainAll(Collection<?> c) { - return elements.retainAll(c); - } - - @Override - public int size() { - return elements.size(); - } - - @Override - public Object[] toArray() { - Object[] array = elements.toArray(); - return array; - } - - @Override - public <T> T[] toArray(T[] a) { - return elements.toArray(a); - } - - public <R,D> R accept(R result, Visitor<R,D> visitor, D data) { - return null==result?accept(visitor, data):result; - } - - public <R,D> R accept(Visitor<R,D> visitor, D data) { - for (ModelElement element : elements) { - R result = element.accept(visitor,data); - if(null != result){ - return result; - } - } - return null; - } - -} +} \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,9 +1,9 @@ package org.richfaces.cdk.model; +import java.util.Collection; + import com.google.common.collect.Lists; -import java.util.Collection; - /** * <p class="changed_added_4_0">Base class for the most JSF components taht have description * attributes and support extensions in faces-config.</p> @@ -18,7 +18,7 @@ private ClassName baseClass; - private final ModelCollection<TagModel> tags = ModelCollection.<TagModel>create(); + private final ModelCollection<TagModel> tags = ModelSet.<TagModel>create(); private final Collection<ClassName> interfaces = Lists.newArrayList(); Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelSet.java (from rev 17182, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelSet.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelSet.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -0,0 +1,216 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.model; + +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Set; + +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; + +/** + * <p class="changed_added_4_0"> + * Base class for all model collections. This collection use {@link Mergeable#same(Object)} method instead of equals + * to lookup objects in the {@link #contains(Object)} and {@link #remove(Object)} methods. In addition, it merges same objects instead of replace in the {@link #add(ModelElement)} method. + * </p> + * + * @author asmirnov(a)exadel.com + */ +public class ModelSet<E extends ModelElement<? super E>> implements ModelCollection<E>,Set<E> { + + private final List<E> elements = Lists.newArrayList(); + + private Comparator<E> comparator; + + + public static <T extends ModelElement<? super T>> ModelSet<T> create() { + return new ModelSet<T>(); + } + + public static <T extends ModelElement<? super T>> ModelSet<T> create(Comparator<T> comparator) { + ModelSet<T> collection = new ModelSet<T>(); + collection.setComparator(comparator); + return collection; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the comparator + */ + public Comparator<E> getComparator() { + return this.comparator; + } + + /** + * <p class="changed_added_4_0"></p> + * @param comparator the comparator to set + */ + public void setComparator(Comparator<E> comparator) { + this.comparator = comparator; + } + + @Override + public E find(final Predicate<? super E> predicate) { + try { + return Iterables.find(elements, predicate); + } catch (NoSuchElementException e) { + return null; + } + } + + @Override + public boolean add(E e) { + if (null == e) { + throw new NullPointerException(); + } + for (E element : elements) { + if (element.same(e)) { + element.merge(e); + return false; + } + } + return elements.add(e); + } + + @Override + public boolean addAll(Collection<? extends E> c) { + boolean changed = false; + + for (E e : c) { + changed |= add(e); + } + + return changed; + } + + @Override + public void clear() { + elements.clear(); + } + + @SuppressWarnings("unchecked") + @Override + public boolean contains(Object o) { + if (null != o) { + Class<? extends Object> clazz = o.getClass(); + for (E element : elements) { + if (clazz.isInstance(element) && element.same((E) o)) { + return true; + } + } + } + return false; + } + + @Override + public boolean containsAll(Collection<?> c) { + return elements.containsAll(c); + } + + @Override + public boolean isEmpty() { + return elements.isEmpty(); + } + + @Override + public Iterator<E> iterator() { + if(null == comparator){ + return elements.iterator(); + } else { + List<E> list = Lists.newArrayList(elements); + Collections.sort(list, comparator); + return Iterators.unmodifiableIterator(list.iterator()); + } + } + + @Override + public boolean remove(Object o) { + if (null != o) { + Class<? extends Object> clazz = o.getClass(); + for (E element : elements) { + if (clazz.isInstance(element) && element.same((E) o)) { + elements.remove(element); + return true; + } + } + + } + return false; + } + + @Override + public boolean removeAll(Collection<?> c) { + boolean changed = false; + + for (Object e : c) { + changed |= remove(e); + } + + return changed; + } + + @Override + public boolean retainAll(Collection<?> c) { + return elements.retainAll(c); + } + + @Override + public int size() { + return elements.size(); + } + + @Override + public Object[] toArray() { + Object[] array = elements.toArray(); + return array; + } + + @Override + public <T> T[] toArray(T[] a) { + return elements.toArray(a); + } + + @Override + public <R,D> R accept(R result, Visitor<R,D> visitor, D data) { + return null==result?accept(visitor, data):result; + } + + public <R,D> R accept(Visitor<R,D> visitor, D data) { + for (ModelElement element : elements) { + R result = element.accept(visitor,data); + if(null != result){ + return result; + } + } + return null; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelSet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Named.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Named.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Named.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,10 @@ package org.richfaces.cdk.model; -import com.google.common.base.Predicate; import org.richfaces.cdk.util.ComparatorUtils; +import com.google.common.base.Predicate; + /** * <p class="changed_added_4_0">This interface represents all models for "named" JSF objects ( attributes, properties, facets )</p> * @author asmirnov(a)exadel.com @@ -33,11 +34,16 @@ */ public interface Named { - public static final class NamedPredicate implements Predicate<Named> { + /** + * <p class="changed_added_4_0">Predicate used to lookup named element in the {@link ModelCollection}</p> + * @author asmirnov(a)exadel.com + * + */ + public static final class NamePredicate implements Predicate<Named> { private final String name; - public NamedPredicate(String name) { + public NamePredicate(String name) { this.name = name; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/PropertyBase.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,13 +22,14 @@ package org.richfaces.cdk.model; +import java.util.List; +import java.util.Set; + +import org.richfaces.cdk.util.ComparatorUtils; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.richfaces.cdk.util.ComparatorUtils; -import java.util.List; -import java.util.Set; - /** * @author akolonitsky * @since Mar 19, 2010 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -27,25 +27,25 @@ import org.richfaces.cdk.util.ComparatorUtils; -import java.util.Collection; - -import javax.faces.render.RenderKitFactory; - /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com * */ -public class RenderKitModel extends DescriptionGroupBase implements ModelElement<RenderKitModel> { +public class RenderKitModel extends DescriptionGroupBase implements ModelElement<RenderKitModel>,FacesComponent { private static final long serialVersionUID = -7387781530198813352L; - private final ModelCollection<RendererModel> renderers = ModelCollection.<RendererModel>create(); - private final ModelCollection<BehaviorRenderer> behaviorRenderers = ModelCollection.<BehaviorRenderer>create(); + private final ModelSet<RendererModel> renderers = ModelSet.<RendererModel>create(); + private final ModelSet<BehaviorRendererModel> behaviorRenderers = ModelSet.<BehaviorRendererModel>create(); - private ClassName renderKitClass; + private ClassName targetClass; - private Id id; + private ClassName baseClass; + private FacesId id; + + private boolean generate; + public RenderKitModel() { } @@ -53,7 +53,7 @@ * <p class="changed_added_4_0"></p> * @return the id */ - public Id getId() { + public FacesId getId() { return this.id; } @@ -61,32 +61,64 @@ * <p class="changed_added_4_0"></p> * @param id the id to set */ - public void setId(Id id) { - this.id = id; + public void setId(FacesId id) { + this.id = id; } /** * <p class="changed_added_4_0"></p> - * @return the renderKitClass + * @return the targetClass */ @Merge - public ClassName getRenderKitClass() { - return renderKitClass; + public ClassName getTargetClass() { + return targetClass; } /** * <p class="changed_added_4_0"></p> - * @param renderKitClass the renderKitClass to set + * @param targetClass the targetClass to set */ - public void setRenderKitClass(ClassName renderKitClass) { - this.renderKitClass = renderKitClass; + public void setTargetClass(ClassName renderKitClass) { + this.targetClass = renderKitClass; } /** * <p class="changed_added_4_0"></p> + * @return the baseClass + */ + public ClassName getBaseClass() { + return this.baseClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @param baseClass the baseClass to set + */ + public void setBaseClass(ClassName baseClass) { + this.baseClass = baseClass; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the generate + */ + public boolean isGenerate() { + return this.generate; + } + + /** + * <p class="changed_added_4_0"></p> + * @param generate the generate to set + */ + public void setGenerate(boolean generate) { + this.generate = generate; + } + + /** + * <p class="changed_added_4_0"></p> * @return the renderers */ - public Collection<RendererModel> getRenderers() { + public ModelCollection<RendererModel> getRenderers() { return renderers; } @@ -94,7 +126,7 @@ * <p class="changed_added_4_0"></p> * @return the behaviorRenderers */ - public Collection<BehaviorRenderer> getBehaviorRenderers() { + public ModelCollection<BehaviorRendererModel> getBehaviorRenderers() { return behaviorRenderers; } @@ -120,31 +152,7 @@ if(null != getId() && null != other.getId()){ return getId().equals(other.getId()); } else { - return ComparatorUtils.nullSafeEquals(getRenderKitClass(), other.getRenderKitClass()); + return ComparatorUtils.nullSafeEquals(getTargetClass(), other.getTargetClass()); } } - - - /** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ - public static final class Id extends FacesId { - private static final long serialVersionUID = 9169827614943311779L; - - /** - * <p class="changed_added_4_0"></p> - * @param type - */ - public Id(String type) { - - // Null value means default render kit. - super(null == type ? RenderKitFactory.HTML_BASIC_RENDER_KIT : type); - } - - public String getId() { - return super.getType(); - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -37,8 +37,6 @@ private static final long serialVersionUID = -5802466539382148578L; - private RenderKitModel.Id renderKitId; - private String family; private String componentType; @@ -160,14 +158,6 @@ return false; } - public RenderKitModel.Id getRenderKitId() { - return renderKitId; - } - - public void setRenderKitId(RenderKitModel.Id renderKitId) { - this.renderKitId = renderKitId; - } - public String getComponentType() { return componentType; } Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SimpleVisitor.java (from rev 17182, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EmptyVisitor.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SimpleVisitor.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SimpleVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright , Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.cdk.model; + +/** + * Implementation for easy on inheritance. By default, all calls delegated to the {@link #defaultAction(Visitable, Object)} method. + * + * @author akolonitsky + * @since Feb 22, 2010 + */ +public abstract class SimpleVisitor<R,D> implements Visitor<R,D>{ + + /** + * <p class="changed_added_4_0">Default action for all visitXXX method.</p> + * @param model visited object. + * @param param optional parameter for visit method. + * @return null by default. + */ + protected R defaultAction(Visitable model, D param){ + return null; + } + + public R visitComponentLibrary(ComponentLibrary model, D param) { + return defaultAction(model,param); + } + + public R visitComponent(ComponentModel model, D param) { + return defaultAction(model,param); + } + + public R visitConverter(ConverterModel model, D param) { + return defaultAction(model,param); + } + + public R visitValidator(ValidatorModel model, D param) { + return defaultAction(model,param); + } + + public R visitBehavior(BehaviorModel model, D param) { + return defaultAction(model,param); + } + + public R visitFacet(FacetModel model, D param) { + return defaultAction(model,param); + } + + public R visitEvent(EventModel model, D param) { + return defaultAction(model,param); + } + + public R visitBehaviorRenderer(BehaviorRendererModel model, D param) { + return defaultAction(model,param); + } + + public R visitProperty(PropertyBase model, D param) { + return defaultAction(model,param); + } + + public R visitRenderKit(RenderKitModel model, D param) { + return defaultAction(model,param); + } + + public R visitRender(RendererModel model, D param) { + return defaultAction(model,param); + } + + public R visitListener(ListenerModel model, D param) { + return defaultAction(model,param); + } + + @Override + public R visitFunction(FunctionModel model, D param) { + return defaultAction(model,param); + } + + @SuppressWarnings("unchecked") + public R visit(ModelElement model, D param) { + return defaultAction(model,param); + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/SimpleVisitor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -46,7 +46,7 @@ R visitEvent(EventModel model, D param); - R visitBehaviorRenderer(BehaviorRenderer model, D param); + R visitBehaviorRenderer(BehaviorRendererModel model, D param); R visitProperty(PropertyBase model, D param); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,6 +23,15 @@ package org.richfaces.cdk.model.validator; +import java.util.Collection; +import java.util.HashSet; +import java.util.NoSuchElementException; + +import javax.faces.view.facelets.BehaviorHandler; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.ConverterHandler; +import javax.xml.validation.ValidatorHandler; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.Logger; import org.richfaces.cdk.ModelValidator; @@ -44,15 +53,6 @@ import org.richfaces.cdk.model.Taglib; import org.richfaces.cdk.util.Strings; -import java.util.Collection; -import java.util.HashSet; -import java.util.NoSuchElementException; - -import javax.faces.view.facelets.BehaviorHandler; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.ConverterHandler; -import javax.xml.validation.ValidatorHandler; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/QNameComparator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/QNameComparator.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/QNameComparator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,7 +21,7 @@ */ package org.richfaces.cdk.templatecompiler; -import static org.richfaces.cdk.util.ComparatorUtils.nullSafeCompare; +import static org.richfaces.cdk.util.ComparatorUtils.*; import java.util.Comparator; 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,8 +23,10 @@ package org.richfaces.cdk.templatecompiler; -import com.google.inject.Inject; -import freemarker.template.TemplateException; +import java.io.IOException; +import java.io.Writer; +import java.util.Collection; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -33,17 +35,17 @@ import org.richfaces.cdk.Outputs; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; -import org.richfaces.cdk.model.ModelCollection; +import org.richfaces.cdk.model.ModelSet; import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.templatecompiler.builder.model.JavaClass; import org.richfaces.cdk.templatecompiler.model.Template; -import java.io.IOException; -import java.io.Writer; -import java.util.Collection; +import com.google.inject.Inject; +import freemarker.template.TemplateException; + /** * <p class="changed_added_4_0"> * </p> @@ -92,7 +94,7 @@ for (RendererModel renderer : renderKit.getRenderers()) { Template template = renderer.getTemplate(); if (null != template) { - Collection<PropertyBase> attributes = ModelCollection.<PropertyBase>create(); + Collection<PropertyBase> attributes = ModelSet.<PropertyBase>create(); ComponentModel component = findComponentByRenderer(renderer); if (component != null) { 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-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,8 @@ package org.richfaces.cdk.templatecompiler; -import static org.richfaces.cdk.templatecompiler.QNameComparator.QNAME_COMPARATOR; -import static org.richfaces.cdk.util.JavaUtils.getEscapedString; -import static org.richfaces.cdk.util.JavaUtils.getEscapedStringsArray; +import static org.richfaces.cdk.templatecompiler.QNameComparator.*; +import static org.richfaces.cdk.util.JavaUtils.*; import java.io.IOException; import java.util.Collection; @@ -294,7 +293,7 @@ sb.append(")"); } - // OPTIMIZATION - use ModelCollection with lookup method + // OPTIMIZATION - use ModelSet with lookup method for (PropertyBase property : attributes) { if (attributeName.equals(property.getName())) { Set<EventName> eventNames = property.getEventNames(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,16 @@ package org.richfaces.cdk.templatecompiler; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.google.inject.Inject; +import java.io.File; +import java.text.MessageFormat; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Logger; @@ -36,12 +43,12 @@ import org.richfaces.cdk.Sources; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.EmptyVisitor; import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.PropertyModel; -import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.model.RendererModel; +import org.richfaces.cdk.model.SimpleVisitor; import org.richfaces.cdk.templatecompiler.model.Attribute; import org.richfaces.cdk.templatecompiler.model.ClientBehavior; import org.richfaces.cdk.templatecompiler.model.CompositeInterface; @@ -51,15 +58,9 @@ import org.richfaces.cdk.xmlconfig.FragmentParser; import org.richfaces.cdk.xmlconfig.JAXB; -import java.io.File; -import java.text.MessageFormat; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> @@ -170,7 +171,7 @@ log.debug(" - file = " + absolutePath); log.debug(" - renderer = " + rendererModel); - RendererModel existedModel = library.accept(new EmptyVisitor<RendererModel,String>() { + RendererModel existedModel = library.accept(new SimpleVisitor<RendererModel,String>() { @Override public RendererModel visitRender(RendererModel model,String absolutePath) { Template template = model.getTemplate(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateVisitorFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateVisitorFactory.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/TemplateVisitorFactory.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,12 +23,12 @@ package org.richfaces.cdk.templatecompiler; +import java.util.Collection; + import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.templatecompiler.model.CompositeInterface; import org.richfaces.cdk.templatecompiler.model.TemplateVisitor; -import java.util.Collection; - /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,14 +23,15 @@ package org.richfaces.cdk.templatecompiler; -import com.google.inject.Inject; +import java.util.Collection; + import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.Logger; import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.templatecompiler.model.CompositeInterface; import org.richfaces.cdk.xmlconfig.JAXB; -import java.util.Collection; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"></p> 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/templatecompiler/el/ELVisitor.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/ELVisitor.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,8 +21,8 @@ package org.richfaces.cdk.templatecompiler.el; -import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION; -import static org.richfaces.cdk.util.JavaUtils.getEscapedString; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.*; +import static org.richfaces.cdk.util.JavaUtils.*; import java.text.MessageFormat; import java.util.EnumSet; 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/templatecompiler/el/HelperMethod.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/HelperMethod.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,10 +21,7 @@ */ package org.richfaces.cdk.templatecompiler.el; -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 static org.richfaces.cdk.templatecompiler.el.ELNodeConstants.*; import java.util.EnumSet; import java.util.Set; 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/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,9 +21,8 @@ package org.richfaces.cdk.templatecompiler.el.node; -import static org.richfaces.cdk.templatecompiler.el.HelperMethod.TO_STRING_CONVERSION; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.*; - import org.jboss.el.parser.Node; import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; import org.richfaces.cdk.templatecompiler.el.ELVisitor; 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/templatecompiler/el/node/AstEmptyTreeNode.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstEmptyTreeNode.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,7 +23,7 @@ package org.richfaces.cdk.templatecompiler.el.node; -import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EMPTINESS_CHECK; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.*; import org.jboss.el.parser.Node; import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; 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/templatecompiler/el/node/AstLiteralTreeNode.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstLiteralTreeNode.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -24,10 +24,11 @@ package org.richfaces.cdk.templatecompiler.el.node; +import static org.richfaces.cdk.util.JavaUtils.*; + import org.jboss.el.parser.Node; 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.templatecompiler.el.types.TypesFactory; /** 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/templatecompiler/el/node/AstStringTreeNode.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstStringTreeNode.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -24,11 +24,12 @@ package org.richfaces.cdk.templatecompiler.el.node; +import static org.richfaces.cdk.util.JavaUtils.*; + import org.jboss.el.parser.AstString; import org.jboss.el.parser.Node; 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.templatecompiler.el.types.TypesFactory; /** 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/templatecompiler/el/node/EqualityTestTreeNode.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/EqualityTestTreeNode.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,7 +21,7 @@ */ package org.richfaces.cdk.templatecompiler.el.node; -import static org.richfaces.cdk.templatecompiler.el.HelperMethod.EQUALS_CHECK; +import static org.richfaces.cdk.templatecompiler.el.HelperMethod.*; import org.jboss.el.parser.Node; import org.richfaces.cdk.templatecompiler.el.ELNodeConstants; 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/templatecompiler/el/types/ComplexType.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/types/ComplexType.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,15 +21,15 @@ */ 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.templatecompiler.el.Type; +import org.richfaces.cdk.util.ArrayUtils; + /** * @author Nick Belaevski * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,9 +23,10 @@ package org.richfaces.cdk.templatecompiler.model; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,8 +23,14 @@ package org.richfaces.cdk.xmlconfig; -import com.google.common.collect.ImmutableMap; -import com.google.inject.Inject; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URL; + import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Source; @@ -33,13 +39,8 @@ import org.xml.sax.SAXException; import org.xml.sax.ext.EntityResolver2; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; +import com.google.common.collect.ImmutableMap; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,7 +23,9 @@ package org.richfaces.cdk.xmlconfig; -import com.google.inject.Inject; +import java.util.Collection; +import java.util.Collections; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; @@ -31,8 +33,7 @@ import org.richfaces.cdk.xmlconfig.model.ComponentAdapter; import org.richfaces.cdk.xmlconfig.model.Fragment; -import java.util.Collection; -import java.util.Collections; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -25,8 +25,28 @@ package org.richfaces.cdk.xmlconfig; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Inject; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.Writer; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.UnmarshallerHandler; +import javax.xml.bind.util.ValidationEventCollector; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.Logger; @@ -36,16 +56,8 @@ import org.xml.sax.ext.EntityResolver2; import org.xml.sax.helpers.XMLReaderFactory; -import javax.xml.bind.*; -import javax.xml.bind.util.ValidationEventCollector; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamResult; -import java.io.*; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collection; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,13 +23,13 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.ComponentLibrary; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentLibrary; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -22,17 +22,18 @@ package org.richfaces.cdk.xmlconfig.model; +import java.util.Collection; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.PropertyModel; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.Collection; - /** * @author akolonitsky * @since Jan 21, 2010 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,22 +23,22 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.BehaviorRenderer; +import org.richfaces.cdk.model.BehaviorRendererModel; /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ -public class BehaviorRendererAdapter extends AdapterBase<BehaviorRendererBean, BehaviorRenderer> { +public class BehaviorRendererAdapter extends AdapterBase<BehaviorRendererBean, BehaviorRendererModel> { @Override - protected Class<? extends BehaviorRendererBean> getBeanClass(BehaviorRenderer model) { + protected Class<? extends BehaviorRendererBean> getBeanClass(BehaviorRendererModel model) { return BehaviorRendererBean.class; } @Override - protected Class<? extends BehaviorRenderer> getModelClass(BehaviorRendererBean bean) { - return BehaviorRenderer.class; + protected Class<? extends BehaviorRendererModel> getModelClass(BehaviorRendererBean bean) { + return BehaviorRendererModel.class; } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,7 +23,13 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; +import java.util.Collection; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; @@ -33,11 +39,7 @@ import org.richfaces.cdk.model.PropertyModel; import org.richfaces.cdk.model.TagModel; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.Collection; -import java.util.List; +import com.google.common.collect.Lists; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,17 +21,18 @@ package org.richfaces.cdk.xmlconfig.model; +import java.util.Collection; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.PropertyModel; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.Collection; - /** * @author akolonitsky * @since Jan 6, 2010 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,18 +23,20 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import java.util.List; +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.EventName; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,13 +23,13 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.ClassName; -import org.richfaces.cdk.model.ComponentLibrary; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassName; +import org.richfaces.cdk.model.ComponentLibrary; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -30,12 +30,12 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.richfaces.cdk.model.BehaviorRenderer; +import org.richfaces.cdk.model.BehaviorRendererModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.RendererModel; -import org.richfaces.cdk.model.RenderKitModel.Id; import com.google.common.collect.Lists; @@ -47,43 +47,43 @@ @XmlType( name = "faces-config-render-kitType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, - propOrder = {"id", "renderkitClass", "renderers", "behaviorRenderers", "extension"}) + propOrder = {"id", "targetClass", "renderers", "behaviorRenderers", "extension"}) public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> { private List<RendererModel> renderers = Lists.newArrayList(); - private List<BehaviorRenderer> behaviorRenderers = Lists.newArrayList(); - private ClassName renderkitClass; - private Id key = new Id(RenderKitFactory.HTML_BASIC_RENDER_KIT); + private List<BehaviorRendererModel> behaviorRenderers = Lists.newArrayList(); + private ClassName targetClass; + private FacesId key = new FacesId(RenderKitFactory.HTML_BASIC_RENDER_KIT); @XmlElement(name = "render-kit-id", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) - @XmlJavaTypeAdapter(RenderKitIdAdapter.class) - public Id getId() { + @XmlJavaTypeAdapter(FacesIdAdapter.class) + public FacesId getId() { return key; } - public void setId(Id key) { + public void setId(FacesId key) { this.key = key; } /** * <p class="changed_added_4_0"></p> * - * @return the renderkitClass + * @return the targetClass */ @XmlElement(name = "render-kit-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(ClassAdapter.class) - public ClassName getRenderkitClass() { - return renderkitClass; + public ClassName getTargetClass() { + return targetClass; } /** * <p class="changed_added_4_0"></p> * - * @param renderkitClass the renderkitClass to set + * @param targetClass the targetClass to set */ - public void setRenderkitClass(ClassName renderkitClass) { - this.renderkitClass = renderkitClass; + public void setTargetClass(ClassName renderkitClass) { + this.targetClass = renderkitClass; } /** @@ -112,7 +112,7 @@ */ @XmlElement(name = "client-behavior-renderer", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(BehaviorRendererAdapter.class) - public List<BehaviorRenderer> getBehaviorRenderers() { + public List<BehaviorRendererModel> getBehaviorRenderers() { return this.behaviorRenderers; } @@ -120,7 +120,7 @@ * <p class="changed_added_4_0"></p> * @param behaviorRenderers the behaviorRenderers to set */ - public void setBehaviorRenderers(List<BehaviorRenderer> behaviorRenderers) { + public void setBehaviorRenderers(List<BehaviorRendererModel> behaviorRenderers) { this.behaviorRenderers = behaviorRenderers; } Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -1,48 +0,0 @@ -/* - * $Id$ - * - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.cdk.xmlconfig.model; - -import javax.xml.bind.annotation.adapters.XmlAdapter; - -import org.richfaces.cdk.model.RenderKitModel; -import org.richfaces.cdk.model.RenderKitModel.Id; - -/** - * <p class="changed_added_4_0"></p> - * @author asmirnov(a)exadel.com - * - */ -public class RenderKitIdAdapter extends XmlAdapter<String, RenderKitModel.Id>{ - - @Override - public String marshal(Id v) throws Exception { - return v.toString(); - } - - @Override - public Id unmarshal(String v) throws Exception { - return new Id(v); - } - -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -23,17 +23,18 @@ package org.richfaces.cdk.xmlconfig.model; +import java.util.Collection; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.TagModel; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.Collection; - /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,17 +21,18 @@ package org.richfaces.cdk.xmlconfig.model; +import java.util.Collection; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.AttributeModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.PropertyModel; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.Collection; - /** * @author akolonitsky * @since Jan 13, 2010 Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/RendererTemplateParserTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/RendererTemplateParserTest.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/RendererTemplateParserTest.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -21,21 +21,20 @@ */ package org.richfaces.cdk.templatecompiler; -import com.google.common.collect.Lists; -import com.google.inject.Inject; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.faces.event.ActionEvent; +import javax.faces.render.RenderKitFactory; +import javax.faces.validator.Validator; + import org.easymock.EasyMock; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.isNull; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.richfaces.cdk.As; @@ -48,9 +47,9 @@ import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.RenderKitModel; -import org.richfaces.cdk.model.RenderKitModel.Id; import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.xmlconfig.JAXB; @@ -58,15 +57,8 @@ import org.xml.sax.InputSource; import org.xml.sax.ext.EntityResolver2; -import javax.faces.event.ActionEvent; -import javax.faces.render.RenderKitFactory; -import javax.faces.validator.Validator; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.inject.Inject; /** * @author Nick Belaevski @@ -93,7 +85,7 @@ private FileManager templatesSource; private RenderKitModel getRenderkitFromModel(String renderkitId) { - RenderKitModel renderKit = library.getRenderKit(new RenderKitModel.Id(renderkitId)); + RenderKitModel renderKit = library.getRenderKit(new FacesId(renderkitId)); assertNotNull(renderKit); return renderKit; Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-05-21 18:33:03 UTC (rev 17187) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-05-21 19:35:20 UTC (rev 17188) @@ -40,6 +40,7 @@ import org.richfaces.cdk.Sources; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; +import org.richfaces.cdk.model.FacesId; import org.richfaces.cdk.model.FacetModel; import org.richfaces.cdk.model.PropertyBase; import org.richfaces.cdk.model.RenderKitModel; @@ -124,9 +125,9 @@ assertEquals(2, renderKits.size()); RenderKitModel renderKit = renderKits.get(0); - assertEquals(new RenderKitModel.Id("HTML_BASIC"), renderKit.getId()); + assertEquals(new FacesId("HTML_BASIC"), renderKit.getId()); assertEquals(1, renderKit.getRenderers().size()); - assertEquals(new RenderKitModel.Id("RDFa"), renderKits.get(1).getId()); + assertEquals(new FacesId("RDFa"), renderKits.get(1).getId()); } }