From 79db8bca998384bdee803628d57054840c5453a2 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Sun, 17 Jan 2021 15:54:25 +0700
Subject: [PATCH 1/2] Update ImageObserverWrapper.java

---
 .../src/main/java/jdpi/awt/image/ImageObserverWrapper.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
index 3374a85f..ac9c46a1 100644
--- a/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
+++ b/JavaApp/src/main/java/jdpi/awt/image/ImageObserverWrapper.java
@@ -2,9 +2,10 @@ package jdpi.awt.image;
 
 import jdpi.awt.Image;
 
-public void ImageObserverWrapper {
-    public java.awt.image.ImageObserver wrap(final ImageObserver observer) {
+public class ImageObserverWrapper {
+    public static java.awt.image.ImageObserver wrap(final ImageObserver observer) {
         return new java.awt.image.ImageObserver() {
+            @Override
             public boolean imageUpdate(java.awt.Image img, int infoflags, int x, int y, int width, int height) {
                 if (img instanceof BufferedImage) {
                     observer.imageUpdate((BufferedImage) imf, infoflags, x, y, width, height);
@@ -12,4 +13,4 @@ public void ImageObserverWrapper {
             }
         };
     }
-}
\ No newline at end of file
+}

From 3866693a8c450a0dc5a25e21b7c312d13993606a Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Sun, 17 Jan 2021 15:55:19 +0700
Subject: [PATCH 2/2] Update Graphics.java

---
 JavaApp/src/main/java/jdpi/awt/Graphics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/JavaApp/src/main/java/jdpi/awt/Graphics.java b/JavaApp/src/main/java/jdpi/awt/Graphics.java
index 0f58e1bf..c361cf57 100644
--- a/JavaApp/src/main/java/jdpi/awt/Graphics.java
+++ b/JavaApp/src/main/java/jdpi/awt/Graphics.java
@@ -31,6 +31,6 @@ public class Graphics {
 
 	public boolean drawImage(Image image, int x, int y, ImageObserver observer) {
 		if (!(image instanceof BufferedImage)) return true;
-		return g2d.drawImage(((BufferedImage) image).getBaseImage(), x, y, observer);
+		return g2d.drawImage(((BufferedImage) image).getBaseImage(), x, y, ImageObserverWrapper.wrap(observer));
 	}
 }