Author: krosenvold Date: Wed Oct 10 19:58:41 2012 New Revision: 1396764 URL: http://svn.apache.org/viewvc?rev=1396764&view=rev Log: o Minor cleanups
Modified: 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/cli/shell/BourneShell.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/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java 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=1396764&r1=1396763&r2=1396764&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 Wed Oct 10 19:58:41 2012 @@ -309,17 +309,17 @@ public class Os //windows probing logic relies on the word 'windows' in //the OS - boolean isWindows = OS_NAME.indexOf( FAMILY_WINDOWS ) > -1; + boolean isWindows = OS_NAME.contains( FAMILY_WINDOWS ); boolean is9x = false; boolean isNT = false; if ( isWindows ) { //there are only four 9x platforms that we look for is9x = - ( OS_NAME.indexOf( "95" ) >= 0 || OS_NAME.indexOf( "98" ) >= 0 || OS_NAME.indexOf( "me" ) >= 0 + ( OS_NAME.contains( "95" ) || OS_NAME.contains( "98" ) || OS_NAME.contains( "me" ) //wince isn't really 9x, but crippled enough to //be a muchness. Ant doesnt run on CE, anyway. - || OS_NAME.indexOf( "ce" ) >= 0 ); + || OS_NAME.contains( "ce" ) ); isNT = !is9x; } if ( family.equals( FAMILY_WINDOWS ) ) @@ -336,11 +336,11 @@ public class Os } else if ( family.equals( FAMILY_OS2 ) ) { - isFamily = OS_NAME.indexOf( FAMILY_OS2 ) > -1; + isFamily = OS_NAME.contains( FAMILY_OS2 ); } else if ( family.equals( FAMILY_NETWARE ) ) { - isFamily = OS_NAME.indexOf( FAMILY_NETWARE ) > -1; + isFamily = OS_NAME.contains( FAMILY_NETWARE ); } else if ( family.equals( FAMILY_DOS ) ) { @@ -348,28 +348,28 @@ public class Os } else if ( family.equals( FAMILY_MAC ) ) { - isFamily = OS_NAME.indexOf( FAMILY_MAC ) > -1 || OS_NAME.indexOf( DARWIN ) > -1; + isFamily = OS_NAME.contains( FAMILY_MAC ) || OS_NAME.contains( DARWIN ); } else if ( family.equals( FAMILY_TANDEM ) ) { - isFamily = OS_NAME.indexOf( "nonstop_kernel" ) > -1; + isFamily = OS_NAME.contains( "nonstop_kernel" ); } else if ( family.equals( FAMILY_UNIX ) ) { isFamily = PATH_SEP.equals( ":" ) && !isFamily( FAMILY_OPENVMS ) && ( !isFamily( FAMILY_MAC ) - || OS_NAME.endsWith( "x" ) || OS_NAME.indexOf( DARWIN ) > -1 ); + || OS_NAME.endsWith( "x" ) || OS_NAME.contains( DARWIN ) ); } else if ( family.equals( FAMILY_ZOS ) ) { - isFamily = OS_NAME.indexOf( FAMILY_ZOS ) > -1 || OS_NAME.indexOf( "os/390" ) > -1; + isFamily = OS_NAME.contains( FAMILY_ZOS ) || OS_NAME.contains( "os/390" ); } else if ( family.equals( FAMILY_OS400 ) ) { - isFamily = OS_NAME.indexOf( FAMILY_OS400 ) > -1; + isFamily = OS_NAME.contains( FAMILY_OS400 ); } else if ( family.equals( FAMILY_OPENVMS ) ) { - isFamily = OS_NAME.indexOf( FAMILY_OPENVMS ) > -1; + isFamily = OS_NAME.contains( FAMILY_OPENVMS ); } else { 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=1396764&r1=1396763&r2=1396764&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 Wed Oct 10 19:58:41 2012 @@ -101,7 +101,7 @@ public class BourneShell } String dir = getWorkingDirectoryAsString(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append( "cd " ); sb.append( unifyQuotes( dir ) ); Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java?rev=1396764&r1=1396763&r2=1396764&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java Wed Oct 10 19:58:41 2012 @@ -365,20 +365,6 @@ public class FileUtils } /** - * @param file the file path - * @return the file content lines as String[] using the systems default encoding. - * An empty List if the file didn't exist. - * @throws IOException - */ - public static String[] fileReadArray( File file ) - throws IOException - { - List<String> files = loadFile( file ); - - return files.toArray( new String[files.size()] ); - } - - /** * Appends data to a file. The file will be created if it does not exist. * Note: the data is written with platform encoding * @@ -1149,7 +1135,7 @@ public class FileUtils // FIXME: I'm almost certain this // removal is unnecessary, as getAbsoluteFile() strips // them. However, I'm not sure about this UNC stuff. (JT) final char[] chars = filename.toCharArray(); - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); //remove duplicate file separators in succession - except //on win32 at start of filename as UNC filenames can Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java?rev=1396764&r1=1396763&r2=1396764&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java Wed Oct 10 19:58:41 2012 @@ -149,7 +149,7 @@ public final class IOUtil throws IOException { final byte[] buffer = new byte[bufferSize]; - int n = 0; + int n; while ( -1 != ( n = input.read( buffer ) ) ) { output.write( buffer, 0, n ); @@ -174,7 +174,7 @@ public final class IOUtil throws IOException { final char[] buffer = new char[bufferSize]; - int n = 0; + int n; while ( -1 != ( n = input.read( buffer ) ) ) { output.write( buffer, 0, n ); Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java?rev=1396764&r1=1396763&r2=1396764&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java Wed Oct 10 19:58:41 2012 @@ -253,9 +253,9 @@ public class ReflectionValueExtractorTes public Map getDependenciesAsMap() { Map ret = new HashMap(); - for ( Iterator it = getDependencies().iterator(); it.hasNext();) + for ( Object o : getDependencies() ) { - Dependency dep = (Dependency)it.next(); + Dependency dep = (Dependency) o; ret.put( dep.getArtifactId(), dep ); } return ret;