Fully implement MIDlet class to the spec

usernameak · Sep 14, 2024 · a8d7e97 · a8d7e97
1 parent 2ff004a
commit a8d7e97
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/src/main/java/javax/microedition/midlet/MIDlet.java b/src/main/java/javax/microedition/midlet/MIDlet.java
@@ -21,15 +21,20 @@ public final String getAppProperty(String key) {
     }
 
     public final void notifyDestroyed() {
-        throw new FeatureNotImplementedError("MIDlet::notifyDestroyed");
+        appInstance.onShutdown();
     }
 
     public final void notifyPaused() {
-        throw new FeatureNotImplementedError("MIDlet::notifyPaused");
+        pauseApp();
     }
 
     public final void resumeRequest() {
-        throw new FeatureNotImplementedError("MIDlet::resumeRequest");
+        try {
+            startApp();
+        } catch (MIDletStateChangeException e) {
+            // i guess...?
+            e.printStackTrace();
+        }
     }
 
     public static AppInstance getAppModel(MIDlet midlet) {
@@ -39,4 +44,8 @@ public static AppInstance getAppModel(MIDlet midlet) {
     public static void startMidlet(MIDlet midlet) throws MIDletStateChangeException {
         midlet.startApp();
     }
+
+    public static void destroyMidlet(MIDlet midlet) throws MIDletStateChangeException {
+        midlet.destroyApp(false);
+    }
 }
diff --git a/src/main/java/net/sktemu/ams/AppInstance.java b/src/main/java/net/sktemu/ams/AppInstance.java
@@ -35,6 +35,8 @@ public class AppInstance implements AutoCloseable {
 
     private long lastPresentTime = 0;
 
+    private MIDlet midlet;
+
     static {
         AmsSysPropManager.init();
     }
@@ -101,7 +103,7 @@ public void initAppInstance() throws AmsException {
                 try {
                     Object midletObj = midletClass.getConstructor().newInstance();
                     if (midletObj instanceof MIDlet) {
-                        MIDlet midlet = (MIDlet) midletObj;
+                        midlet = (MIDlet) midletObj;
                         System.out.println("midlet load");
 
                         MIDlet.startMidlet(midlet);
@@ -214,4 +216,17 @@ public void blitGraphics() {
 
         runOnUiThread(emuCanvas::repaint);
     }
+
+    public boolean shutdown() {
+        try {
+            MIDlet.destroyMidlet(midlet);
+        } catch (MIDletStateChangeException e) {
+            return false;
+        }
+        return true;
+    }
+
+    public void onShutdown() {
+        System.exit(0);
+    }
 }
diff --git a/src/main/java/net/sktemu/ui/EmuUIFrame.java b/src/main/java/net/sktemu/ui/EmuUIFrame.java
@@ -8,6 +8,8 @@
 import javax.swing.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 public class EmuUIFrame extends JFrame {
     private final EmuCanvas canvas;
@@ -23,10 +25,23 @@ public EmuUIFrame(AppModel appModel) {
         );
         setContentPane(canvas);
 
-        setDefaultCloseOperation(EXIT_ON_CLOSE);
-
         pack();
 
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                try {
+                    if (appInstance != null && !appInstance.shutdown()) return;
+                } catch (Throwable ex) {
+                    ex.printStackTrace();
+                    System.exit(1);
+                    return;
+                }
+
+                System.exit(0);
+            }
+        });
+
         addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {