2006-06-06  Audrius Meskauskas  <[EMAIL PROTECTED]>

   * gnu/javax/swing/text/html/htmlAttributeSet.java
   (getAttributeNames): Rewritten.

Index: htmlAttributeSet.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java,v
retrieving revision 1.4
diff -u -r1.4 htmlAttributeSet.java
--- htmlAttributeSet.java	6 Jun 2006 12:57:27 -0000	1.4
+++ htmlAttributeSet.java	6 Jun 2006 13:46:43 -0000
@@ -97,26 +97,29 @@
     final Enumeration enumeration = super.getAttributeNames();
 
     return new Enumeration()
+    {
+      public boolean hasMoreElements()
       {
-        public boolean hasMoreElements()
-        {
-          return enumeration.hasMoreElements();
-        }
+        return enumeration.hasMoreElements();
+      }
 
-        public Object nextElement()
-        {
-          Object key = enumeration.nextElement();
-          HTML.Attribute hKey = HTML.getAttributeKey((String) key);
-          if (hKey != null)
-            return hKey;
-          else
-            return key;
-        }
-      };
+      public Object nextElement()
+      {
+        Object key = enumeration.nextElement();
+        if (key instanceof String)
+          {
+            HTML.Attribute hKey = HTML.getAttributeKey((String) key);
+            if (hKey != null)
+              return hKey;
+          }
+        return key;
+      }
+    };
   }
 
   /**
    * Set the parent set, containing the default values.
+   * 
    * @param a_parent
    */
   public void setResolveParent(AttributeSet a_parent)

Reply via email to