Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 9337 invoked from network); 26 Jul 2006 19:50:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Jul 2006 19:50:31 -0000 Received: (qmail 50438 invoked by uid 500); 26 Jul 2006 19:50:28 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 50342 invoked by uid 500); 26 Jul 2006 19:50:28 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 50331 invoked by uid 500); 26 Jul 2006 19:50:28 -0000 Received: (qmail 50328 invoked by uid 99); 26 Jul 2006 19:50:28 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 12:50:28 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 12:50:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4F8D81A981A; Wed, 26 Jul 2006 12:50:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425818 - in /jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree: ConfigurationNode.java DefaultConfigurationKey.java NodeCombiner.java OverrideCombiner.java UnionCombiner.java ViewNode.java Date: Wed, 26 Jul 2006 19:50:05 -0000 To: commons-cvs@jakarta.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060726195007.4F8D81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: oheger Date: Wed Jul 26 12:50:05 2006 New Revision: 425818 URL: http://svn.apache.org/viewvc?rev=425818&view=rev Log: Checkstyle Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ConfigurationNode.java jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/NodeCombiner.java jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/OverrideCombiner.java jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/UnionCombiner.java jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ViewNode.java Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ConfigurationNode.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ConfigurationNode.java?rev=425818&r1=425817&r2=425818&view=diff ============================================================================== --- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ConfigurationNode.java (original) +++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ConfigurationNode.java Wed Jul 26 12:50:05 2006 @@ -199,6 +199,8 @@ /** * Returns the number of attributes with the given name. + * + * @param name the name of the attribute * @return the number of attributes with this name */ int getAttributeCount(String name); Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java?rev=425818&r1=425817&r2=425818&view=diff ============================================================================== --- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java (original) +++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java Wed Jul 26 12:50:05 2006 @@ -122,11 +122,14 @@ public DefaultConfigurationKey append(String property, boolean escape) { String key; - if(escape && property != null) + if (escape && property != null) { key = escapeDelimiters(property); } - else key = property; + else + { + key = property; + } key = trim(key); if (keyBuffer.length() > 0 && !isAttributeKey(property) @@ -433,12 +436,17 @@ /** * Escapes the delimiters in the specified string. + * * @param key the key to be escaped * @return the escaped key */ private String escapeDelimiters(String key) { - return (getExpressionEngine().getEscapedDelimiter() == null || key.indexOf(getExpressionEngine().getPropertyDelimiter()) < 0) ? key : StringUtils.replace(key, getExpressionEngine().getPropertyDelimiter(), getExpressionEngine().getEscapedDelimiter()); + return (getExpressionEngine().getEscapedDelimiter() == null || key + .indexOf(getExpressionEngine().getPropertyDelimiter()) < 0) ? key + : StringUtils.replace(key, getExpressionEngine() + .getPropertyDelimiter(), getExpressionEngine() + .getEscapedDelimiter()); } /** Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/NodeCombiner.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/NodeCombiner.java?rev=425818&r1=425817&r2=425818&view=diff ============================================================================== --- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/NodeCombiner.java (original) +++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/NodeCombiner.java Wed Jul 26 12:50:05 2006 @@ -43,11 +43,17 @@ * can be passed the name of a node, which should be considered a list node. *

* + * @author Commons + * Configuration team * @version $Id$ * @since 1.3 */ public abstract class NodeCombiner { + /** Stores a list with node names that are known to be list nodes. */ + protected Set listNodes; + /** * Creates a new instance of NodeCombiner. */ @@ -55,9 +61,6 @@ { listNodes = new HashSet(); } - - /** Stores a list with node names that are known to be list nodes. */ - protected Set listNodes; /** * Adds the name of a node to the list of known list nodes. This means that Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/OverrideCombiner.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/OverrideCombiner.java?rev=425818&r1=425817&r2=425818&view=diff ============================================================================== --- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/OverrideCombiner.java (original) +++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/OverrideCombiner.java Wed Jul 26 12:50:05 2006 @@ -47,6 +47,9 @@ * will never be combined. *

* + * @author Commons + * Configuration team * @version $Id$ * @since 1.3 */ Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/UnionCombiner.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/UnionCombiner.java?rev=425818&r1=425817&r2=425818&view=diff ============================================================================== --- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/UnionCombiner.java (original) +++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/UnionCombiner.java Wed Jul 26 12:50:05 2006 @@ -36,10 +36,10 @@ * can be combined or not. Consider the following two node hierarchies: *

*

- * + * * 

  * Hierarchy 1:
- * 
+ *
  * Database
  *   +--Tables
  *        +--Table
@@ -51,13 +51,13 @@
  *                   |    +--name [usrname]
  *                     ...
  *
- * + * *

*

- * + * * 

  * Hierarchy 2:
- * 
+ *
  * Database
  *   +--Tables
  *        +--Table
@@ -69,14 +69,14 @@
  *                   |    +--name [docname]
  *                     ...
  *
- * + * *

*

* Both hierarchies contain data about database tables. Each describes a single * table. If these hierarchies are to be combined, the result should probably * look like the following: *

- * + * * 

  * Database
  *   +--Tables
@@ -93,7 +93,7 @@
  *                   |    +--name [docid]
  *                     ...
  *
- * + * *

*

* i.e. the Tables nodes should be combined, while the @@ -108,7 +108,10 @@ * must not combine the Table nodes, but add it both to the * resulting tree. *

- * + * + * @author Commons + * Configuration team * @version $Id$ * @since 1.3 */ @@ -116,7 +119,7 @@ { /** * Combines the given nodes to a new union node. - * + * * @param node1 the first source node * @param node2 the second source node * @return the union node @@ -181,7 +184,7 @@ * If all of these tests are successfull, the matching child node of the * second source node is returned. Otherwise the result is null. *

- * + * * @param node1 the first source node * @param node2 the second source node * @param child the child node of the first source node to be checked Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ViewNode.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ViewNode.java?rev=425818&r1=425817&r2=425818&view=diff ============================================================================== --- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ViewNode.java (original) +++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/tree/ViewNode.java Wed Jul 26 12:50:05 2006 @@ -31,6 +31,9 @@ * configuration. *

* + * @author Commons + * Configuration team * @version $Id$ * @since 1.3 */ --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org