Author: jdcasey
Date: Thu Jun 8 17:05:04 2006
New Revision: 412887
URL: http://svn.apache.org/viewvc?rev=412887&view=rev
Log:
Fixing some buffer problems in the default message holder.
Modified:
maven/shared/trunk/maven-shared-io/pom.xml
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/logging/DefaultMessageHolderTest.java
Modified: maven/shared/trunk/maven-shared-io/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=412887&r1=412886&r2=412887&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/pom.xml (original)
+++ maven/shared/trunk/maven-shared-io/pom.xml Thu Jun 8 17:05:04 2006
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>[1.0-alpha-6,1.0]</version>
+ <version>1.0-alpha-6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java?rev=412887&r1=412886&r2=412887&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
(original)
+++
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
Thu Jun 8 17:05:04 2006
@@ -17,7 +17,7 @@
public MessageHolder addMessage( CharSequence messagePart, Throwable error
)
{
newMessage();
- append( messagePart );
+ append( messagePart.toString() );
append( error );
return this;
@@ -26,7 +26,7 @@
public MessageHolder addMessage( CharSequence messagePart )
{
newMessage();
- append( messagePart );
+ append( messagePart.toString() );
return this;
}
@@ -46,7 +46,7 @@
newMessage();
}
- currentMessage.append( messagePart );
+ currentMessage.append( messagePart.toString() );
return this;
}
@@ -90,7 +90,7 @@
if ( content.length() > 0 )
{
buffer.append( '[' ).append( counter++ ).append( "] " );
- buffer.append( content );
+ buffer.append( content.toString() );
if ( it.hasNext() )
{
@@ -120,7 +120,7 @@
public Message append( CharSequence message )
{
- this.message.append( message );
+ this.message.append( message.toString() );
return this;
}
Modified:
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/logging/DefaultMessageHolderTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/logging/DefaultMessageHolderTest.java?rev=412887&r1=412886&r2=412887&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/logging/DefaultMessageHolderTest.java
(original)
+++
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/logging/DefaultMessageHolderTest.java
Thu Jun 8 17:05:04 2006
@@ -274,4 +274,12 @@
assertFalse( new DefaultMessageHolder().newMessage().isEmpty() );
}
+ public void testAppendCharSequence()
+ {
+ MessageHolder mh = new DefaultMessageHolder();
+ mh.newMessage().append( new StringBuffer( "This is a test" ) );
+
+ assertTrue( mh.render().indexOf( "This is a test" ) > -1 );
+ }
+
}