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 | |
| 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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | java/beans/Encoder.java | 5 | ||||
| -rw-r--r-- | java/beans/PersistenceDelegate.java | 4 | ||||
| -rw-r--r-- | javax/swing/text/StyleContext.java | 2 | ||||
| -rw-r--r-- | javax/swing/text/html/HTMLDocument.java | 2 |
5 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2006-01-15 Tom Tromey <tromey@redhat.com> + + * 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. + 2006-01-15 Wolfgang Baer <WBaer@gmx.de> * javax/print/attribute/standard/PrinterStateReasons.java: diff --git a/java/beans/Encoder.java b/java/beans/Encoder.java index 9b96aaa8e..e7b53d786 100644 --- a/java/beans/Encoder.java +++ b/java/beans/Encoder.java @@ -212,7 +212,7 @@ public class Encoder return exceptionListener; } - public PersistenceDelegate getPersistenceDelegate(Class type) + public PersistenceDelegate getPersistenceDelegate(Class<?> type) { // This is not specified but the JDK behaves like this. if (type == null) @@ -246,7 +246,8 @@ public class Encoder * access is thread safe. * </p> */ - public void setPersistenceDelegate(Class type, PersistenceDelegate delegate) + public void setPersistenceDelegate(Class<?> type, + PersistenceDelegate delegate) { // If the argument is null this will cause a NullPointerException // which is expected behavior. diff --git a/java/beans/PersistenceDelegate.java b/java/beans/PersistenceDelegate.java index b33cbcbed..91c02d2b8 100644 --- a/java/beans/PersistenceDelegate.java +++ b/java/beans/PersistenceDelegate.java @@ -52,8 +52,8 @@ package java.beans; public abstract class PersistenceDelegate { - protected void initialize(Class type, Object oldInstance, Object newInstance, - Encoder out) + protected void initialize(Class<?> type, Object oldInstance, + Object newInstance, Encoder out) { if (type != Object.class) { 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(); |