You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by br...@apache.org on 2005/08/31 12:19:44 UTC
svn commit: r265001 -
/jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/CommandLineImpl.java
Author: brett
Date: Wed Aug 31 03:19:40 2005
New Revision: 265001
URL: http://svn.apache.org/viewcvs?rev=265001&view=rev
Log:
PR: 36314
Submitted by: Kev Jackson
Reviewed by: Brett Porter
use constants for quotes
Modified:
jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/CommandLineImpl.java
Modified: jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/CommandLineImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/CommandLineImpl.java?rev=265001&r1=265000&r2=265001&view=diff
==============================================================================
--- jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/CommandLineImpl.java (original)
+++ jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/CommandLineImpl.java Wed Aug 31 03:19:40 2005
@@ -32,6 +32,9 @@
*/
public class CommandLineImpl implements Cloneable, CommandLine {
+ private static final String SINGLE_QUOTE = "\'";
+ private static final String DOUBLE_QUOTE = "\"";
+
/**
* The arguments of the command.
*/
@@ -187,16 +190,16 @@
*
*/
public static String quoteArgument(final String argument) {
- if (argument.indexOf("\"") > -1) {
- if (argument.indexOf("\'") > -1) {
+ final StringBuffer buf = new StringBuffer();
+ if (argument.indexOf(DOUBLE_QUOTE) > -1) {
+ if (argument.indexOf(SINGLE_QUOTE) > -1) {
throw new IllegalArgumentException(
- "Can\'t handle single and double"
- + " quotes in same argument");
+ "Can\'t handle single and double quotes in same argument");
} else {
- return '\'' + argument + '\'';
+ return buf.append(SINGLE_QUOTE).append(argument).append(SINGLE_QUOTE).toString();
}
- } else if (argument.indexOf("\'") > -1 || argument.indexOf(" ") > -1) {
- return '\"' + argument + '\"';
+ } else if (argument.indexOf(SINGLE_QUOTE) > -1 || argument.indexOf(" ") > -1) {
+ return buf.append(DOUBLE_QUOTE).append(argument).append(DOUBLE_QUOTE).toString();
} else {
return argument;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org