[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: HTML parser fixes

[Kaffe CVS]

PatchSet 5583 
Date: 2005/03/21 17:25:27
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with GNU Classpath: HTML parser fixes

2005-03-21  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-03-18  Andrew John Hughes  <gnu_andrew at member.fsf.org>

        * gnu/javax/swing/text/html/parser/htmlAttributeSet.java:
        (getAttributeNames()): Replaced 'enum' with 'enumeration'.
        * gnu/javax/swing/text/html/parser/htmlValidator.java:
        (validateParameters(TagElement,htmlAttributeSet)):
        Replaced 'enum' with 'enumeration'.
        (validateAttribute(TagElement,htmlAttributeSet,
                           Enumeration,Enumeration)):
        Likewise.

Members: 
	ChangeLog:1.3757->1.3758 
	libraries/javalib/gnu/javax/swing/text/html/parser/htmlAttributeSet.java:1.1->1.2 
	libraries/javalib/gnu/javax/swing/text/html/parser/htmlValidator.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3757 kaffe/ChangeLog:1.3758
--- kaffe/ChangeLog:1.3757	Mon Mar 21 17:23:28 2005
+++ kaffe/ChangeLog	Mon Mar 21 17:25:27 2005
@@ -2,6 +2,21 @@
 
 	Resynced with GNU Classpath.
 
+	2005-03-18  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+        * gnu/javax/swing/text/html/parser/htmlAttributeSet.java:
+        (getAttributeNames()): Replaced 'enum' with 'enumeration'.
+        * gnu/javax/swing/text/html/parser/htmlValidator.java:
+        (validateParameters(TagElement,htmlAttributeSet)):
+        Replaced 'enum' with 'enumeration'.
+        (validateAttribute(TagElement,htmlAttributeSet,
+                           Enumeration,Enumeration)):
+        Likewise.
+
+2005-03-21  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-03-18  Audrius Meskauskas  <audriusa at bluewin.ch>
 
         * javax/swing/text/html/parser/Entity.java (getType): New method.
Index: kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlAttributeSet.java
diff -u kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlAttributeSet.java:1.1 kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlAttributeSet.java:1.2
--- kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlAttributeSet.java:1.1	Fri Mar 11 20:04:51 2005
+++ kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlAttributeSet.java	Mon Mar 21 17:25:33 2005
@@ -82,18 +82,18 @@
   public Enumeration getAttributeNames()
   {
     // Replace the string keys by HTML.attribute, where applicable
-    final Enumeration enum = super.getAttributeNames();
+    final Enumeration enumeration = super.getAttributeNames();
 
     return new Enumeration()
       {
         public boolean hasMoreElements()
         {
-          return enum.hasMoreElements();
+          return enumeration.hasMoreElements();
         }
 
         public Object nextElement()
         {
-          Object key = enum.nextElement();
+          Object key = enumeration.nextElement();
           HTML.Attribute hKey = HTML.getAttributeKey((String) key);
           if (hKey != null)
             return hKey;
Index: kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlValidator.java
diff -u kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlValidator.java:1.1 kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlValidator.java:1.2
--- kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlValidator.java:1.1	Fri Mar 11 20:04:51 2005
+++ kaffe/libraries/javalib/gnu/javax/swing/text/html/parser/htmlValidator.java	Mon Mar 21 17:25:33 2005
@@ -431,11 +431,11 @@
        )
       return;
 
-    Enumeration enum = parameters.getAttributeNames();
+    Enumeration enumeration = parameters.getAttributeNames();
 
-    while (enum.hasMoreElements())
+    while (enumeration.hasMoreElements())
       {
-        validateAttribute(tag, parameters, enum);
+        validateAttribute(tag, parameters, enumeration);
       }
 
     // Check for missing required values.
@@ -480,12 +480,12 @@
   }
 
   private void validateAttribute(TagElement tag, htmlAttributeSet parameters,
-                                 Enumeration enum
+                                 Enumeration enumeration
                                 )
   {
     Object foundAttribute;
     AttributeList dtdAttribute;
-    foundAttribute = enum.nextElement();
+    foundAttribute = enumeration.nextElement();
     dtdAttribute = tag.getElement().getAttribute(foundAttribute.toString());
     if (dtdAttribute == null)
       {