--- /home/cpdev/src/classpath/java/awt/MediaTracker.java	2005-07-12 13:24:52.000000000 +0000
+++ java/awt/MediaTracker.java	2005-06-30 05:34:27.000000000 +0000
@@ -48,7 +48,7 @@
   * Media objects are tracked by assigning them an ID. It is possible
   * to assign the same ID to mutliple objects, effectivly grouping them
   * together. In this case the status flags ({@link #statusID}) and error flag
-  * (@link #isErrorID} and {@link #getErrorsID}) are ORed together. This
+  * (@link #isErrorID} and {@link #getErrorId}) are ORed together. This
   * means that you cannot say exactly which media object has which status,
   * at most you can say that there <em>are</em> certain media objects with
   * some certain status.
@@ -123,7 +123,7 @@
      * @return <code>true</code> if more data is needed, <code>false</code>
      *         otherwise
      *
-     * @see java.awt.image.ImageObserver
+     * @see {@link java.awt.image.ImageObserver}
      */
     public boolean imageUpdate(Image img, int flags, int x, int y, 
                                int width, int height)
@@ -241,24 +241,15 @@
           {
             if (load && ((e.status & LOADING) == 0))
               {
-		if (target.prepareImage(e.image, e))
-		  e.status = COMPLETE;
-		else
-		  {
-		    e.status = LOADING;
-		    int flags = target.checkImage(e.image, e);
-		    if ((flags & ImageObserver.ABORT) != 0)
-		      e.status = ABORTED;
-		    else if ((flags & ImageObserver.ERROR) != 0)
-		      e.status = ERRORED;
-		    else if ((flags & ImageObserver.ALLBITS) != 0)
-		      e.status = COMPLETE;
-		  }
-		boolean complete = (e.status
-				    & (COMPLETE | ABORTED | ERRORED)) != 0;
-		if (!complete)
-		  result = false;
-	      }
+                e.status = LOADING;
+                result = false;
+                boolean complete = target.prepareImage(e.image, e);
+                if (complete)
+                  {
+                    e.status = COMPLETE;
+                    result = true;
+                  }
+              }
             else
               result = false;
           }
@@ -382,19 +373,11 @@
       {
         if (load && e.status == 0)
           {
-            if (target.prepareImage(e.image, e))
+            boolean complete = target.prepareImage(e.image, e);
+            if (complete)
               e.status = COMPLETE;
             else
-	      {
-                e.status = LOADING;
-                int flags = target.checkImage(e.image, e);
-		if ((flags & ImageObserver.ABORT) != 0)
-		  e.status = ABORTED;
-		else if ((flags & ImageObserver.ERROR) != 0)
-		  e.status = ERRORED;
-		else if ((flags & ImageObserver.ALLBITS) != 0)
-		  e.status = COMPLETE;
-	      }
+              e.status = LOADING;
           }
         result |= e.status;
         e = e.next;
@@ -439,22 +422,13 @@
             if (load && ((e.status & LOADING) == 0))
               {
                 e.status = LOADING;
-		if (target.prepareImage(e.image, e))
-		  e.status = COMPLETE;
-		else
-		  {
-		    int flags = target.checkImage(e.image, e);
-		    if ((flags & ImageObserver.ABORT) != 0)
-		      e.status = ABORTED;
-		    else if ((flags & ImageObserver.ERROR) != 0)
-		      e.status = ERRORED;
-		    else if ((flags & ImageObserver.ALLBITS) != 0)
-		      e.status = COMPLETE;
-		  }
-		boolean complete = (e.status
-				    & (COMPLETE | ABORTED | ERRORED)) != 0;
-		if (!complete)
-		  result = false;
+                result = false;
+                boolean complete = target.prepareImage(e.image, e);
+                if (complete)
+                  {
+                    e.status = COMPLETE;
+                    result = true;
+                  }
               }
             else
               result = false;
@@ -593,19 +567,11 @@
           {
             if (load && e.status == 0)
               {
-		if (target.prepareImage(e.image, e))
+                boolean complete = target.prepareImage(e.image, e);
+                if (complete)
                   e.status = COMPLETE;
-		else
-		  {
-		    e.status = LOADING;
-		    int flags = target.checkImage(e.image, e);
-		    if ((flags & ImageObserver.ABORT) != 0)
-		      e.status = ABORTED;
-		    else if ((flags & ImageObserver.ERROR) != 0)
-		      e.status = ERRORED;
-		    else if ((flags & ImageObserver.ALLBITS) != 0)
-		      e.status = COMPLETE;
-		  }
+                else
+                  e.status = LOADING;
               }
             result |= e.status;
           }