2003-12-23 Michael Koch <konqueror@gmx.de>

	* javax/print/attribute/AttributeSetUtilities.java
	(verifyCategoryForValue): Renamed from verifyCategoryForAttribute.
	* javax/print/attribute/HashAttributeSet.java
	(HashAttributeSet): Call internal add methods, added missing
	exceptions.
	(add): Call addInternal, added exceptions to documentation.
	(addInternal): New method.
	(addAll): Call addAllInternal, added exception to documentation.
	(addAllInternal): New method.
	(clear): Added exception to documentation.
	(remove): Likewise.
	* javax/print/attribute/URISyntax.java
	(serialVersionUID): Fixed value.

From-SVN: r74969

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a11ad98f40c34f0270605246c6ee57294f4bfe09..9ca19caa69d435f4d736b19659986a3aa443e894 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,19 @@
+2003-12-23  Michael Koch  <konqueror@gmx.de>
+
+       * javax/print/attribute/AttributeSetUtilities.java
+       (verifyCategoryForValue): Renamed from verifyCategoryForAttribute.
+       * javax/print/attribute/HashAttributeSet.java
+       (HashAttributeSet): Call internal add methods, added missing
+       exceptions.
+       (add): Call addInternal, added exceptions to documentation.
+       (addInternal): New method.
+       (addAll): Call addAllInternal, added exception to documentation.
+       (addAllInternal): New method.
+       (clear): Added exception to documentation.
+       (remove): Likewise.
+       * javax/print/attribute/URISyntax.java
+       (serialVersionUID): Fixed value.
+
 2003-12-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c

diff --git a/libjava/javax/print/attribute/AttributeSetUtilities.java b/libjava/javax/print/attribute/AttributeSetUtilities.java
index 444b09746257b14ca98e28a5e7c24fb32f5a7ab7..65cf3782687a7ccbbb46a1053a9d714326dd71a6 100644 (file)
--- a/libjava/javax/print/attribute/AttributeSetUtilities.java
+++ b/libjava/javax/print/attribute/AttributeSetUtilities.java
@@ -432,8 +432,8 @@ public final class AttributeSetUtilities
    * @exception IllegalArgumentException if the categories are not equal
    * @exception NullPointerException if category is null
    */
-  public static void verifyCategoryForAttribute(Class category,
-                                                Attribute attribute)
+  public static void verifyCategoryForValue(Class category,
+                                            Attribute attribute)
   {
     if (category == null)
       throw new NullPointerException("object may not be null");

diff --git a/libjava/javax/print/attribute/HashAttributeSet.java b/libjava/javax/print/attribute/HashAttributeSet.java
index 6adf37c617f69239fcf0cb8d849029f8deae8807..63b4105cb42cf43619ca23839763d7458423ca20 100644 (file)
--- a/libjava/javax/print/attribute/HashAttributeSet.java
+++ b/libjava/javax/print/attribute/HashAttributeSet.java
@@ -124,7 +124,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
     if (attribute == null)
       throw new NullPointerException();
     
-    add(attribute);
+    addInternal(attribute, interfaceName);
   }
 
   /**
@@ -142,7 +142,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
       throw new NullPointerException();
     
     for (int index = 0; index < attributes.length; index++)
-      add(attributes[index]);
+      addInternal(attributes[index], interfaceName);
   }
 
   /**
@@ -150,14 +150,13 @@ public class HashAttributeSet implements AttributeSet, Serializable
    *
    * @exception ClassCastException if any element of attributes is not an
    * interface of interfaceName
-   * @exception NullPointerException if attributes or interfaceName is null
    */
   public HashAttributeSet(AttributeSet attributes, Class interfaceName)
   {
     this(interfaceName);
     
     if (attributes != null)
-      addAll(attributes);
+      addAllInternal(attributes, interfaceName);
   }
 
   /**
@@ -166,12 +165,24 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * @param attribute the attribute to add
    *
    * @return true if the attribute set has changed, false otherwise
+   *
+   * @exception NullPointerException if attribute is null
+   * @exception UnmodifiableSetException if this attribute set does not
+   * support this action.
    */
   public boolean add(Attribute attribute)
+  {
+    return addInternal(attribute, interfaceName);
+  }
+
+  private boolean addInternal(Attribute attribute, Class interfaceName)
   {
     if (attribute == null)
       throw new NullPointerException("attribute may not be null");
 
+    AttributeSetUtilities.verifyAttributeCategory(interfaceName,
+                                                 this.interfaceName);
+
     Object old = attributeMap.put
       (attribute.getCategory(), AttributeSetUtilities.verifyAttributeValue
                                   (attribute, interfaceName));
@@ -184,14 +195,22 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * @param attributes the attributes to add
    *
    * @return true if the attribute set has changed, false otherwise
+   *
+   * @exception UnmodifiableSetException if this attribute set does not
+   * support this action.
    */
   public boolean addAll(AttributeSet attributes)
+  {
+    return addAllInternal(attributes, interfaceName);
+  }
+
+  private boolean addAllInternal(AttributeSet attributes, Class interfaceName)
   {
     boolean modified = false;
     Attribute[] array = attributes.toArray();
 
     for (int index = 0; index < array.length; index++)
-      if (! add(array[index]))
+      if (addInternal(array[index], interfaceName))
         modified = true;
 
     return modified;
@@ -199,6 +218,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Removes all attributes from this attribute set.
+   *
+   * @exception UnmodifiableSetException if this attribute set does not
+   * support this action.
    */
   public void clear()
   {
@@ -285,6 +307,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * @param attribute the attribute value of the entry to be removed
    *
    * @return true if the attribute set has changed, false otherwise.
+   *
+   * @exception UnmodifiableSetException if this attribute set does not
+   * support this action.
    */
   public boolean remove(Attribute attribute)
   {

diff --git a/libjava/javax/print/attribute/URISyntax.java b/libjava/javax/print/attribute/URISyntax.java
index da2667ddc81fe9bbea3d1398cc26ba8e3ccd35dd..56a25368fd59a19620314d4d3c4a133c4711b1d3 100644 (file)
--- a/libjava/javax/print/attribute/URISyntax.java
+++ b/libjava/javax/print/attribute/URISyntax.java
@@ -46,7 +46,7 @@ import java.net.URI;
 public abstract class URISyntax
   implements Cloneable, Serializable
 {
-  private static final long serialVersionUID = 3666874174847632203L;
+  private static final long serialVersionUID = -7842661210486401678L;
 
   private URI uri;