3 files changed, 3 insertions, 3 deletions
diff --git a/libjava/javax/swing/text/html/HTMLWriter.h b/libjava/javax/swing/text/html/HTMLWriter.h
index 321b58d1020..63684b7933b 100644
--- a/libjava/javax/swing/text/html/HTMLWriter.h
+++ b/libjava/javax/swing/text/html/HTMLWriter.h
@@ -66,7 +66,7 @@ private:
   ::java::lang::String * escapeCharHtmlEntity(jchar);
   ::java::io::Writer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) outWriter;
   ::javax::swing::text::html::HTMLDocument * htmlDoc;
-  ::java::util::HashSet * openEmbededTagHashSet;
+  ::java::util::HashSet * openEmbeddedTagHashSet;
   ::java::lang::String * new_line_str;
   JArray< jchar > * html_entity_char_arr;
   JArray< ::java::lang::String * > * html_entity_escape_str_arr;
diff --git a/libjava/javax/swing/text/html/MinimalHTMLWriter.h b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
index c46afec29b5..a44b170055d 100644
--- a/libjava/javax/swing/text/html/MinimalHTMLWriter.h
+++ b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
@@ -71,7 +71,7 @@ private:
   void writeStyle(::javax::swing::text::Style *);
   jboolean hasText(::javax::swing::text::Element *);
   ::javax::swing::text::StyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) doc;
-  ::java::util::Stack * tagStack;
+  ::java::util::Deque * tagStack;
   jboolean inFontTag__;
 public:
   static ::java::lang::Class class$;
diff --git a/libjava/javax/swing/text/html/StyleSheet.h b/libjava/javax/swing/text/html/StyleSheet.h
index 3c9bbffdb19..57ebf9e3bf9 100644
--- a/libjava/javax/swing/text/html/StyleSheet.h
+++ b/libjava/javax/swing/text/html/StyleSheet.h
@@ -57,7 +57,7 @@ public:
 private:
   ::javax::swing::text::Style * getResolvedStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
   ::javax::swing::text::Style * resolveStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
-  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::util::Map * > *);
+  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::util::List *);
 public:
   virtual ::javax::swing::text::Style * getRule(::java::lang::String *);
   virtual void addRule(::java::lang::String *);