summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--javax/imageio/metadata/IIOMetadataFormatImpl.java13
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d7b7d25e9..d59de702e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-10 Tom Tromey <tromey@redhat.com>
+
+ * javax/imageio/metadata/IIOMetadataFormatImpl.java (addObjectValue):
+ Fixed parameter bounds.
+
2006-04-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/Collections.java:
diff --git a/javax/imageio/metadata/IIOMetadataFormatImpl.java b/javax/imageio/metadata/IIOMetadataFormatImpl.java
index 8835ab869..78fad1a15 100644
--- a/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -590,12 +590,13 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
enumeratedValues));
}
- protected <T> void addObjectValue (String elementName, Class<T> classType,
- T defaultValue,
- Comparable<? super T> minValue,
- Comparable<? super T> maxValue,
- boolean minInclusive,
- boolean maxInclusive)
+ protected <T extends Object & Comparable<? super T>>
+ void addObjectValue (String elementName, Class<T> classType,
+ T defaultValue,
+ Comparable<? super T> minValue,
+ Comparable<? super T> maxValue,
+ boolean minInclusive,
+ boolean maxInclusive)
{
IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
addNodeObject (node, new NodeObjectBounded (node,