Author: gvanmatre Date: Mon Jun 5 09:03:16 2006 New Revision: 411837 URL: http://svn.apache.org/viewvc?rev=411837&view=rev Log: Cleaned up some compiler warnings.
Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AssignChildrenCommand.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/PropertyValueCommand.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentBean.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandlerCommand.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/CommandButtonBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/FormBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextareaBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/MorphBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLabelBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLinkBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectBooleanCheckboxBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemsBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectManyMenuBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneMenuBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneRadioBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VerbatimBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VoidBuilder.java struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/utils/ClayAmalgam.java struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java Mon Jun 5 09:03:16 2006 @@ -28,7 +28,6 @@ import javax.faces.component.UINamingContainer; import javax.faces.context.FacesContext; import javax.faces.el.MethodBinding; -import javax.faces.el.ValueBinding; import org.apache.commons.chain.Catalog; import org.apache.commons.chain.CatalogFactory; Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AssignChildrenCommand.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AssignChildrenCommand.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AssignChildrenCommand.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AssignChildrenCommand.java Mon Jun 5 09:03:16 2006 @@ -25,8 +25,6 @@ import org.apache.commons.chain.Catalog; import org.apache.commons.chain.Command; import org.apache.commons.chain.Context; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.Globals; import org.apache.shale.clay.config.beans.ComponentBean; @@ -38,12 +36,7 @@ * <p> */ public class AssignChildrenCommand extends AbstractCommand { - - private static Log log; - static { - log = LogFactory.getLog(AssignChildrenCommand.class); - } - + /** * <p> * This [EMAIL PROTECTED] Command} iterates over the [EMAIL PROTECTED] ComponentBean} Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/PropertyValueCommand.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/PropertyValueCommand.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/PropertyValueCommand.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/PropertyValueCommand.java Mon Jun 5 09:03:16 2006 @@ -25,8 +25,6 @@ import org.apache.commons.chain.Command; import org.apache.commons.chain.Context; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.AttributeBean; import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.faces.ShaleConstants; @@ -44,11 +42,6 @@ */ public class PropertyValueCommand extends AbstractCommand implements Command { - private static Log log; - static { - log = LogFactory.getLog(PropertyValueCommand.class); - } - /** * <p>Helper class to provide access to the properties of JavaBeans.</p> */ Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentBean.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentBean.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentBean.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentBean.java Mon Jun 5 09:03:16 2006 @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map; -import java.util.TreeMap; import java.util.TreeSet; import org.apache.commons.logging.Log; Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java Mon Jun 5 09:03:16 2006 @@ -19,7 +19,6 @@ package org.apache.shale.clay.config.beans; import java.io.IOException; -import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java Mon Jun 5 09:03:16 2006 @@ -25,8 +25,6 @@ import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.ClayTemplateParser; import org.apache.shale.clay.config.Globals; @@ -39,15 +37,7 @@ * </p> */ public class TemplateConfigBean extends ComponentConfigBean { - - /** - * <p>Common logger utility class.</p> - */ - private static Log log; - static { - log = LogFactory.getLog(TemplateConfigBean.class); - } - + /** * <p>Returns a [EMAIL PROTECTED] ComponentBean} that is materialized * using a HTML template fragment. The <code>templateName</code> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java Mon Jun 5 09:03:16 2006 @@ -190,9 +190,7 @@ * Otherwise a -1 is returned. */ protected int indexOfClayTemplateSuffix(FacesContext context, String viewId) { - - int index = -1; - + if (suffixes == null) { suffixes = new String[2]; Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandlerCommand.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandlerCommand.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandlerCommand.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandlerCommand.java Mon Jun 5 09:03:16 2006 @@ -66,8 +66,6 @@ */ protected int indexOfClayTemplateSuffix(ShaleWebContext context) { - int index = -1; - if (suffixes == null) { suffixes = new String[2]; Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/CommandButtonBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/CommandButtonBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/CommandButtonBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/CommandButtonBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; import org.apache.shale.clay.parser.builder.chain.InputBuilderRule; @@ -30,16 +28,6 @@ * [EMAIL PROTECTED] InputBuilderRule}. */ public class CommandButtonBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(CommandButtonBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/FormBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/FormBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/FormBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/FormBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.parser.Node; /** @@ -29,16 +27,6 @@ * </p> */ public class FormBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(FormBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; @@ -33,16 +31,6 @@ */ public class InputTextBuilder extends Builder { - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(InputTextBuilder.class); - } - /** * <p> * The default for this builder is that builder will handle the children Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextareaBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextareaBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextareaBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/InputTextareaBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; @@ -31,16 +29,6 @@ * </p> */ public class InputTextareaBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(InputTextareaBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/MorphBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/MorphBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/MorphBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/MorphBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.parser.Node; /** @@ -33,15 +31,6 @@ * </p> */ public class MorphBuilder extends Builder { - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(MorphBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLabelBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLabelBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLabelBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLabelBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; @@ -35,16 +33,7 @@ */ public class OutputLabelBuilder extends Builder { - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(OutputLabelBuilder.class); - } - + /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLinkBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLinkBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLinkBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/OutputLinkBuilder.java Mon Jun 5 09:03:16 2006 @@ -26,21 +26,9 @@ * </p> */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.parser.Node; public class OutputLinkBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(OutputLinkBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectBooleanCheckboxBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectBooleanCheckboxBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectBooleanCheckboxBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectBooleanCheckboxBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; import org.apache.shale.clay.parser.builder.chain.InputBuilderRule; @@ -33,16 +31,6 @@ * */ public class SelectBooleanCheckboxBuilder extends Builder { - - /** - * <p> - * Returns the common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(SelectBooleanCheckboxBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.AttributeBean; import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.clay.config.beans.ElementBean; @@ -34,16 +32,6 @@ * </p> */ public class SelectItemBuilder extends Builder { - - /** - * <p> - * Common logger utility. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(SelectItemBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemsBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemsBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemsBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectItemsBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; import org.apache.shale.clay.parser.builder.chain.OptionBuilderRule; @@ -32,16 +30,6 @@ * </p> */ public class SelectItemsBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(SelectItemsBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectManyMenuBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectManyMenuBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectManyMenuBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectManyMenuBuilder.java Mon Jun 5 09:03:16 2006 @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; @@ -36,16 +34,6 @@ * <p> */ public class SelectManyMenuBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(SelectManyMenuBuilder.class); - } /** * <p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneMenuBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneMenuBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneMenuBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneMenuBuilder.java Mon Jun 5 09:03:16 2006 @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; @@ -37,16 +35,7 @@ * </p> */ public class SelectOneMenuBuilder extends Builder { - - /** - * <p> - * Common logger utility class</code> - */ - private static Log log; - static { - log = LogFactory.getLog(SelectOneMenuBuilder.class); - } - + /** * <p> * Returns a JSF component type of Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneRadioBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneRadioBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneRadioBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/SelectOneRadioBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.parser.Node; /** @@ -31,17 +29,7 @@ * </p> */ public class SelectOneRadioBuilder extends Builder { - - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(SelectOneRadioBuilder.class); - } - + /** * <p> * Returns a JSF component type of Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VerbatimBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VerbatimBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VerbatimBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VerbatimBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,8 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.config.beans.AttributeBean; import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.clay.config.beans.ElementBean; @@ -36,16 +34,6 @@ */ public class VerbatimBuilder extends Builder { - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(VerbatimBuilder.class); - } - /** * <p> * Returns the <code>jsfid</code> for the target [EMAIL PROTECTED] ElementBean}. Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VoidBuilder.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VoidBuilder.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VoidBuilder.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/VoidBuilder.java Mon Jun 5 09:03:16 2006 @@ -18,10 +18,6 @@ package org.apache.shale.clay.parser.builder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.shale.clay.config.beans.AttributeBean; -import org.apache.shale.clay.config.beans.ComponentBean; import org.apache.shale.clay.config.beans.ElementBean; import org.apache.shale.clay.parser.Node; @@ -34,16 +30,6 @@ */ public class VoidBuilder extends Builder { - /** - * <p> - * Common logger utility class. - * </p> - */ - private static Log log; - static { - log = LogFactory.getLog(VoidBuilder.class); - } - /** * <p> * Returns the <code>jsfid</code> for the target [EMAIL PROTECTED] ElementBean}. Modified: struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/utils/ClayAmalgam.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/utils/ClayAmalgam.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/utils/ClayAmalgam.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/utils/ClayAmalgam.java Mon Jun 5 09:03:16 2006 @@ -28,8 +28,6 @@ import javax.faces.el.ValueBinding; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.shale.clay.component.Clay; import org.apache.shale.clay.config.ClayConfigureListener; import org.apache.shale.clay.config.Globals; @@ -49,14 +47,6 @@ * the clay component's registration.</p> */ public class ClayAmalgam { - - /** - * <p>Commons logging utility object static instance.</p> - */ - private static Log log; - static { - log = LogFactory.getLog(ClayAmalgam.class); - } /** * <p>Message resources for this class.</p> Modified: struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java?rev=411837&r1=411836&r2=411837&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java (original) +++ struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/CommentTestCase.java Mon Jun 5 09:03:16 2006 @@ -20,7 +20,6 @@ import java.util.List; import javax.faces.context.ResponseWriter; -import javax.faces.render.RenderKitFactory; import javax.faces.render.Renderer; import junit.framework.Test;