I'm committing the attached patch (in 2 days time) to fix the use of the enum keyword in the gnu.html classes.
Changelog:
2005-03-16 Andrew John Hughes <[EMAIL PROTECTED]>
* 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.
--
Andrew :-)
Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
No software patents in Europe -- http://nosoftwarepatents.com
"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman
"We've all been part of the biggest beta test the world has ever known --
Windows"
-- Victor Wheatman, Gartner
Index: gnu/javax/swing/text/html/parser/htmlAttributeSet.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 htmlAttributeSet.java
--- gnu/javax/swing/text/html/parser/htmlAttributeSet.java 10 Mar 2005
12:10:38 -0000 1.1
+++ gnu/javax/swing/text/html/parser/htmlAttributeSet.java 16 Mar 2005
21:56:26 -0000
@@ -82,18 +82,18 @@ public class htmlAttributeSet
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: gnu/javax/swing/text/html/parser/htmlValidator.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 htmlValidator.java
--- gnu/javax/swing/text/html/parser/htmlValidator.java 10 Mar 2005 12:10:38
-0000 1.1
+++ gnu/javax/swing/text/html/parser/htmlValidator.java 16 Mar 2005 21:56:26
-0000
@@ -431,11 +431,11 @@ public abstract class htmlValidator
)
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 @@ public abstract class htmlValidator
}
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)
{
signature.asc
Description: Digital signature
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
