Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D33E1017E for ; Sun, 2 Nov 2014 22:31:53 +0000 (UTC) Received: (qmail 46011 invoked by uid 500); 2 Nov 2014 22:31:53 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 45941 invoked by uid 500); 2 Nov 2014 22:31:53 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 45932 invoked by uid 99); 2 Nov 2014 22:31:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Nov 2014 22:31:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Nov 2014 22:31:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E18FB23888A6; Sun, 2 Nov 2014 22:30:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1636204 - /commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java Date: Sun, 02 Nov 2014 22:30:31 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141102223031.E18FB23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Sun Nov 2 22:30:31 2014 New Revision: 1636204 URL: http://svn.apache.org/r1636204 Log: Fixes for Javadoc 8. Modified: commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java Modified: commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java?rev=1636204&r1=1636203&r2=1636204&view=diff ============================================================================== --- commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java (original) +++ commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java Sun Nov 2 22:30:31 2014 @@ -42,24 +42,29 @@ public class StringUtils { private static final char BACKSLASH_CHAR = '\\'; /** - * Perform a series of substitutions. The substitutions - * are performed by replacing ${variable} in the target - * string with the value of provided by the key "variable" - * in the provided hash table. - *

+ * Perform a series of substitutions. + *

+ * The substitutions are performed by replacing ${variable} in the target string with the value of provided by the + * key "variable" in the provided hash table. + *

+ *

* A key consists of the following characters: + *

*
    - *
  • letter - *
  • digit - *
  • dot character - *
  • hyphen character - *
  • plus character - *
  • underscore character + *
  • letter + *
  • digit + *
  • dot character + *
  • hyphen character + *
  • plus character + *
  • underscore character *
* - * @param argStr the argument string to be processed - * @param vars name/value pairs used for substitution - * @param isLenient ignore a key not found in vars or throw a RuntimeException? + * @param argStr + * the argument string to be processed + * @param vars + * name/value pairs used for substitution + * @param isLenient + * ignore a key not found in vars or throw a RuntimeException? * @return String target string with replacements. */ public static StringBuffer stringSubstitution(final String argStr, final Map vars, final boolean isLenient) { @@ -172,8 +177,8 @@ public class StringUtils { * using the following replacement. * *
    - *
  • '/' ==> File.separatorChar - *
  • '\\' ==> File.separatorChar + *
  • '/' → File.separatorChar
    • + *
  • '\\' → File.separatorChar
    • *
* * @param arg the argument to fix