Author: alexsmirnov Date: 2010-01-26 12:00:20 -0500 (Tue, 26 Jan 2010) New Revision: 16361 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/VirtualFileManager.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/RendererClassVisitor.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 Log: https://jira.jboss.org/jira/browse/RF-8288 Move log to injections 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-01-26 03:26:02 UTC (rev 16360) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2010-01-26 17:00:20 UTC (rev 16361) @@ -25,6 +25,14 @@ package org.richfaces.cdk.apt; +import org.richfaces.cdk.CdkClassLoader; +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.ModelBuilder; +import org.richfaces.cdk.StandardOutputs; +import org.richfaces.cdk.StandardSources; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -34,6 +42,7 @@ import java.util.Locale; import javax.annotation.processing.Processor; +import javax.inject.Inject; import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.JavaCompiler; @@ -44,15 +53,6 @@ import javax.tools.Diagnostic.Kind; import javax.tools.JavaCompiler.CompilationTask; -import org.richfaces.cdk.CdkClassLoader; -import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; -import org.richfaces.cdk.ModelBuilder; -import org.richfaces.cdk.StandardOutputs; -import org.richfaces.cdk.StandardSources; - import com.google.common.collect.Lists; /** @@ -64,7 +64,8 @@ * */ public class AptBuilder implements ModelBuilder { - private static final Logger LOG = LoggerFactory.getLogger(); + @Inject + private static Logger LOG ; private boolean initialized = false; private CdkContext context; private StandardJavaFileManager fileManager; Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java =================================================================== --- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2010-01-26 03:26:02 UTC (rev 16360) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2010-01-26 17:00:20 UTC (rev 16361) @@ -23,18 +23,8 @@ package org.richfaces.cdk.apt; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import com.google.common.collect.Lists; import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardLocation; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -44,6 +34,18 @@ import java.util.List; import java.util.Set; +import javax.inject.Inject; +import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaFileManager; +import javax.tools.JavaFileObject; +import javax.tools.StandardLocation; +import javax.tools.JavaFileObject.Kind; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import com.google.common.collect.Lists; + /** * <p class="changed_added_4_0"> * That class wraps {@link javax.tools.StandardJavaFileManager} @@ -52,7 +54,8 @@ * @author asmirnov(a)exadel.com */ final class VirtualFileManager extends ForwardingJavaFileManager<JavaFileManager> { - private static final Logger LOG = LoggerFactory.getLogger(); + @Inject + private static Logger LOG; // private final BiMap<FileObjectKey, FileObject> classPathFiles; // private final BiMap<FileObject, FileObjectKey> inversedClassPathFiles; 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-01-26 03:26:02 UTC (rev 16360) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2010-01-26 17:00:20 UTC (rev 16361) @@ -21,6 +21,10 @@ */ package org.richfaces.cdk.parser.el.types; +import org.richfaces.cdk.Logger; +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; @@ -35,19 +39,16 @@ import javax.faces.component.behavior.Behavior; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import javax.inject.Inject; -import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; -import org.richfaces.cdk.parser.el.Type; -import org.richfaces.cdk.util.ArrayUtils; - /** * @author Nick Belaevski * */ public final class TypesFactory { - private static final Logger LOG = LoggerFactory.getLogger(); + @Inject + private static Logger LOG; private static final Map<java.lang.reflect.Type, Type> REFLECTION_TYPES_CACHE = Collections .synchronizedMap(new HashMap<java.lang.reflect.Type, Type>()); 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-01-26 03:26:02 UTC (rev 16360) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-01-26 17:00:20 UTC (rev 16361) @@ -23,22 +23,6 @@ package org.richfaces.cdk.templatecompiler; -import java.io.IOException; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -import javax.annotation.Generated; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.Renderer; -import javax.xml.namespace.QName; - import org.richfaces.builder.model.Argument; import org.richfaces.builder.model.JavaClass; import org.richfaces.builder.model.JavaField; @@ -48,7 +32,6 @@ import org.richfaces.builder.model.MethodBodyStatementsContainer; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.attributes.Attribute; import org.richfaces.cdk.attributes.Element; import org.richfaces.cdk.attributes.Schema; @@ -74,6 +57,23 @@ import org.richfaces.cdk.util.Strings; import org.richfaces.cdk.xmlconfig.JAXBBinding; +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import javax.annotation.Generated; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.render.Renderer; +import javax.inject.Inject; +import javax.xml.namespace.QName; + import com.google.common.collect.Lists; /** @@ -114,7 +114,8 @@ */ private static final String PASS_THROUGH_ATTRIBUTES_FIELD_NAME = "PASS_THROUGH_ATTRIBUTES"; - private static final Logger LOG = LoggerFactory.getLogger(); + @Inject + private static Logger LOG; private static final Set<String> DEFAULT_NAMESPACES = new HashSet<String>(); 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-01-26 03:26:02 UTC (rev 16360) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/wutka/WutkaDefinitionFactory.java 2010-01-26 17:00:20 UTC (rev 16361) @@ -21,12 +21,7 @@ package org.richfaces.cdk.xmlutils.dtd.wutka; -import com.wutka.dtd.DTD; -import com.wutka.dtd.DTDAttribute; -import com.wutka.dtd.DTDElement; -import com.wutka.dtd.DTDParser; import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.xmlutils.dtd.Attribute; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; @@ -37,11 +32,20 @@ import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; + +import com.wutka.dtd.DTD; +import com.wutka.dtd.DTDAttribute; +import com.wutka.dtd.DTDElement; +import com.wutka.dtd.DTDParser; + /** * @author Maksim Kaszynski */ public class WutkaDefinitionFactory extends DocumentDefinitionFactory { - private final Logger log = LoggerFactory.getLogger(); + + @Inject + private Logger log; private Map<URL, DocumentDefinition> definitions = new HashMap<URL, DocumentDefinition>(); @Override 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-01-26 03:26:02 UTC (rev 16360) +++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/xmlutils/dtd/xerces/XercesDefinitionFactory.java 2010-01-26 17:00:20 UTC (rev 16361) @@ -32,7 +32,6 @@ import org.apache.xerces.xni.parser.XMLInputSource; import org.apache.xerces.xs.XSModel; import org.richfaces.cdk.Logger; -import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinition; import org.richfaces.cdk.xmlutils.dtd.DocumentDefinitionFactory; @@ -41,6 +40,8 @@ import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; + /** * <p class="changed_added_4_0"> * That class implements {@link DocumentDefinitionFactory} that parses XML @@ -102,7 +103,9 @@ // feature: continue-after-fatal-error public static final String CONTINUE_AFTER_FATAL_ERROR = Constants.XERCES_FEATURE_PREFIX + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE; - private final Logger log = LoggerFactory.getLogger(); + + @Inject + private Logger log; private Map<URL, DocumentDefinition> definitions = new HashMap<URL, DocumentDefinition>(); @Override