svn commit: r1397301 - in /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell: BourneShell.java CmdShell.java Shell.java

[rfscholte]

Author: rfscholte
Date: Thu Oct 11 20:51:20 2012
New Revision: 1397301

URL: http://svn.apache.org/viewvc?rev=1397301&view=rev
Log:
Prefer char over single character String

Modified:
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java?rev=1397301&r1=1397300&r2=1397301&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
 Thu Oct 11 20:51:20 2012
@@ -139,7 +139,7 @@ public class BourneShell
             return null;
         }
 
-        if ( path.indexOf( " " ) == -1 && path.indexOf( "'" ) != -1 && 
path.indexOf( "\"" ) == -1 )
+        if ( path.indexOf( ' ' ) == -1 && path.indexOf( '\'' ) != -1 && 
path.indexOf( '"' ) == -1 )
         {
             return StringUtils.escape( path );
         }

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java?rev=1397301&r1=1397300&r2=1397301&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
 Thu Oct 11 20:51:20 2012
@@ -81,12 +81,12 @@ public class CmdShell
      * appears to make Windows processes invoke successfully.
      * </p>
      */
-    public List<String> getCommandLine( String executable, String[] arguments )
+    public List<String> getCommandLine( String executable, String... arguments 
)
     {
         StringBuilder sb = new StringBuilder();
-        sb.append( "\"" );
+        sb.append( '"' );
         sb.append( super.getCommandLine( executable, arguments ).get( 0 ) );
-        sb.append( "\"" );
+        sb.append( '"' );
 
         return Arrays.asList(sb.toString());
     }

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java?rev=1397301&r1=1397300&r2=1397301&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
 Thu Oct 11 20:51:20 2012
@@ -124,12 +124,12 @@ public class Shell
      * @param arguments  arguments for the executable, not the shell
      * @return List with one String object with executable and arguments 
quoted as needed
      */
-    List<String> getCommandLine( String executable, String[] arguments )
+    List<String> getCommandLine( String executable, String... arguments )
     {
         return getRawCommandLine( executable, arguments );
     }
 
-    List<String> getRawCommandLine( String executable, String[] arguments )
+    List<String> getRawCommandLine( String executable, String... arguments )
     {
         List<String> commandLine = new ArrayList<String>();
         StringBuilder sb = new StringBuilder();
@@ -155,19 +155,23 @@ public class Shell
                 sb.append( getExecutable() );
             }
         }
-        for (String argument : arguments) {
-            if (sb.length() > 0) {
-                sb.append(" ");
+        for ( String argument : arguments )
+        {
+            if ( sb.length() > 0 )
+            {
+                sb.append( ' ' );
             }
 
-            if (isQuotedArgumentsEnabled()) {
-                char[] escapeChars =
-                        getEscapeChars(isSingleQuotedArgumentEscaped(), 
isDoubleQuotedArgumentEscaped());
+            if ( isQuotedArgumentsEnabled() )
+            {
+                char[] escapeChars = getEscapeChars( 
isSingleQuotedArgumentEscaped(), isDoubleQuotedArgumentEscaped() );
 
-                sb.append(StringUtils.quoteAndEscape(argument, 
getArgumentQuoteDelimiter(), escapeChars,
-                        getQuotingTriggerChars(), '\\', false));
-            } else {
-                sb.append(argument);
+                sb.append( StringUtils.quoteAndEscape( argument, 
getArgumentQuoteDelimiter(), escapeChars,
+                                                       
getQuotingTriggerChars(), '\\', false ) );
+            }
+            else
+            {
+                sb.append( argument );
             }
         }
 
@@ -253,7 +257,7 @@ public class Shell
      * @return List of String objects, whose array version is suitable to be 
used as argument
      *         of Runtime.getRuntime().exec()
      */
-    public List<String> getShellCommandLine( String[] arguments )
+    public List<String> getShellCommandLine( String... arguments )
     {
 
         List<String> commandLine = new ArrayList<String>();