Imported GNU Classpath gcj-import-20051117.

       * gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153

3 files changed, 18 insertions, 41 deletions

diff --git a/libjava/classpath/java/awt/Component.java b/libjava/classpath/java/awt/Component.java
index 9b389e2..ec03d63 100644
--- a/libjava/classpath/java/awt/Component.java
+++ b/libjava/classpath/java/awt/Component.java
@@ -1409,7 +1409,6 @@ public abstract class Component
       {
         if (parent != null)
           {
-            Rectangle parentBounds = parent.getBounds();
             Rectangle oldBounds = new Rectangle(oldx, oldy, oldwidth,
                                                 oldheight);
             Rectangle newBounds = new Rectangle(x, y, width, height);
@@ -1887,13 +1886,7 @@ public abstract class Component
    */
   public void repaint()
   {   
-    if(!isShowing())
-      {
-        Component p = parent;
-        if (p != null)
-          p.repaint(0, getX(), getY(), width, height);
-      }
-    else
+    if (isShowing())
       repaint(0, 0, 0, width, height);
   }
 
@@ -1908,13 +1901,7 @@ public abstract class Component
    */
   public void repaint(long tm)
   {
-    if(!isShowing())
-      {
-        Component p = parent;
-        if (p != null)
-          p.repaint(tm, getX(), getY(), width, height);
-      }
-    else
+    if (isShowing())
       repaint(tm, 0, 0, width, height);
   }
 
@@ -1932,13 +1919,7 @@ public abstract class Component
    */
   public void repaint(int x, int y, int w, int h)
   {
-    if(!isShowing())
-      {
-        Component p = parent;
-        if (p != null)
-          p.repaint(0, x + getX(), y + getY(), width, height);
-      }
-    else
+    if (isShowing())
       repaint(0, x, y, w, h);
   }
 
@@ -1957,13 +1938,7 @@ public abstract class Component
    */
   public void repaint(long tm, int x, int y, int width, int height)
   {
-    if(!isShowing())
-      {
-        Component p = parent;
-        if (p != null)
-          p.repaint(tm, x + getX(), y + getY(), width, height);
-      }
-    else
+    if (isShowing())
       {
         ComponentPeer p = peer;
         if (p != null)
diff --git a/libjava/classpath/java/awt/Container.java b/libjava/classpath/java/awt/Container.java
index 4676895..ed791dc 100644
--- a/libjava/classpath/java/awt/Container.java
+++ b/libjava/classpath/java/awt/Container.java
@@ -123,6 +123,7 @@ public class Container extends Component
    */
   public Container()
   {
+    // Nothing to do here.
   }
 
   /**
@@ -427,7 +428,8 @@ public class Container extends Component
         for (int j = 0; j < list.length; j++)
               r.removeComponentListener(list[j]);
         
-        r.removeNotify();
+        if (r.isShowing())
+          r.removeNotify();
 
         System.arraycopy(component, index + 1, component, index,
                          ncomponents - index - 1);
@@ -846,7 +848,7 @@ public class Container extends Component
    */
   public void paintComponents(Graphics g)
   {
-    super.paint(g);
+    paint(g);
     visitChildren(g, GfxPaintAllVisitor.INSTANCE, true);
   }
 
@@ -1972,6 +1974,7 @@ public class Container extends Component
        */
       protected AccessibleContainerHandler()
       {
+        // Nothing to do here.
       }
 
       /**
@@ -2039,8 +2042,7 @@ class LightweightDispatcher implements Serializable
    * location, otherwise the appropriate component from the conditions
    * above.
    */
-  Component getDeepestComponentForMouseEventAt (
-                                                              Component parent, int x, int y)
+  Component getDeepestComponentForMouseEventAt(Component parent, int x, int y)
   {
     if (parent == null || (! parent.contains(x, y)))
       return null;
@@ -2064,8 +2066,7 @@ class LightweightDispatcher implements Serializable
     Point p = me.getPoint();
     while (candidate == null && parent != null)
       {
-        candidate =
-          getDeepestComponentForMouseEventAt(parent, p.x, p.y);
+        candidate = getDeepestComponentForMouseEventAt(parent, p.x, p.y);
         if (candidate == null || (candidate.eventMask & me.getID()) == 0)
           {
             candidate = null;
@@ -2147,14 +2148,12 @@ class LightweightDispatcher implements Serializable
         break;
       }
 
-    if (me.getID() == MouseEvent.MOUSE_RELEASED
-        || me.getID() == MouseEvent.MOUSE_PRESSED && modifiers > 0
+    if (me.getID() == MouseEvent.MOUSE_PRESSED && modifiers > 0
         || me.getID() == MouseEvent.MOUSE_DRAGGED)
       {
         // If any of the following events occur while a button is held down,
         // they should be dispatched to the same component to which the
         // original MOUSE_PRESSED event was dispatched:
-        //   - MOUSE_RELEASED
         //   - MOUSE_PRESSED: another button pressed while the first is held
         //     down
         //   - MOUSE_DRAGGED
@@ -2204,10 +2203,13 @@ class LightweightDispatcher implements Serializable
                 // there is a CLICKED event after this, it will do clean up.
                 if (--pressCount == 0
                     && mouseEventTarget != pressedComponent)
-                  pressedComponent = null;
+                  {
+                    pressedComponent = null;
+                    pressCount = 0;
+                  }
                 break;
               }
-            
+
             MouseEvent newEvt =
               AWTUtilities.convertMouseEvent(nativeContainer, me,
                                              mouseEventTarget);
diff --git a/libjava/classpath/java/awt/image/MemoryImageSource.java b/libjava/classpath/java/awt/image/MemoryImageSource.java
index c27e0bf..95cd408 100644
--- a/libjava/classpath/java/awt/image/MemoryImageSource.java
+++ b/libjava/classpath/java/awt/image/MemoryImageSource.java
@@ -187,7 +187,7 @@ public class MemoryImageSource implements ImageProducer
 	ic = (ImageConsumer) list.elementAt(i);
 	sendPicture(ic);
 	if (animated)
-	  ic.imageComplete(ImageConsumer.SINGLEFRAME);
+	  ic.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
 	else
 	  ic.imageComplete(ImageConsumer.STATICIMAGEDONE);
       }