2006-11-29 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics for 2006/11/12-2006/11/29.

1 files changed, 7 insertions, 4 deletions

diff --git a/java/awt/Component.java b/java/awt/Component.java
index 82c81c7a0..4b2c4496a 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -823,10 +823,7 @@ public abstract class Component
    */
   public boolean isShowing()
   {
-    if (! visible || peer == null)
-      return false;
-
-    return parent == null ? false : parent.isShowing();
+    return visible && peer != null && (parent == null || parent.isShowing());
   }
 
   /**
@@ -3627,6 +3624,12 @@ public abstract class Component
             else if (r2.contains(r1))
               coalesced = newEvent;
           }
+        else
+          {
+            // Replace the event and let the heavyweight figure out the expanding
+            // of the repaint area.
+            coalesced = newEvent;
+          }
         break;
       default:
         coalesced = null;