Author: mgrigorov
Date: Sun Apr 3 17:06:28 2011
New Revision: 1088337
URL: http://svn.apache.org/viewvc?rev=1088337&view=rev
Log:
WICKET-3588 AppendingStringBuffer.append(StringBuilder, int, int) interprets
length as stopIndex
Don't handle StringBuilder any special then String when appending it to
AppendingStringBuffer.
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/string/StringsTest.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/string/StringsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/string/StringsTest.java?rev=1088337&r1=1088336&r2=1088337&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/string/StringsTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/string/StringsTest.java
Sun Apr 3 17:06:28 2011
@@ -51,8 +51,8 @@ public final class StringsTest extends T
Assert.assertEquals("foo", Strings.afterLast("bar.baz.foo",
'.'));
Assert.assertEquals("", Strings.afterLast("bar", '.'));
Assert.assertEquals("foo", Strings.replaceAll("afaooaaa", "a",
"").toString());
- Assert.assertEquals("fuzzyffuzzyoofuzzyfuzzyfuzzy",
Strings.replaceAll("afaooaaa", "a",
- "fuzzy").toString());
+ Assert.assertEquals("fuzzyffuzzyoofuzzyfuzzyfuzzy",
+ Strings.replaceAll("afaooaaa", "a",
"fuzzy").toString());
}
/**
@@ -139,10 +139,10 @@ public final class StringsTest extends T
assertEquals("&", Strings.escapeMarkup("&").toString());
assertEquals("&",
Strings.escapeMarkup("&").toString());
- assertEquals("<
>&"'?:;{}[]-_+=()*^%$#@!~`", Strings.escapeMarkup(
- "< >&\"'?:;{}[]-_+=()*^%$#@!~`").toString());
-
assertEquals("< >&"'?:;{}[]-_+=()*^%$#@!~`",
Strings.escapeMarkup(
- "< >&\"'?:;{}[]-_+=()*^%$#@!~`", true).toString());
+ assertEquals("< >&"'?:;{}[]-_+=()*^%$#@!~`",
+ Strings.escapeMarkup("<
>&\"'?:;{}[]-_+=()*^%$#@!~`").toString());
+
assertEquals("< >&"'?:;{}[]-_+=()*^%$#@!~`",
+ Strings.escapeMarkup("< >&\"'?:;{}[]-_+=()*^%$#@!~`",
true).toString());
}
/**
@@ -171,7 +171,8 @@ public final class StringsTest extends T
assertEquals("", Strings.escapeMarkup("", true,
true).toString());
// The escaped unicode is ����������"
-
assertEquals("Çüéâäàåçêë",
+ assertEquals(
+
"Çüéâäàåçêë",
Strings.escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
false, true).toString());
@@ -291,6 +292,12 @@ public final class StringsTest extends T
assertEquals("bc", Strings.replaceAll("abc", "a",
null).toString());
assertEquals("aaaa", Strings.replaceAll("aa", "a",
"aa").toString());
+
+ StringBuilder stringBuilder = new StringBuilder("aa");
+ assertEquals("aaaa", Strings.replaceAll(stringBuilder, "a",
"aa").toString());
+
+ AppendingStringBuffer asb = new AppendingStringBuffer("aa");
+ assertEquals("aaaa", Strings.replaceAll(asb, "a",
"aa").toString());
}
/**
@@ -405,12 +412,12 @@ public final class StringsTest extends T
assertEquals("<p>abc<br/>def<br/>ghi</p>",
Strings.toMultilineMarkup("abc\ndef\nghi")
.toString());
- assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
Strings.toMultilineMarkup(
- "abc\n\ndef\n\nghi").toString());
- assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
Strings.toMultilineMarkup(
- "abc\r\n\r\ndef\r\n\r\nghi").toString());
- assertEquals("<p>abc</p><p>def</p><p>ghi</p><p></p>",
Strings.toMultilineMarkup(
- "abc\r\n\r\ndef\r\n\r\nghi\n\n").toString());
+ assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
+
Strings.toMultilineMarkup("abc\n\ndef\n\nghi").toString());
+ assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
+
Strings.toMultilineMarkup("abc\r\n\r\ndef\r\n\r\nghi").toString());
+ assertEquals("<p>abc</p><p>def</p><p>ghi</p><p></p>",
+
Strings.toMultilineMarkup("abc\r\n\r\ndef\r\n\r\nghi\n\n").toString());
assertEquals("<p>\\n</p>",
Strings.toMultilineMarkup("\\n").toString());
assertEquals("<p>a\\nbc</p>",
Strings.toMultilineMarkup("a\\nbc").toString());
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java?rev=1088337&r1=1088336&r2=1088337&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/AppendingStringBuffer.java
Sun Apr 3 17:06:28 2011
@@ -464,52 +464,6 @@ public final class AppendingStringBuffer
return this;
}
-
- /**
- * Appends the specified <tt>AppendingStringBuffer</tt> to this
<tt>AppendingStringBuffer</tt>.
- * <p>
- * The characters of the <tt>AppendingStringBuffer</tt> argument are
appended, in order, to the
- * contents of this <tt>AppendingStringBuffer</tt>, increasing the
length of this
- * <tt>AppendingStringBuffer</tt> by the length of the argument. If
<tt>sb</tt> is <tt>null</tt>
- * , then the four characters <tt>"null"</tt> are appended to this
- * <tt>AppendingStringBuffer</tt>.
- * <p>
- * Let <i>n</i> be the length of the old character sequence, the one
contained in the
- * <tt>AppendingStringBuffer</tt> just prior to execution of the
<tt>append</tt> method. Then
- * the character at index <i>k</i> in the new character sequence is
equal to the character at
- * index <i>k</i> in the old character sequence, if <i>k</i> is less
than <i>n</i>; otherwise,
- * it is equal to the character at index <i>k-n</i> in the argument
<code>sb</code>.
- * <p>
- * The method <tt>ensureCapacity</tt> is first called on this
<tt>AppendingStringBuffer</tt>
- * with the new buffer length as its argument. (This ensures that the
storage of this
- * <tt>AppendingStringBuffer</tt> is adequate to contain the additional
characters being
- * appended.)
- *
- * @param sb
- * the <tt>AppendingStringBuffer</tt> to append.
- * @param from
- * The index where it must start from
- * @param length
- * The length that must be copied
- * @return a reference to this <tt>AppendingStringBuffer</tt>.
- */
- public AppendingStringBuffer append(StringBuilder sb, final int from,
final int length)
- {
- if (sb == null)
- {
- sb = SB_NULL;
- }
-
- int newcount = count + length;
- if (newcount > value.length)
- {
- expandCapacity(newcount);
- }
- sb.getChars(from, length, value, count);
- count = newcount;
- return this;
- }
-
/**
* Appends the string representation of the <code>char</code> array
argument to this string
* buffer.
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java?rev=1088337&r1=1088336&r2=1088337&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
Sun Apr 3 17:06:28 2011
@@ -755,7 +755,7 @@ public final class Strings
int pos = 0;
do
{
- // Append text up to the match`
+ // Append text up to the match
append(buffer, s, pos, matchIndex);
// Add replaceWith text
@@ -1196,10 +1196,6 @@ public final class Strings
AppendingStringBuffer asb = (AppendingStringBuffer)s;
buffer.append(asb.getValue(), from, to - from);
}
- else if (s instanceof StringBuilder)
- {
- buffer.append((StringBuilder)s, from, to - from);
- }
else
{
buffer.append(s.subSequence(from, to));
