diff options
author | Tom Tromey <tromey@redhat.com> | 2006-01-16 00:54:40 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2006-01-16 00:54:40 +0000 |
commit | e72a7ea9772b07a0302c742e3e7bc7eed810a3be (patch) | |
tree | f0127e97d6266dc9093ea1d0a0ee2364d2699508 /javax | |
parent | 31cfa5ca927b53343288878588008f75fcbefd28 (diff) | |
download | classpath-e72a7ea9772b07a0302c742e3e7bc7eed810a3be.tar.gz |
* javax/swing/text/html/HTMLDocument.java (parseBuffer): Genericized.
* javax/swing/text/StyleContext.java (removeAttributes): Genericized.
* java/beans/PersistenceDelegate.java (initialize): Genericized.
* java/beans/Encoder.java (getPersistenceDelegate): Genericized.
(setPersistenceDelegate): Likewise.
Diffstat (limited to 'javax')
-rw-r--r-- | javax/swing/text/StyleContext.java | 2 | ||||
-rw-r--r-- | javax/swing/text/html/HTMLDocument.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/javax/swing/text/StyleContext.java b/javax/swing/text/StyleContext.java index c93adf895..3735870dc 100644 --- a/javax/swing/text/StyleContext.java +++ b/javax/swing/text/StyleContext.java @@ -673,7 +673,7 @@ public class StyleContext return removeAttributes(old, attributes.getAttributeNames()); } - public AttributeSet removeAttributes(AttributeSet old, Enumeration names) + public AttributeSet removeAttributes(AttributeSet old, Enumeration<?> names) { if (old instanceof MutableAttributeSet) { diff --git a/javax/swing/text/html/HTMLDocument.java b/javax/swing/text/html/HTMLDocument.java index 5b2452b32..6e5ab548f 100644 --- a/javax/swing/text/html/HTMLDocument.java +++ b/javax/swing/text/html/HTMLDocument.java @@ -527,7 +527,7 @@ public class HTMLDocument extends DefaultStyledDocument /** Holds the current character attribute set **/ protected MutableAttributeSet charAttr = new SimpleAttributeSet(); - protected Vector parseBuffer = new Vector(); + protected Vector<ElementSpec> parseBuffer = new Vector<ElementSpec>(); /** A stack for character attribute sets **/ Stack charAttrStack = new Stack(); |