You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/10/09 19:45:38 UTC
svn commit: r1396135 [1/3] - in /maven/shared/trunk/maven-shared-utils/src:
main/java/org/apache/maven/shared/utils/
main/java/org/apache/maven/shared/utils/cli/
main/java/org/apache/maven/shared/utils/cli/shell/
main/java/org/apache/maven/shared/utils...
Author: krosenvold
Date: Tue Oct 9 17:45:37 2012
New Revision: 1396135
URL: http://svn.apache.org/viewvc?rev=1396135&view=rev
Log:
o Removed unused code, added some java5 features
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/AbstractStreamHandler.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java
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
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReader.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExceptionUtilsTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestException.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java Tue Oct 9 17:45:37 2012
@@ -244,10 +244,7 @@ public class CollectionUtils
}
Set<T> set = new HashSet<T>( array.length );
- for ( T element : array )
- {
- set.add( element );
- }
+ Collections.addAll(set, array);
return set;
}
@@ -267,10 +264,7 @@ public class CollectionUtils
}
Set<T> set = new TreeSet<T>();
- for ( T element : array )
- {
- set.add( element );
- }
+ Collections.addAll(set, array);
return set;
}
@@ -279,7 +273,7 @@ public class CollectionUtils
//
// ----------------------------------------------------------------------
- private static final int getFreq( final Object obj, final Map freqMap )
+ private static int getFreq( final Object obj, final Map freqMap )
{
try
{
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java Tue Oct 9 17:45:37 2012
@@ -37,18 +37,17 @@ import java.util.concurrent.CopyOnWriteA
*
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*/
-public class ExceptionUtils
+class ExceptionUtils
{
/**
* The maximum level of nestings evaluated when searching for a root cause.
* We do this to prevent stack overflows!
*
* @see #getRootCause(Throwable)
- * @see #getRootCauseStackTrace(Throwable)
*/
private static final int MAX_ROOT_CAUSE_DEPTH = 20;
- private static CopyOnWriteArrayList<String> specialCauseMethodNames = new CopyOnWriteArrayList<String>();
+ private static final CopyOnWriteArrayList<String> specialCauseMethodNames = new CopyOnWriteArrayList<String>();
static
{
@@ -401,24 +400,6 @@ public class ExceptionUtils
}
/**
- * The stacktrace frames for the root cause of the given Throwable
- *
- * @param throwable
- * @return String with the Stacktrace of the Throwable
- * @see #getCause(Throwable)
- */
- public static String[] getRootCauseStackTrace( Throwable throwable )
- {
- Throwable rootCause = getRootCause( throwable );
- if ( rootCause == null )
- {
- rootCause = throwable;
- }
-
- return getStackFrames( rootCause );
- }
-
- /**
* The stacktrace for the given Throwable
*
* @param throwable
@@ -456,12 +437,8 @@ public class ExceptionUtils
*/
public static boolean isNestedThrowable( Throwable throwable )
{
- if ( throwable == null )
- {
- return false;
- }
+ return throwable != null;
- return true;
}
/**
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java Tue Oct 9 17:45:37 2012
@@ -34,7 +34,7 @@ import org.apache.maven.shared.utils.io.
*
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*/
-public class Expand
+class Expand
{
/**
* Source file which should get expanded
@@ -109,7 +109,7 @@ public class Expand
* @param dest
* @throws Exception
*/
- protected void expandFile( File srcFile, File dest )
+ void expandFile( File srcFile, File dest )
throws Exception
{
if ( source == null )
@@ -164,7 +164,7 @@ public class Expand
* @param isDirectory
* @throws Exception
*/
- protected void extractFile( File archive, File destDir, InputStream compressedInputStream, String entryName,
+ void extractFile( File archive, File destDir, InputStream compressedInputStream, String entryName,
Date entryDate, boolean isDirectory )
throws Exception
{
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java Tue Oct 9 17:45:37 2012
@@ -47,11 +47,11 @@ public class Os
{
public static final String OS_NAME = System.getProperty( "os.name" ).toLowerCase( Locale.ENGLISH );
- public static final String OS_ARCH = System.getProperty( "os.arch" ).toLowerCase( Locale.ENGLISH );
+ public static final String OS_ARCH = System.getProperty( "os.arch" ).toLowerCase(Locale.ENGLISH);
- public static final String OS_VERSION = System.getProperty( "os.version" ).toLowerCase( Locale.ENGLISH );
+ public static final String OS_VERSION = System.getProperty( "os.version" ).toLowerCase(Locale.ENGLISH);
- public static final String PATH_SEP = System.getProperty( "path.separator" );
+ public static final String PATH_SEP = System.getProperty("path.separator");
public static final String OS_FAMILY = getOsFamily();
@@ -217,36 +217,6 @@ public class Os
}
/**
- * Sets the desired OS name
- *
- * @param name The OS name
- */
- public void setName( String name )
- {
- this.name = name.toLowerCase( Locale.ENGLISH );
- }
-
- /**
- * Sets the desired OS architecture
- *
- * @param arch The OS architecture
- */
- public void setArch( String arch )
- {
- this.arch = arch.toLowerCase( Locale.ENGLISH );
- }
-
- /**
- * Sets the desired OS version
- *
- * @param version The OS version
- */
- public void setVersion( String version )
- {
- this.version = version.toLowerCase( Locale.ENGLISH );
- }
-
- /**
* Determines if the OS on which Ant is executing matches the type of
* that set in setFamily.
*
@@ -254,8 +224,7 @@ public class Os
* @throws Exception if there is an error.
* @see Os#setFamily(String)
*/
- public boolean eval()
- throws Exception
+ boolean eval()
{
return isOs( family, name, arch, version );
}
@@ -323,7 +292,7 @@ public class Os
* @return true if the OS matches
* @since 1.7
*/
- public static boolean isOs( String family, String name, String arch, String version )
+ private static boolean isOs( String family, String name, String arch, String version )
{
boolean retValue = false;
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java Tue Oct 9 17:45:37 2012
@@ -62,7 +62,7 @@ public class PathTool
* the base directory, <code>basedir</code> is null or zero-length,
* or <code>filename</code> is null or zero-length.
*/
- public static final String getRelativePath( String basedir, String filename )
+ public static String getRelativePath( String basedir, String filename )
{
basedir = uppercaseDrive( basedir );
filename = uppercaseDrive( filename );
@@ -114,7 +114,7 @@ public class PathTool
* returned if: <code>filename</code> is null or zero-length.
* @see #getRelativeFilePath(String, String)
*/
- public static final String getRelativePath( String filename )
+ public static String getRelativePath( String filename )
{
filename = uppercaseDrive( filename );
@@ -160,7 +160,7 @@ public class PathTool
* the filename does not contain a directory component, "." is
* returned.
*/
- public static final String getDirectoryComponent( String filename )
+ public static String getDirectoryComponent( String filename )
{
if ( filename == null || filename.length() == 0 )
{
@@ -193,7 +193,7 @@ public class PathTool
* @param relativePath
* @return String
*/
- public static final String calculateLink( String link, String relativePath )
+ public static String calculateLink( String link, String relativePath )
{
//This must be some historical feature
if ( link.startsWith( "/site/" ) )
@@ -255,7 +255,7 @@ public class PathTool
* @param newPath
* @return a relative web path from <code>oldPath</code>.
*/
- public static final String getRelativeWebPath( final String oldPath, final String newPath )
+ public static String getRelativeWebPath( final String oldPath, final String newPath )
{
if ( StringUtils.isEmpty( oldPath ) || StringUtils.isEmpty( newPath ) )
{
@@ -293,7 +293,7 @@ public class PathTool
* @param newPath
* @return a relative file path from <code>oldPath</code>.
*/
- public static final String getRelativeFilePath( final String oldPath, final String newPath )
+ public static String getRelativeFilePath( final String oldPath, final String newPath )
{
if ( StringUtils.isEmpty( oldPath ) || StringUtils.isEmpty( newPath ) )
{
@@ -367,7 +367,7 @@ public class PathTool
* terminated with a forward slash. A zero-length string is
* returned if: the filename is zero-length.
*/
- private static final String determineRelativePath( String filename, String separator )
+ private static String determineRelativePath( String filename, String separator )
{
if ( filename.length() == 0 )
{
@@ -413,7 +413,7 @@ public class PathTool
* @return The file separator used within <code>filename</code>.
* This value is either a forward or backward slash.
*/
- private static final String determineSeparator( String filename )
+ private static String determineSeparator( String filename )
{
int forwardCount = StringUtils.countMatches( filename, "/" );
int backwardCount = StringUtils.countMatches( filename, "\\" );
@@ -427,7 +427,7 @@ public class PathTool
* @param path
* @return String
*/
- static final String uppercaseDrive( String path )
+ static String uppercaseDrive( String path )
{
if ( path == null )
{
@@ -440,7 +440,7 @@ public class PathTool
return path;
}
- private static final String buildRelativePath( String toPath, String fromPath, final char separatorChar )
+ private static String buildRelativePath( String toPath, String fromPath, final char separatorChar )
{
// use tokeniser to traverse paths and for lazy checking
StringTokenizer toTokeniser = new StringTokenizer( toPath, String.valueOf( separatorChar ) );
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java Tue Oct 9 17:45:37 2012
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.util.Properties;
import org.apache.maven.shared.utils.io.IOUtil;
-public class PropertyUtils
+class PropertyUtils
{
public PropertyUtils()
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java Tue Oct 9 17:45:37 2012
@@ -795,8 +795,8 @@ public class StringUtils
*/
public static String overlayString( String text, String overlay, int start, int end )
{
- return new StringBuffer( start + overlay.length() + text.length() - end + 1 ).append(
- text.substring( 0, start ) ).append( overlay ).append( text.substring( end ) ).toString();
+ if (overlay == null) throw new NullPointerException("overlay is null");
+ return text.substring(0, start) + overlay + text.substring(end);
}
// Centering
@@ -1070,7 +1070,7 @@ public class StringUtils
// improved with code from cybertiger@cyberiantiger.org
// unicode from him, and defaul for < 32's.
int sz = str.length();
- StringBuffer buffer = new StringBuffer( 2 * sz );
+ StringBuilder buffer = new StringBuilder( 2 * sz );
for ( int i = 0; i < sz; i++ )
{
char ch = str.charAt( i );
@@ -1078,15 +1078,15 @@ public class StringUtils
// handle unicode
if ( ch > 0xfff )
{
- buffer.append( "\\u" + Integer.toHexString( ch ) );
+ buffer.append("\\u").append(Integer.toHexString(ch));
}
else if ( ch > 0xff )
{
- buffer.append( "\\u0" + Integer.toHexString( ch ) );
+ buffer.append("\\u0").append(Integer.toHexString(ch));
}
else if ( ch > 0x7f )
{
- buffer.append( "\\u00" + Integer.toHexString( ch ) );
+ buffer.append("\\u00").append(Integer.toHexString(ch));
}
else if ( ch < 32 )
{
@@ -1115,11 +1115,11 @@ public class StringUtils
default:
if ( ch > 0xf )
{
- buffer.append( "\\u00" + Integer.toHexString( ch ) );
+ buffer.append("\\u00").append(Integer.toHexString(ch));
}
else
{
- buffer.append( "\\u000" + Integer.toHexString( ch ) );
+ buffer.append("\\u000").append(Integer.toHexString(ch));
}
break;
}
@@ -1439,8 +1439,7 @@ public class StringUtils
}
else
{
- return new StringBuffer( str.length() ).append( Character.toLowerCase( str.charAt( 0 ) ) ).append(
- str.substring( 1 ) ).toString();
+ return String.valueOf(Character.toLowerCase(str.charAt(0))) + str.substring(1);
}
}
@@ -1465,8 +1464,7 @@ public class StringUtils
}
else
{
- return new StringBuffer( str.length() ).append( Character.toTitleCase( str.charAt( 0 ) ) ).append(
- str.substring( 1 ) ).toString();
+ return String.valueOf(Character.toTitleCase(str.charAt(0))) + str.substring(1);
}
}
@@ -1707,7 +1705,7 @@ public class StringUtils
int sz = str.length();
for ( int i = 0; i < sz; i++ )
{
- if ( Character.isLetter( str.charAt( i ) ) == false )
+ if (!Character.isLetter( str.charAt( i ) ))
{
return false;
}
@@ -1733,7 +1731,7 @@ public class StringUtils
int sz = str.length();
for ( int i = 0; i < sz; i++ )
{
- if ( ( Character.isWhitespace( str.charAt( i ) ) == false ) )
+ if ((!Character.isWhitespace(str.charAt(i))))
{
return false;
}
@@ -1761,7 +1759,7 @@ public class StringUtils
int sz = str.length();
for ( int i = 0; i < sz; i++ )
{
- if ( ( Character.isLetter( str.charAt( i ) ) == false ) && ( str.charAt( i ) != ' ' ) )
+ if ((!Character.isLetter(str.charAt(i))) && (str.charAt(i) != ' '))
{
return false;
}
@@ -1788,7 +1786,7 @@ public class StringUtils
int sz = str.length();
for ( int i = 0; i < sz; i++ )
{
- if ( Character.isLetterOrDigit( str.charAt( i ) ) == false )
+ if (!Character.isLetterOrDigit( str.charAt( i ) ))
{
return false;
}
@@ -1816,7 +1814,7 @@ public class StringUtils
int sz = str.length();
for ( int i = 0; i < sz; i++ )
{
- if ( ( Character.isLetterOrDigit( str.charAt( i ) ) == false ) && ( str.charAt( i ) != ' ' ) )
+ if ((!Character.isLetterOrDigit(str.charAt(i))) && (str.charAt(i) != ' '))
{
return false;
}
@@ -1842,35 +1840,7 @@ public class StringUtils
int sz = str.length();
for ( int i = 0; i < sz; i++ )
{
- if ( Character.isDigit( str.charAt( i ) ) == false )
- {
- return false;
- }
- }
- return true;
- }
-
- /**
- * <p>Checks if the String contains only unicode digits or space
- * (<code>' '</code>).</p>
- * <p/>
- * <p><code>null</code> will return <code>false</code>. An empty
- * String will return <code>true</code>.</p>
- *
- * @param str the String to check
- * @return <code>true</code> if only contains digits or space,
- * and is non-null
- */
- public static boolean isNumericSpace( String str )
- {
- if ( str == null )
- {
- return false;
- }
- int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( ( Character.isDigit( str.charAt( i ) ) == false ) && ( str.charAt( i ) != ' ' ) )
+ if (!Character.isDigit( str.charAt( i ) ))
{
return false;
}
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/AbstractStreamHandler.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/AbstractStreamHandler.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/AbstractStreamHandler.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/AbstractStreamHandler.java Tue Oct 9 17:45:37 2012
@@ -22,14 +22,14 @@ package org.apache.maven.shared.utils.cl
/**
* @author <a href="mailto:kristian.rosenvold@gmail.com">Kristian Rosenvold</a>
*/
-public class AbstractStreamHandler
+class AbstractStreamHandler
extends Thread
{
private boolean done;
private volatile boolean disabled;
- public boolean isDone()
+ boolean isDone()
{
return done;
}
@@ -44,7 +44,7 @@ public class AbstractStreamHandler
}
- protected boolean isDisabled()
+ boolean isDisabled()
{
return disabled;
}
@@ -54,7 +54,7 @@ public class AbstractStreamHandler
disabled = true;
}
- public void setDone()
+ void setDone()
{
done = true;
}
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java Tue Oct 9 17:45:37 2012
@@ -29,5 +29,4 @@ public interface Arg
void setFile( File value );
- String[] getParts();
}
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java Tue Oct 9 17:45:37 2012
@@ -30,14 +30,6 @@ public class CommandLineTimeOutException
/**
* @param message
- */
- public CommandLineTimeOutException( String message )
- {
- super( message );
- }
-
- /**
- * @param message
* @param cause
*/
public CommandLineTimeOutException( String message, Throwable cause )
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java Tue Oct 9 17:45:37 2012
@@ -27,7 +27,6 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -50,15 +49,15 @@ public abstract class CommandLineUtils
*
* @see java.nio.charset.Charset
*/
- public static final String UTF_16LE = "UTF-16LE";
+ private static final String UTF_16LE = "UTF-16LE";
public static class StringStreamConsumer
implements StreamConsumer
{
- private StringBuffer string = new StringBuffer();
+ private final StringBuffer string = new StringBuffer();
- private String ls = System.getProperty( "line.separator" );
+ private final String ls = System.getProperty( "line.separator" );
public void consumeLine( String line )
{
@@ -120,7 +119,7 @@ public abstract class CommandLineUtils
* @throws CommandLineException or CommandLineTimeOutException if time out occurs
* @noinspection ThrowableResultOfMethodCallIgnored
*/
- public static int executeCommandLine( Commandline cl, InputStream systemIn, StreamConsumer systemOut,
+ private static int executeCommandLine( Commandline cl, InputStream systemIn, StreamConsumer systemOut,
StreamConsumer systemErr, int timeoutInSeconds )
throws CommandLineException
{
@@ -143,7 +142,7 @@ public abstract class CommandLineUtils
* @throws CommandLineException or CommandLineTimeOutException if time out occurs
* @noinspection ThrowableResultOfMethodCallIgnored
*/
- public static CommandLineCallable executeCommandLineAsCallable( final Commandline cl, final InputStream systemIn,
+ private static CommandLineCallable executeCommandLineAsCallable( final Commandline cl, final InputStream systemIn,
final StreamConsumer systemOut,
final StreamConsumer systemErr,
final int timeoutInSeconds )
@@ -396,7 +395,7 @@ public abstract class CommandLineUtils
}
}
- public static boolean isAlive( Process p )
+ private static boolean isAlive( Process p )
{
if ( p == null )
{
@@ -492,101 +491,7 @@ public abstract class CommandLineUtils
throw new CommandLineException( "unbalanced quotes in " + toProcess );
}
- String[] args = tokens.toArray( new String[tokens.size()] );
-
- return args;
- }
-
- /**
- * <p>Put quotes around the given String if necessary.</p>
- * <p>If the argument doesn't include spaces or quotes, return it
- * as is. If it contains double quotes, use single quotes - else
- * surround the argument by double quotes.</p>
- *
- * @throws CommandLineException if the argument contains both, single
- * and double quotes.
- * @deprecated Use {@link StringUtils#quoteAndEscape(String, char, char[], char[], char, boolean)},
- * {@link StringUtils#quoteAndEscape(String, char, char[], char, boolean)}, or
- * {@link StringUtils#quoteAndEscape(String, char)} instead.
- */
- @SuppressWarnings( { "JavaDoc", "deprecation" } )
- public static String quote( String argument )
- throws CommandLineException
- {
- return quote( argument, false, false, true );
- }
-
- /**
- * <p>Put quotes around the given String if necessary.</p>
- * <p>If the argument doesn't include spaces or quotes, return it
- * as is. If it contains double quotes, use single quotes - else
- * surround the argument by double quotes.</p>
- *
- * @throws CommandLineException if the argument contains both, single
- * and double quotes.
- * @deprecated Use {@link StringUtils#quoteAndEscape(String, char, char[], char[], char, boolean)},
- * {@link StringUtils#quoteAndEscape(String, char, char[], char, boolean)}, or
- * {@link StringUtils#quoteAndEscape(String, char)} instead.
- */
- @SuppressWarnings( { "JavaDoc", "UnusedDeclaration", "deprecation" } )
- public static String quote( String argument, boolean wrapExistingQuotes )
- throws CommandLineException
- {
- return quote( argument, false, false, wrapExistingQuotes );
- }
-
- /**
- * @deprecated Use {@link StringUtils#quoteAndEscape(String, char, char[], char[], char, boolean)},
- * {@link StringUtils#quoteAndEscape(String, char, char[], char, boolean)}, or
- * {@link StringUtils#quoteAndEscape(String, char)} instead.
- */
- @SuppressWarnings( { "JavaDoc" } )
- public static String quote( String argument, boolean escapeSingleQuotes, boolean escapeDoubleQuotes,
- boolean wrapExistingQuotes )
- throws CommandLineException
- {
- if ( argument.contains( "\"" ) )
- {
- if ( argument.contains( "\'" ) )
- {
- throw new CommandLineException( "Can't handle single and double quotes in same argument" );
- }
- else
- {
- if ( escapeSingleQuotes )
- {
- return "\\\'" + argument + "\\\'";
- }
- else if ( wrapExistingQuotes )
- {
- return '\'' + argument + '\'';
- }
- }
- }
- else if ( argument.contains( "\'" ) )
- {
- if ( escapeDoubleQuotes )
- {
- return "\\\"" + argument + "\\\"";
- }
- else if ( wrapExistingQuotes )
- {
- return '\"' + argument + '\"';
- }
- }
- else if ( argument.contains( " " ) )
- {
- if ( escapeDoubleQuotes )
- {
- return "\\\"" + argument + "\\\"";
- }
- else
- {
- return '\"' + argument + '\"';
- }
- }
-
- return argument;
+ return tokens.toArray( new String[tokens.size()] );
}
public static String toString( String[] line )
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java Tue Oct 9 17:45:37 2012
@@ -21,12 +21,8 @@ package org.apache.maven.shared.utils.cl
import java.io.File;
import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Vector;
+import java.util.*;
+
import org.apache.maven.shared.utils.Os;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.shell.BourneShell;
@@ -65,57 +61,15 @@ import org.apache.maven.shared.utils.cli
public class Commandline
implements Cloneable
{
- protected Vector arguments = new Vector();
+ private final List<Arg> arguments = new Vector<Arg>();
//protected Vector envVars = new Vector();
// synchronized added to preserve synchronize of Vector class
- protected Map envVars = Collections.synchronizedMap( new LinkedHashMap() );
-
- private long pid = -1;
+ private final Map<String,String> envVars = Collections.synchronizedMap( new LinkedHashMap<String,String>() );
private Shell shell;
/**
- * @deprecated Use {@link Commandline#setExecutable(String)} instead.
- */
- protected String executable;
-
- /**
- * @deprecated Use {@link Commandline#setWorkingDirectory(File)} or
- * {@link Commandline#setWorkingDirectory(String)} instead.
- */
- private File workingDir;
-
- /**
- * Create a new command line object.
- * Shell is autodetected from operating system
- *
- * @param toProcess
- */
- public Commandline( String toProcess, Shell shell )
- {
- this.shell = shell;
-
- String[] tmp = new String[0];
- try
- {
- tmp = CommandLineUtils.translateCommandline( toProcess );
- }
- catch ( Exception e )
- {
- System.err.println( "Error translating Commandline." );
- }
- if ( ( tmp != null ) && ( tmp.length > 0 ) )
- {
- setExecutable( tmp[0] );
- for ( int i = 1; i < tmp.length; i++ )
- {
- createArgument().setValue( tmp[i] );
- }
- }
- }
-
- /**
* Create a new command line object.
* Shell is autodetected from operating system
*/
@@ -128,7 +82,7 @@ public class Commandline
* Create a new command line object.
* Shell is autodetected from operating system
*
- * @param toProcess
+ * @param toProcess The command to process
*/
public Commandline( String toProcess )
{
@@ -147,7 +101,7 @@ public class Commandline
setExecutable( tmp[0] );
for ( int i = 1; i < tmp.length; i++ )
{
- createArgument().setValue( tmp[i] );
+ createArg().setValue( tmp[i] );
}
}
}
@@ -161,60 +115,6 @@ public class Commandline
setDefaultShell();
}
- public long getPid()
- {
- if ( pid == -1 )
- {
- pid = Long.parseLong( String.valueOf( System.currentTimeMillis() ) );
- }
-
- return pid;
- }
-
- public void setPid( long pid )
- {
- this.pid = pid;
- }
-
- /**
- * Class to keep track of the position of an Argument.
- */
- // <p>This class is there to support the srcfile and targetfile
- // elements of <execon> and <transform> - don't know
- // whether there might be additional use cases.</p> --SB
- public class Marker
- {
-
- private int position;
-
- private int realPos = -1;
-
- Marker( int position )
- {
- this.position = position;
- }
-
- /**
- * Return the number of arguments that preceeded this marker.
- * <p/>
- * <p>The name of the executable - if set - is counted as the
- * very first argument.</p>
- */
- public int getPosition()
- {
- if ( realPos == -1 )
- {
- realPos = ( getExecutable() == null ? 0 : 1 );
- for ( int i = 0; i < position; i++ )
- {
- Arg arg = (Arg) arguments.elementAt( i );
- realPos += arg.getParts().length;
- }
- }
- return realPos;
- }
- }
-
/**
* <p>Sets the shell or command-line interpretor for the detected operating system,
* and the shell arguments.</p>
@@ -247,47 +147,6 @@ public class Commandline
* <code>this.createArgument(false)</code>.</p>
*
* @return the argument object.
- * @see #createArgument(boolean)
- * @deprecated Use {@link Commandline#createArg()} instead
- */
- public Argument createArgument()
- {
- return this.createArgument( false );
- }
-
- /**
- * Creates an argument object and adds it to our list of args.
- * <p/>
- * <p>Each commandline object has at most one instance of the
- * argument class.</p>
- *
- * @param insertAtStart if true, the argument is inserted at the
- * beginning of the list of args, otherwise it is appended.
- * @deprecated Use {@link Commandline#createArg(boolean)} instead
- */
- public Argument createArgument( boolean insertAtStart )
- {
- Argument argument = new Argument();
- if ( insertAtStart )
- {
- arguments.insertElementAt( argument, 0 );
- }
- else
- {
- arguments.addElement( argument );
- }
- return argument;
- }
-
- /**
- * Creates an argument object.
- * <p/>
- * <p>Each commandline object has at most one instance of the
- * argument class. This method calls
- * <code>this.createArgument(false)</code>.</p>
- *
- * @return the argument object.
- * @see #createArgument(boolean)
*/
public Arg createArg()
{
@@ -308,70 +167,33 @@ public class Commandline
Arg argument = new Argument();
if ( insertAtStart )
{
- arguments.insertElementAt( argument, 0 );
+ arguments.add(0, argument);
}
else
{
- arguments.addElement( argument );
+ arguments.add(argument);
}
return argument;
}
/**
- * Adds an argument object to our list of args.
- *
- * @return the argument object.
- * @see #addArg(Arg, boolean)
- */
- public void addArg( Arg argument )
- {
- this.addArg( argument, false );
- }
-
- /**
- * Adds an argument object to our list of args.
- *
- * @param insertAtStart if true, the argument is inserted at the
- * beginning of the list of args, otherwise it is appended.
- */
- public void addArg( Arg argument, boolean insertAtStart )
- {
- if ( insertAtStart )
- {
- arguments.insertElementAt( argument, 0 );
- }
- else
- {
- arguments.addElement( argument );
- }
- }
-
- /**
* Sets the executable to run.
*/
public void setExecutable( String executable )
{
shell.setExecutable( executable );
- this.executable = executable;
}
public String getExecutable()
{
- String exec = shell.getExecutable();
- if ( exec == null )
- {
- exec = executable;
- }
-
- return exec;
+ return shell.getExecutable();
}
public void addArguments( String[] line )
{
- for ( int i = 0; i < line.length; i++ )
- {
- createArgument().setValue( line[i] );
+ for (String aLine : line) {
+ createArg().setValue(aLine);
}
}
@@ -392,12 +214,10 @@ public class Commandline
{
Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();
- for ( Iterator i = systemEnvVars.keySet().iterator(); i.hasNext(); )
- {
- String key = (String) i.next();
- if ( !envVars.containsKey( key ) )
- {
- addEnvironment( key, systemEnvVars.getProperty( key ) );
+ for (Object o : systemEnvVars.keySet()) {
+ String key = (String) o;
+ if (!envVars.containsKey(key)) {
+ addEnvironment(key, systemEnvVars.getProperty(key));
}
}
}
@@ -418,10 +238,8 @@ public class Commandline
}
String[] environmentVars = new String[envVars.size()];
int i = 0;
- for ( Iterator iterator = envVars.keySet().iterator(); iterator.hasNext(); )
- {
- String name = (String) iterator.next();
- String value = (String) envVars.get( name );
+ for (String name : envVars.keySet()) {
+ String value = envVars.get(name);
environmentVars[i] = name + "=" + value;
i++;
}
@@ -452,9 +270,9 @@ public class Commandline
public String[] getShellCommandline()
{
// TODO: Provided only for backward compat. with <= 1.4
- verifyShellState();
- return (String[]) getShell().getShellCommandLine( getArguments() ).toArray( new String[0] );
+ List<String> shellCommandLine = getShell().getShellCommandLine(getArguments());
+ return shellCommandLine.toArray(new String[shellCommandLine.size()]);
}
/**
@@ -463,23 +281,16 @@ public class Commandline
*/
public String[] getArguments()
{
- Vector result = new Vector( arguments.size() * 2 );
- for ( int i = 0; i < arguments.size(); i++ )
- {
- Argument arg = (Argument) arguments.elementAt( i );
+ List<String> result = new ArrayList<String>( arguments.size() * 2 );
+ for (Arg argument : arguments) {
+ Argument arg = (Argument) argument;
String[] s = arg.getParts();
- if ( s != null )
- {
- for ( int j = 0; j < s.length; j++ )
- {
- result.addElement( s[j] );
- }
+ if (s != null) {
+ Collections.addAll(result, s);
}
}
- String[] res = new String[result.size()];
- result.copyInto( res );
- return res;
+ return result.toArray(new String[result.size()]);
}
public String toString()
@@ -487,59 +298,20 @@ public class Commandline
return StringUtils.join( getShellCommandline(), " " );
}
- public int size()
- {
- return getCommandline().length;
- }
public Object clone()
{
Commandline c = new Commandline( (Shell) shell.clone() );
- c.executable = executable;
- c.workingDir = workingDir;
c.addArguments( getArguments() );
return c;
}
/**
- * Clear out the whole command line.
- */
- public void clear()
- {
- executable = null;
- workingDir = null;
- shell.setExecutable( null );
- shell.clearArguments();
- arguments.removeAllElements();
- }
-
- /**
- * Clear out the arguments but leave the executable in place for another operation.
- */
- public void clearArgs()
- {
- arguments.removeAllElements();
- }
-
- /**
- * Return a marker.
- * <p/>
- * <p>This marker can be used to locate a position on the
- * commandline - to insert something for example - when all
- * parameters have been set.</p>
- */
- public Marker createMarker()
- {
- return new Marker( arguments.size() );
- }
-
- /**
* Sets execution directory.
*/
public void setWorkingDirectory( String path )
{
shell.setWorkingDirectory( path );
- workingDir = new File( path );
}
/**
@@ -548,19 +320,11 @@ public class Commandline
public void setWorkingDirectory( File workingDirectory )
{
shell.setWorkingDirectory( workingDirectory );
- workingDir = workingDirectory;
}
public File getWorkingDirectory()
{
- File workDir = shell.getWorkingDirectory();
-
- if ( workDir == null )
- {
- workDir = workingDir;
- }
-
- return workDir;
+ return shell.getWorkingDirectory();
}
/**
@@ -570,7 +334,6 @@ public class Commandline
throws CommandLineException
{
// TODO: Provided only for backward compat. with <= 1.4
- verifyShellState();
Process process;
@@ -611,34 +374,12 @@ public class Commandline
}
/**
- * @deprecated Remove once backward compat with plexus-utils <= 1.4 is no longer a consideration
- */
- private void verifyShellState()
- {
- if ( shell.getWorkingDirectory() == null )
- {
- shell.setWorkingDirectory( workingDir );
- }
-
- if ( shell.getExecutable() == null )
- {
- shell.setExecutable( executable );
- }
- }
-
- public Properties getSystemEnvVars()
- throws Exception
- {
- return CommandLineUtils.getSystemEnvVars();
- }
-
- /**
* Allows to set the shell to be used in this command line.
*
- * @param shell
+ * @param shell the shell
* @since 1.2
*/
- public void setShell( Shell shell )
+ void setShell( Shell shell )
{
this.shell = shell;
}
@@ -663,15 +404,6 @@ public class Commandline
}
/**
- * @deprecated Use {@link CommandLineUtils#quote(String)} instead.
- */
- public static String quoteArgument( String argument )
- throws CommandLineException
- {
- return CommandLineUtils.quote( argument );
- }
-
- /**
* @deprecated Use {@link CommandLineUtils#toString(String[])} instead.
*/
public static String toString( String[] line )
@@ -725,7 +457,7 @@ public class Commandline
/* (non-Javadoc)
* @see org.apache.maven.shared.utils.cli.Argumnt#getParts()
*/
- public String[] getParts()
+ private String[] getParts()
{
return parts;
}
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java Tue Oct 9 17:45:37 2012
@@ -29,7 +29,7 @@ import java.io.OutputStream;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
-public class StreamFeeder
+class StreamFeeder
extends AbstractStreamHandler
{
private InputStream input;
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java Tue Oct 9 17:45:37 2012
@@ -34,35 +34,25 @@ import org.apache.maven.shared.utils.io.
* @author <a href="mailto:pj@thoughtworks.com">Paul Julius </a>
* @since June 11, 2001
*/
-public class StreamPumper
+class StreamPumper
extends AbstractStreamHandler
{
- private BufferedReader in;
+ private final BufferedReader in;
- private StreamConsumer consumer = null;
+ private final StreamConsumer consumer;
- private PrintWriter out = null;
+ private final PrintWriter out;
private volatile Exception exception = null;
private static final int SIZE = 1024;
- public StreamPumper( InputStream in )
- {
- this( in, (StreamConsumer) null );
- }
-
public StreamPumper( InputStream in, StreamConsumer consumer )
{
this( in, null, consumer );
}
- public StreamPumper( InputStream in, PrintWriter writer )
- {
- this( in, writer, null );
- }
-
- public StreamPumper( InputStream in, PrintWriter writer, StreamConsumer consumer )
+ private StreamPumper( InputStream in, PrintWriter writer, StreamConsumer consumer )
{
this.in = new BufferedReader( new InputStreamReader( in ), SIZE );
this.out = writer;
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java Tue Oct 9 17:45:37 2012
@@ -31,7 +31,7 @@ public class WriterStreamConsumer
implements StreamConsumer
{
- private PrintWriter writer;
+ private final PrintWriter writer;
public WriterStreamConsumer( Writer writer )
{
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=1396135&r1=1396134&r2=1396135&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 Tue Oct 9 17:45:37 2012
@@ -36,22 +36,12 @@ public class BourneShell
public BourneShell()
{
- this( false );
- }
-
- public BourneShell( boolean isLoginShell )
- {
setShellCommand( "/bin/sh" );
setArgumentQuoteDelimiter( '\'' );
setExecutableQuoteDelimiter( '\"' );
setSingleQuotedArgumentEscaped( true );
setSingleQuotedExecutableEscaped( false );
setQuotedExecutableEnabled( true );
-
- if ( isLoginShell )
- {
- addShellArg( "-l" );
- }
}
/**
@@ -142,7 +132,7 @@ public class BourneShell
* @param path not null path.
* @return the path unified correctly for the Bourne shell.
*/
- protected static String unifyQuotes( String path )
+ private static String unifyQuotes( String path )
{
if ( path == null )
{
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=1396135&r1=1396134&r2=1396135&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 Tue Oct 9 17:45:37 2012
@@ -83,12 +83,12 @@ public class CmdShell
*/
public List<String> getCommandLine( String executable, String[] arguments )
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "\"" );
sb.append( super.getCommandLine( executable, arguments ).get( 0 ) );
sb.append( "\"" );
- return Arrays.asList( new String[]{ sb.toString() } );
+ 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=1396135&r1=1396134&r2=1396135&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 Tue Oct 9 17:45:37 2012
@@ -46,7 +46,7 @@ public class Shell
private String shellCommand;
- private List<String> shellArgs = new ArrayList<String>();
+ private final List<String> shellArgs = new ArrayList<String>();
private boolean quotedArgumentsEnabled = true;
@@ -73,7 +73,7 @@ public class Shell
*
* @param shellCommand
*/
- public void setShellCommand( String shellCommand )
+ void setShellCommand( String shellCommand )
{
this.shellCommand = shellCommand;
}
@@ -83,7 +83,7 @@ public class Shell
*
* @return
*/
- public String getShellCommand()
+ String getShellCommand()
{
return shellCommand;
}
@@ -92,9 +92,9 @@ public class Shell
* Set the shell arguments when calling a command line (not the executable arguments)
* (eg. /X /C for CMD.EXE)
*
- * @param shellArgs
+ * @param shellArgs the arguments to the shell
*/
- public void setShellArgs( String[] shellArgs )
+ void setShellArgs( String[] shellArgs )
{
this.shellArgs.clear();
this.shellArgs.addAll( Arrays.asList( shellArgs ) );
@@ -105,7 +105,7 @@ public class Shell
*
* @return
*/
- public String[] getShellArgs()
+ String[] getShellArgs()
{
if ( ( shellArgs == null ) || shellArgs.isEmpty() )
{
@@ -113,7 +113,7 @@ public class Shell
}
else
{
- return (String[]) shellArgs.toArray( new String[shellArgs.size()] );
+ return shellArgs.toArray( new String[shellArgs.size()] );
}
}
@@ -124,15 +124,15 @@ 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
*/
- public List<String> getCommandLine( String executable, String[] arguments )
+ List<String> getCommandLine( String executable, String[] arguments )
{
return getRawCommandLine( executable, arguments );
}
- protected List<String> getRawCommandLine( String executable, String[] arguments )
+ List<String> getRawCommandLine( String executable, String[] arguments )
{
List<String> commandLine = new ArrayList<String>();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if ( executable != null )
{
@@ -155,24 +155,19 @@ public class Shell
sb.append( getExecutable() );
}
}
- for ( int i = 0; i < arguments.length; i++ )
- {
- if ( sb.length() > 0 )
- {
- sb.append( " " );
+ for (String argument : arguments) {
+ if (sb.length() > 0) {
+ sb.append(" ");
}
- if ( isQuotedArgumentsEnabled() )
- {
+ if (isQuotedArgumentsEnabled()) {
char[] escapeChars =
- getEscapeChars( isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped() );
+ getEscapeChars(isSingleQuotedArgumentEscaped(), isDoubleQuotedArgumentEscaped());
- sb.append( StringUtils.quoteAndEscape( arguments[i], getArgumentQuoteDelimiter(), escapeChars,
- getQuotingTriggerChars(), '\\', false ) );
- }
- else
- {
- sb.append( arguments[i] );
+ sb.append(StringUtils.quoteAndEscape(argument, getArgumentQuoteDelimiter(), escapeChars,
+ getQuotingTriggerChars(), '\\', false));
+ } else {
+ sb.append(argument);
}
}
@@ -181,19 +176,19 @@ public class Shell
return commandLine;
}
- protected char[] getQuotingTriggerChars()
+ char[] getQuotingTriggerChars()
{
return DEFAULT_QUOTING_TRIGGER_CHARS;
}
- protected String getExecutionPreamble()
+ String getExecutionPreamble()
{
return null;
}
- protected char[] getEscapeChars( boolean includeSingleQuote, boolean includeDoubleQuote )
+ char[] getEscapeChars( boolean includeSingleQuote, boolean includeDoubleQuote )
{
- StringBuffer buf = new StringBuffer( 2 );
+ StringBuilder buf = new StringBuilder( 2 );
if ( includeSingleQuote )
{
buf.append( '\'' );
@@ -220,32 +215,32 @@ public class Shell
return singleQuotedArgumentEscaped;
}
- protected boolean isDoubleQuotedExecutableEscaped()
+ boolean isDoubleQuotedExecutableEscaped()
{
return doubleQuotedExecutableEscaped;
}
- protected boolean isSingleQuotedExecutableEscaped()
+ boolean isSingleQuotedExecutableEscaped()
{
return singleQuotedExecutableEscaped;
}
- protected void setArgumentQuoteDelimiter( char argQuoteDelimiter )
+ void setArgumentQuoteDelimiter( char argQuoteDelimiter )
{
this.argQuoteDelimiter = argQuoteDelimiter;
}
- protected char getArgumentQuoteDelimiter()
+ char getArgumentQuoteDelimiter()
{
return argQuoteDelimiter;
}
- protected void setExecutableQuoteDelimiter( char exeQuoteDelimiter )
+ void setExecutableQuoteDelimiter( char exeQuoteDelimiter )
{
this.exeQuoteDelimiter = exeQuoteDelimiter;
}
- protected char getExecutableQuoteDelimiter()
+ char getExecutableQuoteDelimiter()
{
return exeQuoteDelimiter;
}
@@ -279,12 +274,12 @@ public class Shell
}
- public List<String> getShellArgsList()
+ List<String> getShellArgsList()
{
return shellArgs;
}
- public void addShellArg( String arg )
+ void addShellArg( String arg )
{
shellArgs.add( arg );
}
@@ -294,17 +289,17 @@ public class Shell
this.quotedArgumentsEnabled = quotedArgumentsEnabled;
}
- public boolean isQuotedArgumentsEnabled()
+ boolean isQuotedArgumentsEnabled()
{
return quotedArgumentsEnabled;
}
- public void setQuotedExecutableEnabled( boolean quotedExecutableEnabled )
+ void setQuotedExecutableEnabled( boolean quotedExecutableEnabled )
{
this.quotedExecutableEnabled = quotedExecutableEnabled;
}
- public boolean isQuotedExecutableEnabled()
+ boolean isQuotedExecutableEnabled()
{
return quotedExecutableEnabled;
}
@@ -353,16 +348,11 @@ public class Shell
return workingDir == null ? null : new File( workingDir );
}
- public String getWorkingDirectoryAsString()
+ String getWorkingDirectoryAsString()
{
return workingDir;
}
- public void clearArguments()
- {
- shellArgs.clear();
- }
-
public Object clone()
{
Shell shell = new Shell();
@@ -392,12 +382,12 @@ public class Shell
this.doubleQuotedExecutableEscaped = doubleQuotedExecutableEscaped;
}
- protected void setSingleQuotedArgumentEscaped( boolean singleQuotedArgumentEscaped )
+ void setSingleQuotedArgumentEscaped( boolean singleQuotedArgumentEscaped )
{
this.singleQuotedArgumentEscaped = singleQuotedArgumentEscaped;
}
- protected void setSingleQuotedExecutableEscaped( boolean singleQuotedExecutableEscaped )
+ void setSingleQuotedExecutableEscaped( boolean singleQuotedExecutableEscaped )
{
this.singleQuotedExecutableEscaped = singleQuotedExecutableEscaped;
}
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java Tue Oct 9 17:45:37 2012
@@ -32,7 +32,7 @@ import java.util.Map;
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @version $Id$
*/
-public class ClassMap
+class ClassMap
{
private static final class CacheMiss
{
@@ -53,7 +53,7 @@ public class ClassMap
* Cache of Methods, or CACHE_MISS, keyed by method
* name and actual arguments used to find it.
*/
- private Map methodCache = new Hashtable();
+ private final Map<String, Object> methodCache = new Hashtable<String, Object>();
private MethodMap methodMap = new MethodMap();
@@ -136,7 +136,6 @@ public class ClassMap
*/
private void populateMethodCache()
{
- StringBuffer methodKey;
/*
* get all publicly accessible methods
@@ -148,10 +147,8 @@ public class ClassMap
* map and cache them
*/
- for ( int i = 0; i < methods.length; i++ )
+ for ( Method method : methods )
{
- Method method = methods[i];
-
/*
* now get the 'public method', the method declared by a
* public interface or class. (because the actual implementing
@@ -184,9 +181,9 @@ public class ClassMap
{
Class[] parameterTypes = method.getParameterTypes();
- StringBuffer methodKey = new StringBuffer( method.getName() );
+ StringBuilder methodKey = new StringBuilder( method.getName() );
- for ( int j = 0; j < parameterTypes.length; j++ )
+ for ( Class parameterType : parameterTypes )
{
/*
* If the argument type is primitive then we want
@@ -194,44 +191,44 @@ public class ClassMap
* corresponding Object type so introspection for
* methods with primitive types will work correctly.
*/
- if ( parameterTypes[j].isPrimitive() )
+ if ( parameterType.isPrimitive() )
{
- if ( parameterTypes[j].equals( Boolean.TYPE ) )
+ if ( parameterType.equals( Boolean.TYPE ) )
{
methodKey.append( "java.lang.Boolean" );
}
- else if ( parameterTypes[j].equals( Byte.TYPE ) )
+ else if ( parameterType.equals( Byte.TYPE ) )
{
methodKey.append( "java.lang.Byte" );
}
- else if ( parameterTypes[j].equals( Character.TYPE ) )
+ else if ( parameterType.equals( Character.TYPE ) )
{
methodKey.append( "java.lang.Character" );
}
- else if ( parameterTypes[j].equals( Double.TYPE ) )
+ else if ( parameterType.equals( Double.TYPE ) )
{
methodKey.append( "java.lang.Double" );
}
- else if ( parameterTypes[j].equals( Float.TYPE ) )
+ else if ( parameterType.equals( Float.TYPE ) )
{
methodKey.append( "java.lang.Float" );
}
- else if ( parameterTypes[j].equals( Integer.TYPE ) )
+ else if ( parameterType.equals( Integer.TYPE ) )
{
methodKey.append( "java.lang.Integer" );
}
- else if ( parameterTypes[j].equals( Long.TYPE ) )
+ else if ( parameterType.equals( Long.TYPE ) )
{
methodKey.append( "java.lang.Long" );
}
- else if ( parameterTypes[j].equals( Short.TYPE ) )
+ else if ( parameterType.equals( Short.TYPE ) )
{
methodKey.append( "java.lang.Short" );
}
}
else
{
- methodKey.append( parameterTypes[j].getName() );
+ methodKey.append( parameterType.getName() );
}
}
@@ -240,11 +237,11 @@ public class ClassMap
private static String makeMethodKey( String method, Object[] params )
{
- StringBuffer methodKey = new StringBuffer().append( method );
+ StringBuilder methodKey = new StringBuilder().append( method );
- for ( int j = 0; j < params.length; j++ )
+ for ( Object param : params )
{
- Object arg = params[j];
+ Object arg = param;
if ( arg == null )
{
@@ -300,9 +297,8 @@ public class ClassMap
}
int j = 0;
- for ( int i = 0; i < methodInfos.length; ++i )
+ for ( MethodInfo methodInfo : methodInfos )
{
- MethodInfo methodInfo = methodInfos[i];
if ( methodInfo.upcast )
{
methods[j++] = methodInfo.method;
@@ -418,7 +414,7 @@ public class ClassMap
* method is itself declared by a public class, this method is an identity
* function.
*/
- public static Method getPublicMethod( Method method )
+ private static Method getPublicMethod( Method method )
{
Class clazz = method.getDeclaringClass();
@@ -488,9 +484,9 @@ public class ClassMap
Class[] interfaces = clazz.getInterfaces();
- for ( int i = 0; i < interfaces.length; ++i )
+ for ( Class anInterface : interfaces )
{
- Method interfaceMethod = getPublicMethod( interfaces[i], name, paramTypes );
+ Method interfaceMethod = getPublicMethod( anInterface, name, paramTypes );
if ( interfaceMethod != null )
{
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java Tue Oct 9 17:45:37 2012
@@ -43,7 +43,7 @@ public class MethodMap
/**
* Keep track of all methods with the same name.
*/
- Map<String, List<Method>> methodByNameMap = new Hashtable<String, List<Method>>();
+ private final Map<String, List<Method>> methodByNameMap = new Hashtable<String, List<Method>>();
/**
* Add a method to a list of methods by name.
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java?rev=1396135&r1=1396134&r2=1396135&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java Tue Oct 9 17:45:37 2012
@@ -26,11 +26,9 @@ package org.apache.maven.shared.utils.io
*/
public class DirectoryScanResult
{
- private final static String[] NO_FILES = new String[0];
+ private final String[] filesAdded;
- private String[] filesAdded;
-
- private String[] filesRemoved;
+ private final String[] filesRemoved;
public DirectoryScanResult( String[] filesAdded, String[] filesRemoved )
{