ChangeLog:
2008-05-06 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* gnu/javax/swing/text/html/parser/htmlValidator.java,
* gnu/javax/swing/text/html/parser/models/list.java,
* gnu/javax/swing/text/html/parser/models/node.java,
* gnu/javax/swing/text/html/parser/support/Parser.java:
Swap use of StringBuffer for CPStringBuilder,
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/javax/swing/text/html/parser/htmlValidator.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java,v
retrieving revision 1.6
diff -u -r1.6 htmlValidator.java
--- gnu/javax/swing/text/html/parser/htmlValidator.java 15 Nov 2006 13:35:08
-0000 1.6
+++ gnu/javax/swing/text/html/parser/htmlValidator.java 5 May 2008 23:20:04
-0000
@@ -38,6 +38,8 @@
package gnu.javax.swing.text.html.parser;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.javax.swing.text.html.parser.models.node;
import gnu.javax.swing.text.html.parser.models.transformer;
@@ -499,11 +501,11 @@
dtdAttribute = tag.getElement().getAttribute(foundAttribute.toString());
if (dtdAttribute == null)
{
- StringBuffer valid =
- new StringBuffer("The tag <" + tag.getHTMLTag() +
- "> cannot contain the attribute '" + foundAttribute
+
- "'. The valid attributes for this tag are: "
- );
+ CPStringBuilder valid =
+ new CPStringBuilder("The tag <" + tag.getHTMLTag() +
+ "> cannot contain the attribute '" +
foundAttribute +
+ "'. The valid attributes for this tag are: "
+ );
AttributeList a = tag.getElement().getAttributes();
@@ -545,22 +547,22 @@
!dtdAttribute.values.contains(value.toUpperCase())
)
{
- StringBuffer valid;
+ CPStringBuilder valid;
if (dtdAttribute.values.size() == 1)
valid =
- new StringBuffer("The attribute '" + foundAttribute +
- "' of the tag <" + tag.getHTMLTag() +
- "> cannot have the value '" + value +
- "'. The only valid value is "
- );
+ new CPStringBuilder("The attribute '" + foundAttribute +
+ "' of the tag <" + tag.getHTMLTag() +
+ "> cannot have the value '" + value +
+ "'. The only valid value is "
+ );
else
valid =
- new StringBuffer("The attribute '" + foundAttribute +
- "' of the tag <" + tag.getHTMLTag() +
- "> cannot have the value '" + value + "'. The " +
- dtdAttribute.values.size() +
- " valid values are: "
- );
+ new CPStringBuilder("The attribute '" + foundAttribute +
+ "' of the tag <" + tag.getHTMLTag() +
+ "> cannot have the value '" + value + "'. The "
+
+ dtdAttribute.values.size() +
+ " valid values are: "
+ );
Enumeration vv = dtdAttribute.values.elements();
while (vv.hasMoreElements())
Index: gnu/javax/swing/text/html/parser/models/list.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/swing/text/html/parser/models/list.java,v
retrieving revision 1.2
diff -u -r1.2 list.java
--- gnu/javax/swing/text/html/parser/models/list.java 2 Jul 2005 20:32:15
-0000 1.2
+++ gnu/javax/swing/text/html/parser/models/list.java 5 May 2008 23:20:04
-0000
@@ -38,6 +38,8 @@
package gnu.javax.swing.text.html.parser.models;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
/**
@@ -296,7 +298,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append(" ( ");
for (int i = 0; i < nodes.length; i++)
{
Index: gnu/javax/swing/text/html/parser/models/node.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/swing/text/html/parser/models/node.java,v
retrieving revision 1.4
diff -u -r1.4 node.java
--- gnu/javax/swing/text/html/parser/models/node.java 7 Jan 2008 21:11:22
-0000 1.4
+++ gnu/javax/swing/text/html/parser/models/node.java 5 May 2008 23:20:05
-0000
@@ -38,6 +38,8 @@
package gnu.javax.swing.text.html.parser.models;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
/**
@@ -239,7 +241,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append(token);
if (unary != 0)
Index: gnu/javax/swing/text/html/parser/support/Parser.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/swing/text/html/parser/support/Parser.java,v
retrieving revision 1.20
diff -u -r1.20 Parser.java
--- gnu/javax/swing/text/html/parser/support/Parser.java 9 Jan 2008
20:42:38 -0000 1.20
+++ gnu/javax/swing/text/html/parser/support/Parser.java 5 May 2008
23:20:07 -0000
@@ -38,6 +38,8 @@
package gnu.javax.swing.text.html.parser.support;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.javax.swing.text.html.parser.htmlAttributeSet;
import gnu.javax.swing.text.html.parser.htmlValidator;
import gnu.javax.swing.text.html.parser.support.low.Constants;
@@ -132,12 +134,12 @@
/**
* The buffer to collect the incremental output like text or coment.
*/
- private StringBuffer buffer = new StringBuffer();
+ private final StringBuffer buffer = new StringBuffer();
/**
* The buffer to store the document title.
*/
- private StringBuffer title = new StringBuffer();
+ private final StringBuffer title = new StringBuffer();
/**
* The current token.
@@ -994,7 +996,7 @@
// character, not as a token. The character may be part of
// the unquoted URL.
{
- StringBuffer image = new StringBuffer(value.getImage());
+ CPStringBuilder image = new
CPStringBuilder(value.getImage());
while (next.kind == NUMTOKEN || next.kind == SLASH
|| next.kind == OTHER)
{
@@ -1025,7 +1027,7 @@
// character, not as a token. The slash may be part of
// the unquoted URL.
{
- StringBuffer image = new StringBuffer(value.getImage());
+ CPStringBuilder image = new
CPStringBuilder(value.getImage());
while (next.kind == NUMTOKEN || next.kind == SLASH)
{
image.append(getNextToken().getImage());
