2006-07-02 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics-branch for
	2006/06/27 to 2006/07/02.

1 files changed, 4 insertions, 6 deletions

diff --git a/java/awt/Component.java b/java/awt/Component.java
index 0a987ee3b..d251b2d15 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -4698,7 +4698,7 @@ p   * <li>the set of backward traversal keys
                                     Object newValue)
   {
     if (changeSupport != null)
-      changeSupport.firePropertyChange(propertyName, oldValue, newValue);
+      changeSupport.firePropertyChange(propertyName, oldValue, newValue);  
   }
 
   /**
@@ -4839,14 +4839,12 @@ p   * <li>the set of backward traversal keys
    * {@link #applyComponentOrientation(ComponentOrientation)} affects the
    * entire hierarchy.
    *
-   * @param o the new orientation
-   * @throws NullPointerException if o is null
+   * @param o the new orientation (<code>null</code> is accepted)
    * @see #getComponentOrientation()
    */
   public void setComponentOrientation(ComponentOrientation o)
   {
-    if (o == null)
-      throw new NullPointerException();
+ 
     ComponentOrientation oldOrientation = orientation;
     orientation = o;
     firePropertyChange("componentOrientation", oldOrientation, o);
@@ -4855,7 +4853,7 @@ p   * <li>the set of backward traversal keys
   /**
    * Determines the text layout orientation used by this component.
    *
-   * @return the component orientation
+   * @return the component orientation (this can be <code>null</code>)
    * @see #setComponentOrientation(ComponentOrientation)
    */
   public ComponentOrientation getComponentOrientation()