This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-digester.git
The following commit(s) were added to refs/heads/master by this push: new f417e797 Remove useless inline comments f417e797 is described below commit f417e797c43f3ea5bef61242523b5999252d53ec Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Wed Jan 31 10:16:46 2024 -0500 Remove useless inline comments --- .../digester3/AbstractObjectCreationFactory.java | 4 ---- .../commons/digester3/AbstractRulesImpl.java | 6 ----- .../commons/digester3/BeanPropertySetterRule.java | 6 ----- .../apache/commons/digester3/CallMethodRule.java | 6 ----- .../org/apache/commons/digester3/Digester.java | 26 ---------------------- .../commons/digester3/FactoryCreateRule.java | 10 --------- .../apache/commons/digester3/NodeCreateRule.java | 16 ------------- .../apache/commons/digester3/ObjectCreateRule.java | 6 ----- .../commons/digester3/PathCallParamRule.java | 6 ----- .../org/apache/commons/digester3/RegexRules.java | 8 ------- .../java/org/apache/commons/digester3/Rule.java | 6 ----- .../java/org/apache/commons/digester3/RuleSet.java | 4 ---- .../org/apache/commons/digester3/RuleSetBase.java | 6 ----- .../java/org/apache/commons/digester3/Rules.java | 4 ---- .../org/apache/commons/digester3/RulesBase.java | 8 ------- .../commons/digester3/SetNestedPropertiesRule.java | 6 ----- .../org/apache/commons/digester3/SetNextRule.java | 2 -- .../apache/commons/digester3/SetPropertyRule.java | 6 ----- .../org/apache/commons/digester3/SetRootRule.java | 2 -- .../org/apache/commons/digester3/SetTopRule.java | 2 -- .../commons/digester3/plugins/Declaration.java | 6 ----- .../commons/digester3/plugins/PluginContext.java | 2 -- .../digester3/plugins/PluginCreateRule.java | 6 ----- .../digester3/plugins/PluginDeclarationRule.java | 4 ---- .../commons/digester3/plugins/PluginManager.java | 4 ---- .../commons/digester3/plugins/PluginRules.java | 6 ----- .../digester3/substitution/VariableAttributes.java | 2 -- .../digester3/BeanPropertySetterRuleTestCase.java | 4 ---- .../commons/digester3/CallMethodRuleTestCase.java | 2 -- .../apache/commons/digester3/DigesterTestCase.java | 6 ----- .../digester3/ExtendedBaseRulesTestCase.java | 2 -- .../digester3/NamespaceSnapshotTestCase.java | 2 -- .../commons/digester3/NodeCreateRuleTestCase.java | 6 ----- .../commons/digester3/ObjectParamRuleTestCase.java | 2 -- .../OverlappingCallMethodRuleTestCase.java | 4 ---- .../org/apache/commons/digester3/RuleTestCase.java | 8 ------- .../commons/digester3/RulesBaseTestCase.java | 6 ----- .../digester3/SetNestedPropertiesRuleTestCase.java | 4 ---- .../digester3/SetPropertiesRuleTestCase.java | 4 ---- .../commons/digester3/SetPropertyRuleTestCase.java | 6 ----- .../org/apache/commons/digester3/TestBean.java | 2 -- .../commons/digester3/TestFactoryCreate.java | 2 -- .../org/apache/commons/digester3/TestRule.java | 8 ------- .../org/apache/commons/digester3/TestRuleSet.java | 6 ----- .../org/apache/commons/digester3/URLTestCase.java | 8 ------- .../apache/commons/digester3/XIncludeTestCase.java | 4 ---- .../commons/digester3/XMLSchemaTestCase.java | 8 ------- .../plugins/TestConfigurablePluginAttributes.java | 1 - .../commons/digester3/plugins/TestDeclaration.java | 1 - .../digester3/plugins/TestDefaultPlugin.java | 1 - .../commons/digester3/plugins/TestDelegate.java | 1 - .../commons/digester3/plugins/TestInline.java | 1 - .../commons/digester3/plugins/TestLocalRules.java | 1 - .../commons/digester3/plugins/TestRecursion.java | 1 - .../commons/digester3/plugins/TestRuleInfo.java | 1 - .../commons/digester3/plugins/TestXmlRuleInfo.java | 1 - .../substitution/VariableExpansionTestCase.java | 3 --- .../api/documentmarkup/SetTextSegmentRule.java | 6 ----- .../org/apache/commons/digester3/rss/Channel.java | 6 ----- .../org/apache/commons/digester3/rss/Image.java | 4 ---- .../org/apache/commons/digester3/rss/Item.java | 4 ---- .../apache/commons/digester3/rss/RSSDigester.java | 14 ------------ .../apache/commons/digester3/rss/TextInput.java | 4 ---- 63 files changed, 314 deletions(-) diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java index 8cc01edb..37bd1040 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java @@ -30,15 +30,11 @@ public abstract class AbstractObjectCreationFactory<T> implements ObjectCreationFactory<T> { - // ----------------------------------------------------- Instance Variables - /** * The associated {@code Digester} instance that was set up by {@link FactoryCreateRule} upon initialization. */ private Digester digester; - // --------------------------------------------------------- Public Methods - /** * Factory method called by {@link FactoryCreateRule} to supply an object based on the element's attributes. * diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java index 8a1d8396..4f378f68 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java @@ -37,16 +37,12 @@ public abstract class AbstractRulesImpl implements Rules { - // ------------------------------------------------------------- Fields - /** Digester using this {@code Rules} implementation */ private Digester digester; /** Namespace uri to assoicate with subsequent {@code Rule}'s */ private String namespaceURI; - // ------------------------------------------------------------- Properties - /** * {@inheritDoc} */ @@ -94,8 +90,6 @@ public abstract class AbstractRulesImpl */ protected abstract void registerRule( String pattern, Rule rule ); - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java index a76171a7..e9129430 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java @@ -49,8 +49,6 @@ public class BeanPropertySetterRule extends Rule { - // ----------------------------------------------------------- Constructors - /** * Sets this property on the top object. */ @@ -61,8 +59,6 @@ public class BeanPropertySetterRule */ private String propertyNameFromAttribute; - // ----------------------------------------------------- Instance Variables - /** * The body text used to set the property. */ @@ -91,8 +87,6 @@ public class BeanPropertySetterRule this.propertyName = propertyName; } - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java index 4a418694..50609968 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/CallMethodRule.java @@ -86,8 +86,6 @@ public class CallMethodRule extends Rule { - // ----------------------------------------------------------- Constructors - /** * The body text collected from this element. */ @@ -139,8 +137,6 @@ public class CallMethodRule this( targetOffset, methodName, 0, (Class[]) null ); } - // ----------------------------------------------------- Instance Variables - /** * Constructs a "call method" rule with the specified method name. The parameter types (if any) default to * java.lang.String. @@ -285,8 +281,6 @@ public class CallMethodRule this( 0, methodName, paramCount, paramTypes ); } - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/Digester.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/Digester.java index c9e50111..15896e09 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/Digester.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/Digester.java @@ -96,8 +96,6 @@ public class Digester extends DefaultHandler { - // --------------------------------------------------------- Constructors - /** * The schema language supported. By default, we use this one. */ @@ -113,8 +111,6 @@ public class Digester */ private final Stack<StringBuilder> bodyTexts = new Stack<StringBuilder>(); - // --------------------------------------------------- Instance Variables - /** * Stack whose elements are List objects, each containing a list of Rule objects as returned from Rules.getMatch(). * As each xml element in the input is entered, the matching rules are pushed onto this stack. After the end tag is @@ -308,8 +304,6 @@ public class Digester this.parser = parser; } - // ------------------------------------------------------------- Properties - /** * Constructs a new Digester, allowing an XMLReader to be passed in. This allows Digester to be used in environments * which are unfriendly to JAXP1.1 (such as WebLogic 6.0). Note that if you use this option you have to configure @@ -962,8 +956,6 @@ public class Digester } ); } - // ------------------------------------------------- ContentHandler Methods - /** * Creates a Callable instance that parse the content of the specified reader using this Digester. * @@ -1255,8 +1247,6 @@ public class Digester return createSAXException( message, null ); } - // ----------------------------------------------------- DTDHandler Methods - /** * Create a SAX exception which also understands about the location in the digester file where the exception occurs * @@ -1334,8 +1324,6 @@ public class Digester clear(); } - // ----------------------------------------------- EntityResolver Methods - /** * {@inheritDoc} */ @@ -1499,8 +1487,6 @@ public class Digester + exception.getMessage(), exception ); } - // ------------------------------------------------- ErrorHandler Methods - /** * {@inheritDoc} */ @@ -1565,8 +1551,6 @@ public class Digester return ( this.getClass().getClassLoader() ); } - // ------------------------------------------------------- Public Methods - /** * Gets the current depth of the element stack. * @@ -1847,8 +1831,6 @@ public class Digester return this.<T> npeSafeCast( root ); } - // --------------------------------------------------------- Rule Methods - /** * Gets the namespace URI that will be applied to all subsequently added {@code Rule} objects. * @@ -2741,8 +2723,6 @@ public class Digester this.classLoader = classLoader; } - // --------------------------------------------------- Object Stack Methods - /** * Redirects (or cancels redirecting) of SAX ContentHandler events to an external object. * <p> @@ -2911,10 +2891,6 @@ public class Digester this.rules.setDigester( this ); } - // ------------------------------------------------ Parameter Stack Methods - - // ------------------------------------------------------ Protected Methods - /** * Sets the logger used for logging SAX-related information. <strong>Note</strong> the output is finely grained. * @@ -2962,8 +2938,6 @@ public class Digester useContextClassLoader = use; } - // -------------------------------------------------------- Package Methods - /** * Sets the validating parser flag. This must be called before {@code parse()} is called the first time. * By default the value of this is set to false. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java index 390d9fad..0ccfd138 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java @@ -40,16 +40,12 @@ public class FactoryCreateRule extends Rule { - // ----------------------------------------------------------- Fields - /** Should exceptions thrown by the factory be ignored? */ private final boolean ignoreCreateExceptions; /** Stock to manage */ private Stack<Boolean> exceptionIgnoredStack; - // ----------------------------------------------------------- Constructors - /** * The attribute containing an override class name if it is present. */ @@ -172,8 +168,6 @@ public class FactoryCreateRule this( className, false ); } - // ----------------------------------------------------- Instance Variables - /** * Constructs a factory create rule that will use the specified class name to create an {@link ObjectCreationFactory} * which will then be used to create an object and push it on the stack. @@ -222,8 +216,6 @@ public class FactoryCreateRule this.ignoreCreateExceptions = ignoreCreateExceptions; } - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ @@ -365,8 +357,6 @@ public class FactoryCreateRule return ( creationFactory ); } - // ------------------------------------------------------ Protected Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/NodeCreateRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/NodeCreateRule.java index 7dc36c75..1c0a34f5 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/NodeCreateRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/NodeCreateRule.java @@ -65,8 +65,6 @@ public class NodeCreateRule extends Rule { - // ---------------------------------------------------------- Inner Classes - /** * The SAX content handler that does all the actual work of assembling the DOM node tree from the SAX events. */ @@ -74,15 +72,11 @@ public class NodeCreateRule extends DefaultHandler { - // ------------------------------------------------------- Constructors - /** * The content handler used by Digester before it was set to this content handler. */ protected ContentHandler oldContentHandler; - // ------------------------------------------------- Instance Variables - /** * Depth of the current node, relative to the element where the content handler was put into action. */ @@ -130,8 +124,6 @@ public class NodeCreateRule oldContentHandler = getDigester().getCustomContentHandler(); } - // --------------------------------------------- Helper Methods - /** * Appends a {@link org.w3c.dom.Text Text} node to the current node if the content reported by the parser is not * purely whitespace. @@ -161,8 +153,6 @@ public class NodeCreateRule } } - // --------------------------------------------- ContentHandler Methods - /** * Handle notification about text embedded within the current node. * <p> @@ -295,8 +285,6 @@ public class NodeCreateRule } } - // ----------------------------------------------------------- Constructors - /** * The JAXP {@code DocumentBuilder} to use. */ @@ -333,8 +321,6 @@ public class NodeCreateRule this( Node.ELEMENT_NODE, documentBuilder ); } - // ----------------------------------------------------- Instance Variables - /** * Constructs a new instance. Creates an instance of this rule that will create either a DOM {@link org.w3c.dom.Element Element} * or a DOM {@link org.w3c.dom.DocumentFragment DocumentFragment}, depending on the value of the @@ -372,8 +358,6 @@ public class NodeCreateRule this.documentBuilder = documentBuilder; } - // ----------------------------------------------------------- Rule Methods - /** * When this method fires, the digester is told to forward all SAX ContentHandler events to the builder object, * resulting in a DOM being built instead of normal digester rule-handling occurring. When the end of the current diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java index 653f73c2..ce3ded40 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java @@ -185,8 +185,6 @@ public class ObjectCreateRule } } - // ----------------------------------------------------------- Constructors - private static void convertTo( final Class<?>[] types, final Object[] array ) { if ( array.length != types.length ) @@ -220,8 +218,6 @@ public class ObjectCreateRule */ protected String className; - // ----------------------------------------------------- Instance Variables - /** * The constructor argument types. * @@ -276,8 +272,6 @@ public class ObjectCreateRule this.clazz = clazz; } - // --------------------------------------------------------- Public Methods - /** * Constructs an object create rule with the specified class name and an optional attribute name containing an * override. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java index aa95b268..99ffd569 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java @@ -36,15 +36,11 @@ public class PathCallParamRule extends Rule { - // ----------------------------------------------------------- Constructors - /** * The zero-relative index of the parameter we are saving. */ protected int paramIndex; - // ----------------------------------------------------- Instance Variables - /** * Constructs a "call parameter" rule that will save the body text of this element as the parameter value. * @@ -55,8 +51,6 @@ public class PathCallParamRule this.paramIndex = paramIndex; } - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RegexRules.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RegexRules.java index 50be3ed8..9665defb 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RegexRules.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RegexRules.java @@ -40,8 +40,6 @@ public class RegexRules extends AbstractRulesImpl { - // --------------------------------------------------------- Fields - /** Used to associate rules with paths in the rules list */ private static final class RegisteredRule { @@ -59,13 +57,9 @@ public class RegexRules /** All registered {@code Rule}'s */ private final ArrayList<RegisteredRule> registeredRules = new ArrayList<RegisteredRule>(); - // --------------------------------------------------------- Constructor - /** The regex strategy used by this RegexRules */ private RegexMatcher matcher; - // --------------------------------------------------------- Properties - /** * Constructs sets the Regex matching strategy. * @@ -85,8 +79,6 @@ public class RegexRules registeredRules.clear(); } - // --------------------------------------------------------- Public Methods - /** * Gets the current regex matching strategy. * diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rule.java index fb6daf58..77cfdc8f 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rule.java @@ -52,8 +52,6 @@ import org.xml.sax.Attributes; */public abstract class Rule { - // ----------------------------------------------------- Instance Variables - /** * The Digester with which this Rule is associated. */ @@ -64,8 +62,6 @@ import org.xml.sax.Attributes; */ private String namespaceURI; - // ------------------------------------------------------------- Properties - /** * This method is called when the beginning of a matching XML element is encountered. * @@ -125,8 +121,6 @@ import org.xml.sax.Attributes; // The default implementation does nothing } - // --------------------------------------------------------- Public Methods - /** * Gets the Digester with which this Rule is associated. * diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSet.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSet.java index 9ce25b2e..f428f996 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSet.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSet.java @@ -38,8 +38,6 @@ package org.apache.commons.digester3; public interface RuleSet { - // ------------------------------------------------------------- Properties - /** * Add the set of Rule instances defined in this RuleSet to the specified {@code Digester} instance, * associating them with our namespace URI (if any). This method should only be called by a Digester instance. @@ -48,8 +46,6 @@ public interface RuleSet */ void addRuleInstances( Digester digester ); - // --------------------------------------------------------- Public Methods - /** * Gets the namespace URI that will be applied to all Rule instances created from this RuleSet. * diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSetBase.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSetBase.java index ecd57872..e9c35097 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSetBase.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RuleSetBase.java @@ -29,15 +29,11 @@ public abstract class RuleSetBase implements RuleSet { - // ----------------------------------------------------- Instance Variables - /** * The namespace URI that all Rule instances created by this RuleSet will be associated with. */ private final String namespaceURI; - // ----------------------------------------------------------- Constructors - /** * Build a new RuleSetBase with a null namespaceURI */ @@ -57,8 +53,6 @@ public abstract class RuleSetBase this.namespaceURI = namespaceURI; } - // ------------------------------------------------------------- Properties - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rules.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rules.java index f40209cb..8bfdced0 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rules.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/Rules.java @@ -31,8 +31,6 @@ import org.xml.sax.Attributes; public interface Rules { - // ------------------------------------------------------------- Properties - /** * Register a new Rule instance matching the specified pattern. * @@ -60,8 +58,6 @@ public interface Rules */ String getNamespaceURI(); - // --------------------------------------------------------- Public Methods - /** * Gets a List of all registered Rule instances that match the specified nesting pattern, or a zero-length List if * there are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RulesBase.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RulesBase.java index ace1a1c7..282f82ef 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/RulesBase.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/RulesBase.java @@ -53,8 +53,6 @@ public class RulesBase extends AbstractRulesImpl { - // ----------------------------------------------------- Instance Variables - /** * The set of registered Rule instances, keyed by the matching pattern. Each value is a List containing the Rules * for that pattern, in the order that they were orginally registered. @@ -71,8 +69,6 @@ public class RulesBase */ protected ArrayList<Rule> rules = new ArrayList<Rule>(); - // ------------------------------------------------------------- Properties - /** * {@inheritDoc} */ @@ -84,8 +80,6 @@ public class RulesBase rules.clear(); } - // --------------------------------------------------------- Public Methods - /** * Return a List of Rule instances for the specified pattern that also match the specified namespace URI (if any). * If there are no such rules, return {@code null}. @@ -188,8 +182,6 @@ public class RulesBase return ( this.rules ); } - // ------------------------------------------------------ Protected Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java index 4fce43ff..6dabe777 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java @@ -322,8 +322,6 @@ public class SetNestedPropertiesRule private boolean trimData = true; - // ----------------------------------------------------------- Constructors - private boolean allowUnknownChildElements; private final HashMap<String, String> elementNames = new HashMap<String, String>(); @@ -354,8 +352,6 @@ public class SetNestedPropertiesRule } } - // --------------------------------------------------------- Public Methods - /** * <p> * Convenience constructor which overrides the default mappings for just one property. @@ -520,8 +516,6 @@ public class SetNestedPropertiesRule log = digester.getLogger(); } - // ----------------------------------------- local classes - /** * When set to true, any text within child elements will have leading and trailing whitespace removed before * assignment to the target object. The default value for this attribute is true. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNextRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNextRule.java index 4c1e9246..ba455992 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNextRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetNextRule.java @@ -39,8 +39,6 @@ public class SetNextRule extends AbstractMethodRule { - // ----------------------------------------------------------- Constructors - /** * Constructs a "set next" rule with the specified method name. The method's argument type is assumed to be the class * of the child object. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetPropertyRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetPropertyRule.java index e14069c2..4ea442ce 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetPropertyRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetPropertyRule.java @@ -37,15 +37,11 @@ public class SetPropertyRule extends Rule { - // ----------------------------------------------------------- Constructors - /** * The attribute that will contain the property name. */ protected String name; - // ----------------------------------------------------- Instance Variables - /** * The attribute that will contain the property value. */ @@ -63,8 +59,6 @@ public class SetPropertyRule this.value = value; } - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetRootRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetRootRule.java index 7df56c1c..f9e06f61 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetRootRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetRootRule.java @@ -33,8 +33,6 @@ public class SetRootRule extends AbstractMethodRule { - // ----------------------------------------------------------- Constructors - /** * Constructs a "set root" rule with the specified method name. The method's argument type is assumed to be the class * of the child object. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetTopRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetTopRule.java index 0cbd1368..5f9cf76c 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetTopRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/SetTopRule.java @@ -33,8 +33,6 @@ public class SetTopRule extends AbstractMethodRule { - // ----------------------------------------------------------- Constructors - /** * Constructs a "set top" rule with the specified method name. The method's argument type is assumed to be the class * of the child object. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/Declaration.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/Declaration.java index a1b76b83..b5c5b5c3 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/Declaration.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/Declaration.java @@ -53,8 +53,6 @@ public class Declaration */ private RuleLoader ruleLoader; - // ---------------------- constructors ---------------------------------- - /** * Constructs a new instance. * @@ -94,8 +92,6 @@ public class Declaration this.pluginClassName = pluginClassName; } - // ---------------------- properties ----------------------------------- - /** * Attempt to load custom rules for the target class at the specified pattern. * <p> @@ -212,8 +208,6 @@ public class Declaration initialized = true; } - // ---------------------- methods ----------------------------------- - /** * The id that the user associated with a particular plugin declaration in the input xml. This id is later used in * the input xml to refer back to the original declaration. diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java index 6edf7344..0b80e1e4 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java @@ -76,8 +76,6 @@ public class PluginContext */ private List<RuleFinder> ruleFinders; - // ------------------- methods --------------------------------------- - /** * Gets the namespace for the xml attribute which indicates to a PluginCreateRule which class is to be plugged in. * <p> diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java index 89149abd..18de63fa 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java @@ -68,8 +68,6 @@ public class PluginCreateRule */ private PluginConfigurationException initException; - // -------------------- constructors ------------------------------------- - /** * Create a plugin rule where the user <i>must</i> specify a plugin-class or plugin-id. * @@ -116,8 +114,6 @@ public class PluginCreateRule } } - // ------------------- properties --------------------------------------- - /** * Invoked when the Digester matches this rule against an xml element. * <p> @@ -290,8 +286,6 @@ public class PluginCreateRule fireBodyMethods( rules, namespace, name, text ); } - // ------------------- methods -------------------------------------------- - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java index 11c4d56b..1db86d2b 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java @@ -38,8 +38,6 @@ public class PluginDeclarationRule extends Rule { - // ------------------- constructors --------------------------------------- - /** * Helper method to declare a plugin inside the given Digester. * @@ -79,8 +77,6 @@ public class PluginDeclarationRule // rules to the digester. } - // ------------------- methods -------------------------------------------- - /** Constructor */ public PluginDeclarationRule() { diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java index ccd07528..61a8adb8 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java @@ -52,8 +52,6 @@ public class PluginManager */ private final PluginContext pluginContext; - // ------------------- constructors --------------------------------------- - /** * Constructs a "root" PluginManager, ie one with no parent. * @@ -79,8 +77,6 @@ public class PluginManager this.pluginContext = parent.pluginContext; } - // ------------------- methods -------------------------------------------- - /** * Add the declaration to the set of known declarations. * <p> diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java index 5a3c8b41..488ee53e 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java @@ -83,8 +83,6 @@ public class PluginRules */ private PluginContext pluginContext; - // ------------------------------------------------------------- Constructor - /** * Constructor for top-level Rules objects. Exactly one of these must be created and installed into the Digester * instance as the Rules object before parsing starts. @@ -146,8 +144,6 @@ public class PluginRules pluginManager = new PluginManager( pluginContext ); } - // ------------------------------------------------------------- Properties - /** * Register a new Rule instance matching the specified pattern. * @@ -311,8 +307,6 @@ public class PluginRules return pluginContext.getPluginIdAttrNs(); } - // --------------------------------------------------------- Public Methods - /** * Gets the object which "knows" about all declared plugins. * diff --git a/commons-digester3-core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java b/commons-digester3-core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java index 53fc8c48..9b949d2c 100644 --- a/commons-digester3-core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java +++ b/commons-digester3-core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java @@ -41,8 +41,6 @@ public class VariableAttributes private VariableExpander expander; - // ------------------- Public Methods - // plain proxy methods follow : nothing interesting :-) /** * {@inheritDoc} diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java index 59e6e8fb..13b54f38 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java @@ -43,16 +43,12 @@ import org.xml.sax.SAXException; public class BeanPropertySetterRuleTestCase { - // ----------------------------------------------------- Instance Variables - /** * Simple test xml document used in the tests. */ protected final static String TEST_XML = "<?xml version='1.0'?>" + "<root>ROOT BODY" + "<alpha>ALPHA BODY</alpha>" + "<beta>BETA BODY</beta>" + "<gamma>GAMMA BODY</gamma>" + "<delta>DELTA BODY</delta>" + "</root>"; - // ------------------------------------------------ Individual Test Methods - /** * Test that you can successfully automatically set properties. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java index e269e70d..661bf841 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java @@ -669,8 +669,6 @@ public class CallMethodRuleTestCase assertEquals( "Failed to call Employee.setSalary", 1000000.0f, employee.getSalary(), 0.1f ); } - // ------------------------------------------------ Utility Support Methods - @Test public void testTwoCalls() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java index f6de864d..ed0af233 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java @@ -53,8 +53,6 @@ import org.xml.sax.helpers.AttributesImpl; public class DigesterTestCase { - // ----------------------------------------------------- Instance Variables - /** Utility class for method testStackAction */ private static final class TrackingStackAction implements StackAction @@ -97,8 +95,6 @@ public class DigesterTestCase "/org/apache/commons/digester3/rss/rss-0.9.dtd", "-//Netscape Communications//DTD RSS 0.91//EN", "/org/apache/commons/digester3/rss/rss-0.91.dtd", }; - // -------------------------------------------------- Overall Test Methods - /** * The digester instance we will be processing. */ @@ -116,8 +112,6 @@ public class DigesterTestCase } - // ------------------------------------------------ Individual Test Methods - /** * Tear down instance variables required by this test case. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java index 30e90b4e..606dd69e 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java @@ -33,8 +33,6 @@ public class ExtendedBaseRulesTestCase extends RulesBaseTestCase { - // -------------------------------------------------- Overall Test Methods - /** * <p> * This should be overriden by subclasses. diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java index 3ab2e4c9..06a72fa7 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java @@ -85,8 +85,6 @@ public class NamespaceSnapshotTestCase } - // ------------------------------------------------ Utility Support Methods - /** * Namespace snapshot test case. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java index 060f9795..f4bc9770 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java @@ -51,16 +51,12 @@ import org.xml.sax.SAXException; public class NodeCreateRuleTestCase { - // ----------------------------------------------------- Instance Variables - /** * Simple test xml document used in the tests. */ protected final static String TEST_XML = "<?xml version='1.0'?><root>ROOT BODY<alpha>ALPHA BODY</alpha>" + "<beta>BETA BODY</beta><gamma>GAMMA BODY</gamma></root>"; - // ------------------------------------------------ Individual Test Methods - /** * Gets an appropriate InputStream for the specified test file (which must be inside our current package. * @@ -504,8 +500,6 @@ public class NodeCreateRuleTestCase } - // ------------------------------------------------ Utility Support Methods - /** * Tests whether non-namespaced attributes are handled correctly, using the example from the file Test11 XML file. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java index b09e6dac..ea62801c 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java @@ -38,8 +38,6 @@ import org.xml.sax.SAXException; public class ObjectParamRuleTestCase { - // ------------------------------------------------ Individual Test Methods - private final StringBuilder sb = new StringBuilder().append( "<arraylist><A/><B/><C/><D desc=\"the fourth\"/><E/></arraylist>" ); diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/OverlappingCallMethodRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/OverlappingCallMethodRuleTestCase.java index aa3d5105..869c3a58 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/OverlappingCallMethodRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/OverlappingCallMethodRuleTestCase.java @@ -36,8 +36,6 @@ import org.xml.sax.SAXException; public class OverlappingCallMethodRuleTestCase { - // --------------------------------------------------- Overall Test Methods - String itemId; String itemName; @@ -52,8 +50,6 @@ public class OverlappingCallMethodRuleTestCase itemName = name; } - // ------------------------------------------------ Individual Test Methods - @Test public void testItem1() throws SAXException, IOException diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/RuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/RuleTestCase.java index a776ce46..e8cb8822 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/RuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/RuleTestCase.java @@ -41,15 +41,11 @@ import org.xml.sax.SAXException; public class RuleTestCase { - // ----------------------------------------------------- Instance Variables - /** * The digester instance we will be processing. */ protected Digester digester; - // --------------------------------------------------- Overall Test Methods - /** * Gets an appropriate InputStream for the specified test file (which must be inside our current package. * @@ -75,8 +71,6 @@ public class RuleTestCase } - // ------------------------------------------------ Individual Test Methods - /** * Tear down instance variables required by this test case. */ @@ -505,8 +499,6 @@ public class RuleTestCase } - // ------------------------------------------------ Utility Support Methods - /** * Same as {@code testSetTopRule1} except using the three argument form of the SetTopRule rule. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java index 55b643a7..cb6e0e7b 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java @@ -36,15 +36,11 @@ import org.junit.Test; public class RulesBaseTestCase { - // ----------------------------------------------------- Instance Variables - /** * The digester instance we will be processing. */ protected Digester digester; - // -------------------------------------------------- Overall Test Methods - /** * <p> * This should be overriden by subclasses. @@ -79,8 +75,6 @@ public class RulesBaseTestCase } - // ------------------------------------------------ Individual Test Methods - /** * Test basic matchings involving namespaces. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java index 50c0fd6d..39904751 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java @@ -39,16 +39,12 @@ import org.xml.sax.SAXException; public class SetNestedPropertiesRuleTestCase { - // ----------------------------------------------------- Instance Variables - /** * Simple test xml document used in the tests. */ protected final static String TEST_XML = "<?xml version='1.0'?>" + "<root>ROOT BODY" + "<alpha>ALPHA BODY</alpha>" + "<beta>BETA BODY</beta>" + "<gamma>GAMMA BODY</gamma>" + "<delta>DELTA BODY</delta>" + "</root>"; - // ------------------------------------------------ Individual Test Methods - /** * Test that you can successfully automatically set properties. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java index e7779ac6..f8d89c6a 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java @@ -39,8 +39,6 @@ import org.xml.sax.SAXException; public class SetPropertiesRuleTestCase { - // ----------------------------------------------------- Instance Variables - /** * Simple test xml document used in the tests. */ @@ -59,8 +57,6 @@ public class SetPropertiesRuleTestCase protected final static String TEST_XML_3 = "<?xml version='1.0'?><root alpha='ALPHA VALUE' beta='BETA VALUE' delta='DELTA VALUE' ignore='ignore value'/>"; - // ------------------------------------------------ Individual Test Methods - /** * Positive test for SetPropertyRule ignoring missing properties. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java index 5780b698..604c6217 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java @@ -43,8 +43,6 @@ import org.xml.sax.SAXException; public class SetPropertyRuleTestCase { - // ----------------------------------------------------- Instance Variables - /** * Simple test xml document used in the tests. */ @@ -75,8 +73,6 @@ public class SetPropertyRuleTestCase */ protected Digester digester; - // --------------------------------------------------- Overall Test Methods - /** * Sets up instance variables required by this test case. */ @@ -99,8 +95,6 @@ public class SetPropertyRuleTestCase } - // ------------------------------------------------ Individual Test Methods - /** * Test SetPropertyRule when matched XML element has no attributes. See: DIGESTER-114 */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java index 84b2f20c..24d76b12 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestBean.java @@ -42,8 +42,6 @@ public class TestBean */ private boolean falseProperty; - // ------------------------------------------------------------- Properties - /** * A float property. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java index ac33fcc0..ac36173b 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java @@ -57,8 +57,6 @@ public class TestFactoryCreate this.ignoreCreateExceptions = ignoreCreateExceptions; } - // --------------------------------------------------------------- Test cases - @Test public void testFactoryCreateRule() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRule.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRule.java index b0f2dc78..9401b32c 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRule.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRule.java @@ -34,8 +34,6 @@ public class TestRule extends Rule { - // ----------------------------------------------------- Instance Variables - public static class TestRuleProvider implements RuleProvider<TestRule> { @@ -70,8 +68,6 @@ public class TestRule /** Used when testing body text */ private String bodyText; - // ----------------------------------------------------------- Constructors - /** Used when testing call orders */ private List<Rule> order; @@ -86,8 +82,6 @@ public class TestRule this.identifier = identifier; } - // ------------------------------------------------ Rule Implementation - /** * Constructor sets namespace URI. * @@ -122,8 +116,6 @@ public class TestRule appendCall(); } - // ------------------------------------------------ Methods - /** * 'Body' call. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRuleSet.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRuleSet.java index 47557487..376a616c 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRuleSet.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/TestRuleSet.java @@ -26,8 +26,6 @@ public class TestRuleSet extends RuleSetBase { - // ----------------------------------------------------------- Constructors - /** * The prefix for each matching pattern added to the Digester instance, or an empty String for no prefix. */ @@ -55,8 +53,6 @@ public class TestRuleSet } - // ----------------------------------------------------- Instance Variables - /** * Constructs an instance of this RuleSet associated with the specified prefix and namespace URI. * @@ -78,8 +74,6 @@ public class TestRuleSet } - // --------------------------------------------------------- Public Methods - /** * {@inheritDoc} */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/URLTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/URLTestCase.java index d33f5bcc..2c88b607 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/URLTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/URLTestCase.java @@ -34,8 +34,6 @@ import org.junit.Test; public class URLTestCase { - // ----------------------------------------------------- Overall Test Methods - /** * <p> * Public identifier of the Digester Rules DTD. @@ -50,8 +48,6 @@ public class URLTestCase */ private static final String DIGESTER_RULES_SYSTEM_ID = "/org/apache/commons/digester3/xmlrules/digester-rules.dtd"; - // ------------------------------------------------------ Manifest Constants - /** * <p> * System identifier for the Digester Rules file that we will parse. @@ -78,8 +74,6 @@ public class URLTestCase } - // ------------------------------------------------------ Instance Variables - /** * Tear down instance variables required by this test case. */ @@ -91,8 +85,6 @@ public class URLTestCase } - // ------------------------------------------------------------ Test Methods - // Test a pristine instance @Test public void testPristine() diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java index 4d243016..695a3d67 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java @@ -37,8 +37,6 @@ import org.xml.sax.SAXException; public class XIncludeTestCase { - // ------------------------------------------------ Individual Test Methods - /** * Gets an appropriate InputStream for the specified test file (which must be inside our current package. * @@ -53,8 +51,6 @@ public class XIncludeTestCase } - // ------------------------------------------------ Utility Support Methods - /** * Test XInclude. */ diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java index 42881e5c..3e007b61 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java @@ -45,8 +45,6 @@ import org.xml.sax.SAXParseException; public class XMLSchemaTestCase { - // ----------------------------------------------------- Instance Variables - static final class TestErrorHandler implements ErrorHandler { @@ -75,8 +73,6 @@ public class XMLSchemaTestCase } } - // --------------------------------------------------- Overall Test Methods - /** * The digester instance we will be processing. */ @@ -96,8 +92,6 @@ public class XMLSchemaTestCase } - // ------------------------------------------------ Individual Test Methods - /** * Sets up instance variables required by this test case. */ @@ -138,8 +132,6 @@ public class XMLSchemaTestCase } - // ------------------------------------ Utility Support Methods and Classes - @Test public void testBadDocument() throws SAXException, IOException diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java index e6e67f6d..48d1f8f9 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java @@ -64,7 +64,6 @@ public class TestConfigurablePluginAttributes } } - // --------------------------------------------------------------- Test cases @Test public void testDefaultBehaviour() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java index 05718227..ee79bc7e 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java @@ -32,7 +32,6 @@ import org.junit.Test; public class TestDeclaration { - // --------------------------------------------------------------- Test cases @Test public void testPredeclaration() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java index 33584d2e..15b02d48 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java @@ -31,7 +31,6 @@ import org.xml.sax.SAXParseException; public class TestDefaultPlugin { - // --------------------------------------------------------------- Test cases @Test public void testDefaultPlugins1() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java index 31dd3d55..115cdaec 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java @@ -51,7 +51,6 @@ public class TestDelegate } } - // --------------------------------------------------------------- Test cases @Test public void testDummy() { diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestInline.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestInline.java index 43d5d4e5..dacb2dbe 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestInline.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestInline.java @@ -32,7 +32,6 @@ import org.junit.Test; public class TestInline { - // --------------------------------------------------------------- Test cases @Test public void testInlineDeclaration() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java index 23b2b47e..16e5ab9f 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java @@ -32,7 +32,6 @@ import org.junit.Test; public class TestLocalRules { - // --------------------------------------------------------------- Test cases @Test public void testLocalRules() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java index 5cde4cdd..dff63b64 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java @@ -48,7 +48,6 @@ public class TestRecursion return sum; } - // --------------------------------------------------------------- Test cases @Test public void testRecursiveRules() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java index 5fd5ecdf..28d73f6f 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java @@ -78,7 +78,6 @@ public class TestRuleInfo assertEquals( "std label", label.getLabel() ); } - // --------------------------------------------------------------- Test cases @Test public void testRuleInfoExplicitClass() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java index ea8c75a7..47644fc9 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java @@ -75,7 +75,6 @@ public class TestXmlRuleInfo assertEquals( "xmlrules-ruleinfo", testObject.getValue() ); } - // --------------------------------------------------------------- Test cases @Test public void testXmlRuleInfoExplicitFile() throws Exception diff --git a/commons-digester3-core/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java b/commons-digester3-core/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java index bca9946c..f29b6f4f 100644 --- a/commons-digester3-core/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java +++ b/commons-digester3-core/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java @@ -38,7 +38,6 @@ import org.xml.sax.SAXException; public class VariableExpansionTestCase { - // --------------------------------------------------- Overall Test Methods // method used in tests4 private final LinkedList<SimpleTestBean> simpleTestBeans = new LinkedList<SimpleTestBean>(); @@ -87,8 +86,6 @@ public class VariableExpansionTestCase return digester; } - // ------------------------------------------------ Individual Test Methods - /** * Test expansion of text in element bodies. */ diff --git a/commons-digester3-examples/api/document-markup/src/main/java/org/apache/commons/digester3/examples/api/documentmarkup/SetTextSegmentRule.java b/commons-digester3-examples/api/document-markup/src/main/java/org/apache/commons/digester3/examples/api/documentmarkup/SetTextSegmentRule.java index 814734d5..4f4fc0ad 100644 --- a/commons-digester3-examples/api/document-markup/src/main/java/org/apache/commons/digester3/examples/api/documentmarkup/SetTextSegmentRule.java +++ b/commons-digester3-examples/api/document-markup/src/main/java/org/apache/commons/digester3/examples/api/documentmarkup/SetTextSegmentRule.java @@ -29,22 +29,16 @@ public class SetTextSegmentRule implements TextSegmentHandler { - // ----------------------------------------------------------- Constructors - /** * The method name to call on the parent object. */ protected String methodName; - // ----------------------------------------------------- Instance Variables - public SetTextSegmentRule( final String methodName ) { this.methodName = methodName; } - // --------------------------------------------------------- Public Methods - /** * Process the end of this element. */ diff --git a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java index 94aacd02..3fa24ff9 100644 --- a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java +++ b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java @@ -38,8 +38,6 @@ public class Channel */ private static final long serialVersionUID = -7358941908590407568L; - // ----------------------------------------------------- Instance Variables - /** * The set of items associated with this Channel. */ @@ -55,8 +53,6 @@ public class Channel */ protected ArrayList<String> skipHours = new ArrayList<String>(); - // ------------------------------------------------------------- Properties - /** * The channel copyright (1-100 characters). */ @@ -381,8 +377,6 @@ public class Channel pw.flush(); } - // --------------------------------------------------------- Public Methods - /** * Render this channel as XML conforming to the RSS 0.91 specification, * to the specified writer, with no indication of character encoding. diff --git a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Image.java b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Image.java index 88e39451..207e43db 100644 --- a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Image.java +++ b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Image.java @@ -33,8 +33,6 @@ public class Image */ private static final long serialVersionUID = 7651966908064015194L; - // ------------------------------------------------------------- Properties - /** * The image description (1-100 characters). */ @@ -163,8 +161,6 @@ public class Image this.url = url; } - // -------------------------------------------------------- Package Methods - public void setWidth( final int width ) { this.width = width; diff --git a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Item.java b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Item.java index 1b1bada1..14c61337 100644 --- a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Item.java +++ b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/Item.java @@ -31,8 +31,6 @@ public class Item implements Serializable { */ private static final long serialVersionUID = -2535241576243936839L; - // ------------------------------------------------------------- Properties - /** * The item description (1-500 characters). */ @@ -101,8 +99,6 @@ public class Item implements Serializable { this.link = link; } - // -------------------------------------------------------- Package Methods - public void setTitle( final String title ) { this.title = title; diff --git a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java index 4b2f6f31..a3f7bb9f 100644 --- a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java +++ b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java @@ -44,10 +44,6 @@ public class RSSDigester extends Digester { - // ----------------------------------------------------------- Constructors - - // ----------------------------------------------------- Instance Variables - /** * Test main program that parses the channel description included in this * package as a static resource. @@ -82,8 +78,6 @@ public class RSSDigester } } - // ------------------------------------------------------------- Properties - /** * Have we been configured yet? */ @@ -226,8 +220,6 @@ public class RSSDigester return ( super.<T>parse( input ) ); } - // --------------------------------------------------------- Public Methods - /** * Parse the content of the specified input stream using this Digester. * Returns the root element from the object stack (which will be @@ -274,17 +266,11 @@ public class RSSDigester this.imageClass = imageClass; } - // -------------------------------------------------------- Package Methods - - // ------------------------------------------------------ Protected Methods - public void setItemClass( final String itemClass ) { this.itemClass = itemClass; } - // ------------------------------------------------------ Test Main Program - public void setTextInputClass( final String textInputClass ) { this.textInputClass = textInputClass; diff --git a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/TextInput.java b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/TextInput.java index 0240f78a..9b3a2dbb 100644 --- a/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/TextInput.java +++ b/commons-digester3-examples/rss/src/main/java/org/apache/commons/digester3/rss/TextInput.java @@ -32,8 +32,6 @@ public class TextInput implements Serializable { */ private static final long serialVersionUID = -147615076863607237L; - // ------------------------------------------------------------- Properties - /** * The text input description (1-100 characters). */ @@ -118,8 +116,6 @@ public class TextInput implements Serializable { this.name = name; } - // -------------------------------------------------------- Package Methods - public void setTitle( final String title ) { this.title = title;