You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/06/12 23:56:15 UTC
svn commit: r1134993 - in /maven/sandbox/trunk/plexus-utils-commons-bridge:
plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/
plexus-utils-tck/src/test/java/org/apache/maven/tck/
plexus-utils-tck/src/test/java/org/codehaus/plexus/util/
Author: hboutemy
Date: Sun Jun 12 21:56:15 2011
New Revision: 1134993
URL: http://svn.apache.org/viewvc?rev=1134993&view=rev
Log:
fixed typos
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/IOUtil.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/apache/maven/tck/TckMatchers.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PropertyUtilsTest.java
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java?rev=1134993&r1=1134992&r2=1134993&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java Sun Jun 12 21:56:15 2011
@@ -27,37 +27,37 @@ public class Base64
super();
}
- public static boolean isArrayByteBase64(byte[] arrayOctect)
+ public static boolean isArrayByteBase64( byte[] arrayOctet )
{
- return org.apache.commons.codec.binary.Base64.isArrayByteBase64( arrayOctect );
+ return org.apache.commons.codec.binary.Base64.isArrayByteBase64( arrayOctet );
}
- public static byte[] encodeBase64(byte[] binaryData)
+ public static byte[] encodeBase64( byte[] binaryData )
{
return org.apache.commons.codec.binary.Base64.encodeBase64( binaryData );
}
- public static byte[] encodeBase64Chunked(byte[] binaryData)
+ public static byte[] encodeBase64Chunked( byte[] binaryData )
{
return org.apache.commons.codec.binary.Base64.encodeBase64Chunked( binaryData );
}
- public static byte[] encodeBase64(byte[] binaryData, boolean isChunked)
+ public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
{
return org.apache.commons.codec.binary.Base64.encodeBase64( binaryData, isChunked );
}
- public static byte[] decodeBase64(byte[] base64Data)
+ public static byte[] decodeBase64( byte[] base64Data )
{
return org.apache.commons.codec.binary.Base64.decodeBase64( base64Data );
}
- public byte[] encode(byte[] pArray)
+ public byte[] encode( byte[] pArray )
{
return org.apache.commons.codec.binary.Base64.encodeBase64( pArray );
}
- public byte[] decode(byte[] pArray)
+ public byte[] decode( byte[] pArray )
{
return org.apache.commons.codec.binary.Base64.decodeBase64( pArray );
}
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java?rev=1134993&r1=1134992&r2=1134993&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java Sun Jun 12 21:56:15 2011
@@ -184,7 +184,7 @@ public class CollectionUtils
/**
* Returns a {@link Map} mapping each unique element in
* the given {@link Collection} to an {@link Integer}
- * representing the number of occurances of that element
+ * representing the number of occurrences of that element
* in the {@link Collection}.
* An entry that maps to <tt>null</tt> indicates that the
* element does not appear in the given {@link Collection}.
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/IOUtil.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/IOUtil.java?rev=1134993&r1=1134992&r2=1134993&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/IOUtil.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/IOUtil.java Sun Jun 12 21:56:15 2011
@@ -22,7 +22,6 @@ package org.codehaus.plexus.util;
import org.apache.commons.io.IOUtils;
import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -250,7 +249,10 @@ public final class IOUtil
public static void bufferedCopy( java.io.InputStream input, java.io.OutputStream output )
throws java.io.IOException
{
- if (input == null) throw new IOException( "stream closed" );
+ if ( input == null )
+ {
+ throw new IOException( "stream closed" );
+ }
output.getClass();
IOUtils.copy( new BufferedInputStream( input ), output );
}
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/apache/maven/tck/TckMatchers.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/apache/maven/tck/TckMatchers.java?rev=1134993&r1=1134992&r2=1134993&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/apache/maven/tck/TckMatchers.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/apache/maven/tck/TckMatchers.java Sun Jun 12 21:56:15 2011
@@ -115,7 +115,7 @@ public class TckMatchers
public boolean matches( Object item )
{
Class<?> clazz = (Class<?>) item;
- for ( Constructor c : clazz.getConstructors() )
+ for ( Constructor<?> c : clazz.getConstructors() )
{
if ( !Modifier.isPrivate( c.getModifiers() ) )
{
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java?rev=1134993&r1=1134992&r2=1134993&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java Sun Jun 12 21:56:15 2011
@@ -195,7 +195,8 @@ public class CollectionUtilsTest
}
@Test
- public void testIteratorToList() throws Exception
+ public void testIteratorToList()
+ throws Exception
{
Collection<String> c1 = new ArrayList<String>();
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PropertyUtilsTest.java?rev=1134993&r1=1134992&r2=1134993&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PropertyUtilsTest.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PropertyUtilsTest.java Sun Jun 12 21:56:15 2011
@@ -56,7 +56,10 @@ public class PropertyUtilsTest
// keep the tests fast and only interface with the filesystem if needed
public Statement apply( Statement base, FrameworkMethod method, Object target )
{
- if (method.getAnnotation( NeedsTemporaryFolder.class ) == null) return base;
+ if ( method.getAnnotation( NeedsTemporaryFolder.class ) == null )
+ {
+ return base;
+ }
folder = new TemporaryFolder();
return folder.apply( base, method, target );
}
@@ -96,7 +99,7 @@ public class PropertyUtilsTest
public void loadEmptyInputStream()
throws Exception
{
- assertThat( PropertyUtils.loadProperties( new ByteArrayInputStream( new byte[0] )), is( new Properties() ) );
+ assertThat( PropertyUtils.loadProperties( new ByteArrayInputStream( new byte[0] ) ), is( new Properties() ) );
}
@Test
@@ -104,7 +107,7 @@ public class PropertyUtilsTest
public void loadEmptyFile()
throws Exception
{
- assertThat( PropertyUtils.loadProperties( folder.newFile( "empty" )), is( new Properties() ) );
+ assertThat( PropertyUtils.loadProperties( folder.newFile( "empty" ) ), is( new Properties() ) );
}
@Test