Author: alexsmirnov Date: 2010-02-04 19:09:13 -0500 (Thu, 04 Feb 2010) New Revision: 16419 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/OutputFileManager.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Source.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTaglibGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXB.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java Log: fix checkstyle errors Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/builder/model/MethodBodyStatementsContainer.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,11 +21,11 @@ package org.richfaces.builder.model; -import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer; - import java.util.ArrayList; import java.util.List; +import org.richfaces.cdk.templatecompiler.FreeMarkerRenderer; + /** * @author Nick Belaevski * @since 4.0 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -22,16 +22,8 @@ package org.richfaces.cdk; -import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.*; -import org.richfaces.cdk.apt.AptModule; -import org.richfaces.cdk.freemarker.FreeMakerModule; -import org.richfaces.cdk.generate.java.ClassGeneratorModule; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ModelModule; -import org.richfaces.cdk.templatecompiler.TemplateModule; -import org.richfaces.cdk.xmlconfig.XmlModule; - import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -41,16 +33,18 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.Nullable; +import org.richfaces.cdk.apt.AptModule; +import org.richfaces.cdk.freemarker.FreeMakerModule; +import org.richfaces.cdk.generate.java.ClassGeneratorModule; +import org.richfaces.cdk.model.ModelModule; +import org.richfaces.cdk.templatecompiler.TemplateModule; +import org.richfaces.cdk.xmlconfig.XmlModule; 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.Provides; -import com.google.inject.Singleton; import com.google.inject.Stage; -import com.google.inject.TypeLiteral; import com.google.inject.name.Names; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,11 +25,8 @@ package org.richfaces.cdk; -import com.google.inject.Inject; -import org.richfaces.cdk.model.ComponentLibrary; - /** * <p class="changed_added_4_0"> * That class builds JSF library model from different sources. It acts as Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -22,7 +22,6 @@ package org.richfaces.cdk; import com.google.inject.ImplementedBy; -import com.google.inject.Singleton; /** * That interface hides current logging system from generator classes. Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/OutputFileManager.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/OutputFileManager.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/OutputFileManager.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -30,8 +30,6 @@ import java.io.Writer; import java.util.Collections; -import org.richfaces.cdk.model.ComponentLibrary; - /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Source.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Source.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Source.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -26,7 +26,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; - import com.google.inject.BindingAnnotation; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,13 +25,13 @@ package org.richfaces.cdk; +import java.util.Collection; + +import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; -import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.model.RendererModel; -import java.util.Collection; - import com.google.inject.Inject; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -47,7 +47,7 @@ public class AptBuilder implements LibraryBuilder { @Inject - private Logger LOG ; + private Logger log; @Inject private CompilationTaskFactory taskFactory; @@ -74,4 +74,4 @@ } } - } +} Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/CdkConfiguration.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,10 +23,10 @@ package org.richfaces.cdk.freemarker; +import org.richfaces.cdk.Logger; + import com.google.inject.Inject; -import org.richfaces.cdk.Logger; - import freemarker.template.Configuration; import freemarker.template.ObjectWrapper; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,24 +25,19 @@ package org.richfaces.cdk.freemarker; -import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.io.Writer; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; -import org.richfaces.cdk.OutputFolder; -import org.richfaces.cdk.OutputType; -import org.richfaces.cdk.StandardOutputFolders; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.LibraryVisitor; import org.richfaces.cdk.model.Trackable; import org.richfaces.cdk.model.Visitable; +import com.google.inject.Inject; + import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,11 +25,12 @@ package org.richfaces.cdk.freemarker; +import org.richfaces.cdk.model.ModelElementBase; + import freemarker.ext.beans.BeansWrapper; import freemarker.template.ObjectWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.cdk.model.ModelElementBase; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ModelElementBaseTemplateModel.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,23 +25,25 @@ package org.richfaces.cdk.freemarker; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + +import org.richfaces.cdk.model.EventName; +import org.richfaces.cdk.model.ModelElementBase; +import org.richfaces.cdk.model.Property; + 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.EventName; -import org.richfaces.cdk.model.ModelElementBase; -import org.richfaces.cdk.model.Property; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; - /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/PropertyModel.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -30,7 +30,6 @@ import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; - import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTaglibGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTaglibGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTaglibGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -24,18 +24,16 @@ import java.io.File; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.OutputFolder; -import org.richfaces.cdk.OutputType; import org.richfaces.cdk.StandardOutputFolders; -import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ValidatorModel; import org.richfaces.cdk.model.Visitable; +import com.google.inject.Inject; + import freemarker.template.Configuration; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/BehaviorClassGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -24,8 +24,6 @@ import java.io.File; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -36,6 +34,8 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.Visitable; +import com.google.inject.Inject; + import freemarker.template.Configuration; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -27,8 +27,6 @@ import java.io.File; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -39,6 +37,8 @@ import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.Visitable; +import com.google.inject.Inject; + import freemarker.template.Configuration; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ConverterClassGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -24,8 +24,6 @@ import java.io.File; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; @@ -36,6 +34,8 @@ import org.richfaces.cdk.model.ConverterModel; import org.richfaces.cdk.model.Visitable; +import com.google.inject.Inject; + import freemarker.template.Configuration; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ValidatorClassGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -24,20 +24,18 @@ import java.io.File; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.OutputFolder; -import org.richfaces.cdk.OutputType; import org.richfaces.cdk.StandardOutputFolders; -import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.freemarker.FreeMarkerRenderer; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ValidatorModel; import org.richfaces.cdk.model.Visitable; +import com.google.inject.Inject; + import freemarker.template.Configuration; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,10 +23,10 @@ package org.richfaces.cdk.model; +import java.io.Serializable; + import com.google.common.collect.ImmutableMap; -import java.io.Serializable; - /** * <p class="changed_added_4_0"> * Tthat class represents information about Jsf object class. Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,11 +25,6 @@ package org.richfaces.cdk.model; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.model.RenderKitModel.Id; - -import com.google.inject.Singleton; - import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; @@ -40,6 +35,11 @@ import java.util.Map; import java.util.NoSuchElementException; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.model.RenderKitModel.Id; + +import com.google.inject.Singleton; + /** * <p class="changed_added_4_0"> * That class contains model of all JSF components asscoiated with that project Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -1,10 +1,10 @@ package org.richfaces.cdk.model; -import org.richfaces.cdk.CdkException; - import java.util.Collection; import java.util.Map; +import org.richfaces.cdk.CdkException; + /** * That class represents JSF component in the CDK. * That is mapped to faces-config "component" element. Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/ConfigExtension.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -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> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -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/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Properties.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,10 +23,10 @@ package org.richfaces.cdk.model; +import java.util.List; + import com.google.common.collect.Lists; -import java.util.List; - /** * <p class="changed_added_4_0">That class contains properties collection from standard include file.</p> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,13 +23,13 @@ package org.richfaces.cdk.model; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import java.util.List; +import java.util.Set; import org.richfaces.cdk.CdkException; -import java.util.List; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; /** * That class represents JSF component property. Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,9 +23,9 @@ package org.richfaces.cdk.model; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.io.Serializable; /** * <p class="changed_added_4_0">That bean represents whole tag library.</p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,11 +21,6 @@ */ package org.richfaces.cdk.parser.el.types; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.JavaLogger; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.util.ArrayUtils; - import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; import java.text.MessageFormat; @@ -40,6 +35,12 @@ import javax.faces.component.behavior.Behavior; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; + +import org.richfaces.cdk.JavaLogger; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.util.ArrayUtils; + import com.google.inject.Inject; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/FreeMarkerRenderer.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -1,10 +1,10 @@ package org.richfaces.cdk.templatecompiler; -import freemarker.template.TemplateException; - import java.io.IOException; import java.io.Writer; +import freemarker.template.TemplateException; + public interface FreeMarkerRenderer { public void writeSnippet(String templateName, Object object, Writer writer) Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -1,10 +1,11 @@ package org.richfaces.cdk.templatecompiler; +import org.richfaces.builder.model.MethodBodyStatement; + import freemarker.ext.beans.BeansWrapper; import freemarker.template.ObjectWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.builder.model.MethodBodyStatement; public class JavaClassModelWrapper extends BeansWrapper implements ObjectWrapper { Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,10 +23,11 @@ package org.richfaces.cdk.templatecompiler; +import org.richfaces.builder.model.MethodBodyStatement; + import freemarker.ext.beans.BeanModel; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.builder.model.MethodBodyStatement; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,13 +23,9 @@ package org.richfaces.cdk.templatecompiler; -import java.io.File; import java.io.IOException; -import java.io.PrintWriter; import java.io.Writer; -import com.google.inject.Inject; - import org.richfaces.builder.model.JavaClass; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; @@ -42,6 +38,8 @@ import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.templatecompiler.model.Template; +import com.google.inject.Inject; + import freemarker.template.TemplateException; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -38,7 +38,6 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.render.Renderer; -import com.google.inject.Inject; import javax.xml.namespace.QName; import org.richfaces.builder.model.Argument; @@ -75,9 +74,9 @@ import org.richfaces.cdk.templatecompiler.model.TemplateVisitor; import org.richfaces.cdk.util.Strings; import org.richfaces.cdk.xmlconfig.JAXB; -import org.richfaces.cdk.xmlconfig.JAXBBinding; import com.google.common.collect.Lists; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -32,8 +32,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Logger; @@ -54,6 +52,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/VisitorFactoryImpl.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,15 +23,13 @@ package org.richfaces.cdk.templatecompiler; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.Logger; import org.richfaces.cdk.templatecompiler.model.CompositeInterface; -import org.richfaces.cdk.templatecompiler.model.TemplateVisitor; import org.richfaces.cdk.xmlconfig.JAXB; -import org.richfaces.cdk.xmlconfig.JAXBBinding; +import com.google.inject.Inject; + /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/AnyElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,12 +23,13 @@ package org.richfaces.cdk.templatecompiler.model; -import org.richfaces.cdk.CdkException; +import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; import javax.xml.namespace.QName; -import java.util.Map; +import org.richfaces.cdk.CdkException; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkBodyElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,10 +23,10 @@ package org.richfaces.cdk.templatecompiler.model; +import javax.xml.bind.annotation.XmlRootElement; + import org.richfaces.cdk.CdkException; -import javax.xml.bind.annotation.XmlRootElement; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkCallElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,11 +23,11 @@ package org.richfaces.cdk.templatecompiler.model; -import org.richfaces.cdk.CdkException; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; +import org.richfaces.cdk.CdkException; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkChooseElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,13 +21,14 @@ */ package org.richfaces.cdk.templatecompiler.model; -import org.richfaces.cdk.CdkException; +import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; -import java.util.List; +import org.richfaces.cdk.CdkException; + /** * @author Nick Belaevski * @since 4.0 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkForEachElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,11 +21,11 @@ */ package org.richfaces.cdk.templatecompiler.model; -import org.richfaces.cdk.CdkException; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; +import org.richfaces.cdk.CdkException; + /** * @author Nick Belaevski * @since 4.0 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkIfElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,10 +21,10 @@ */ package org.richfaces.cdk.templatecompiler.model; +import javax.xml.bind.annotation.XmlRootElement; + import org.richfaces.cdk.CdkException; -import javax.xml.bind.annotation.XmlRootElement; - /** * @author Nick Belaevski * @since 4.0 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ElementsHandler.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,11 +23,6 @@ package org.richfaces.cdk.templatecompiler.model; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentFragment; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import javax.xml.XMLConstants; import javax.xml.bind.JAXB; import javax.xml.bind.ValidationEventHandler; @@ -40,6 +35,11 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/LeafModelElement.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -1,8 +1,9 @@ package org.richfaces.cdk.templatecompiler.model; +import java.util.List; + import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlMixed; -import java.util.List; public interface LeafModelElement extends ModelElement { Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelBase.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,10 +23,10 @@ package org.richfaces.cdk.templatecompiler.model; +import java.util.List; + import com.google.common.collect.Lists; -import java.util.List; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ModelFragment.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -1,12 +1,13 @@ package org.richfaces.cdk.templatecompiler.model; -import org.richfaces.cdk.CdkException; +import java.util.List; import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlSeeAlso; -import java.util.List; +import org.richfaces.cdk.CdkException; + /** * <p class="changed_added_4_0">All classes that are used in template bodey should be presented * in the {@link XmlSeeAlso} annotation </p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -30,18 +30,16 @@ import java.io.InputStream; import java.net.URI; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkClassLoader; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Source; -import org.richfaces.cdk.SourceType; import org.richfaces.cdk.StandardSources; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.ext.EntityResolver2; import com.google.common.collect.ImmutableMap; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,20 +25,18 @@ package org.richfaces.cdk.xmlconfig; -import java.io.File; import java.io.Writer; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.OutputFolder; import org.richfaces.cdk.StandardOutputFolders; -import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; +import com.google.inject.Inject; + /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -25,8 +25,6 @@ import java.io.File; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.ModelBuilder; @@ -36,6 +34,8 @@ import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; import org.richfaces.cdk.xmlconfig.model.FacesConfigBean; +import com.google.inject.Inject; + /** * <p class="changed_added_4_0"> * </p> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -26,8 +26,6 @@ import java.util.Collections; import java.util.Map; -import com.google.inject.Inject; - import org.richfaces.cdk.CdkException; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; @@ -35,6 +33,8 @@ import org.richfaces.cdk.xmlconfig.model.ComponentAdapter; import org.richfaces.cdk.xmlconfig.model.Fragment; +import com.google.inject.Inject; + /** * <p class="changed_added_4_0"> * That class parses xml document with fragment of faces-config ( eg, standard component attributes ) Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXB.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXB.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXB.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -1,12 +1,12 @@ package org.richfaces.cdk.xmlconfig; -import org.richfaces.cdk.CdkException; - import java.io.File; import java.io.Writer; import javax.xml.transform.Result; +import org.richfaces.cdk.CdkException; + public interface JAXB { public abstract <T> T unmarshal(File file, String schemaLocation, Class<T> bindClass) throws CdkException; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -30,7 +30,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -40,7 +39,6 @@ import java.net.URISyntaxException; import java.util.Collection; -import com.google.inject.Inject; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; @@ -63,6 +61,7 @@ import org.xml.sax.helpers.XMLReaderFactory; import com.google.common.collect.ImmutableSet; +import com.google.inject.Inject; /** * <p class="changed_added_4_0"> Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -22,17 +22,18 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; +import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import com.google.common.collect.Lists; + /** * @author akolonitsky * @since Jan 21, 2010 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,16 +23,16 @@ import java.util.List; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import com.google.common.collect.Lists; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** * @author akolonitsky * @since Jan 6, 2010 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -31,14 +31,14 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.BehaviorModel; +import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ComponentModel; -import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.ConverterModel; import org.richfaces.cdk.model.EventModel; import org.richfaces.cdk.model.Extensible; -import org.richfaces.cdk.model.ConverterModel; import org.richfaces.cdk.model.ValidatorModel; -import org.richfaces.cdk.model.BehaviorModel; import com.google.common.collect.Lists; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,15 +21,16 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.ComponentLibrary; +import java.util.List; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; + import com.google.common.collect.Lists; /** Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/NamesListComparator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,10 +21,10 @@ package org.richfaces.cdk.xmlutils; +import java.util.Comparator; + import org.w3c.dom.Node; -import java.util.Comparator; - /** * @author Nick Belaevski * @since 3.2.2 Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBody.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,6 +21,20 @@ package org.richfaces.cdk.xmlutils; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; @@ -30,19 +44,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - class ArrayNodeList implements NodeList { private Node[] nodes; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodyMerge.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,15 +21,6 @@ package org.richfaces.cdk.xmlutils; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -37,6 +28,16 @@ import java.util.List; import java.util.Set; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + /** * @author Maksim Kaszynski */ Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XMLBodySerializer.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,9 +21,7 @@ package org.richfaces.cdk.xmlutils; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentFragment; -import org.w3c.dom.NodeList; +import java.io.StringWriter; import javax.xml.transform.ErrorListener; import javax.xml.transform.Transformer; @@ -31,8 +29,11 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import java.io.StringWriter; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.NodeList; + /** * @author Maksim Kaszynski */ Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/XPathComparator.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,13 +21,14 @@ package org.richfaces.cdk.xmlutils; -import org.w3c.dom.Node; +import java.util.Comparator; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import java.util.Comparator; +import org.w3c.dom.Node; + /** * @author Maksim Kaszynski */ Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/DocumentDefinitionFactory.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,10 +21,10 @@ package org.richfaces.cdk.xmlutils.dtd; +import java.net.URL; + import org.richfaces.cdk.xmlutils.dtd.wutka.WutkaDefinitionFactory; -import java.net.URL; - /** * @author Maksim Kaszynski */ Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -21,19 +21,18 @@ package org.richfaces.cdk.xmlutils.dtd.wutka; +import java.net.URL; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + import org.richfaces.cdk.Logger; import org.richfaces.cdk.xmlutils.dtd.Attribute; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; import org.richfaces.cdk.xmlutils.dtd.Element; -import java.net.URL; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - import com.google.inject.Inject; - import com.wutka.dtd.DTD; import com.wutka.dtd.DTDAttribute; import com.wutka.dtd.DTDElement; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -23,6 +23,11 @@ package org.richfaces.cdk.xmlutils.dtd.xerces; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + import org.apache.xerces.impl.Constants; import org.apache.xerces.parsers.XMLGrammarPreparser; import org.apache.xerces.xni.XNIException; @@ -35,11 +40,6 @@ import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - import com.google.inject.Inject; /** Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java 2010-02-04 23:57:31 UTC (rev 16418) +++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/AbstractClassGeneratorTest.java 2010-02-05 00:09:13 UTC (rev 16419) @@ -101,7 +101,8 @@ protected static void compareTextFiles(Reader reference, Reader output) throws IOException { LineNumberReader ref = new LineNumberReader(reference); LineNumberReader out = new LineNumberReader(output); - String refLine = "", outLine = ""; + String refLine = ""; + String outLine = ""; while (refLine != null || outLine != null) { if (refLine == null) { Assert.fail("Output text is longer than reference text");