migrating Preferences and Messages to stand-alone version

Author: AhmedMagedC

app/build.gradle.kts

@@ -97,6 +97,7 @@ compose.desktop {
 
 dependencies {
     implementation(project(":core"))
+    implementation(project(":app:utils"))
     runtimeOnly(project(":java"))
 
     implementation(libs.flatlaf)

app/src/processing/app/Messages.kt app/src/processing/app/AppMessages.ktapp/src/processing/app/Messages.kt renamed to app/src/processing/app/AppMessages.kt

@@ -19,52 +19,17 @@
 package processing.app
 
 import processing.app.ui.Toolkit
+import processing.utils.Messages
+
 import java.awt.EventQueue
 import java.awt.Frame
 import java.io.PrintWriter
 import java.io.StringWriter
 import javax.swing.JFrame
 import javax.swing.JOptionPane
 
-class Messages {
+class AppMessages : Messages() {
     companion object {
-        /**
-         * "No cookie for you" type messages. Nothing fatal or all that
-         * much of a bummer, but something to notify the user about.
-         */
-        @JvmStatic
-        fun showMessage(title: String = "Message", message: String) {
-            if (Base.isCommandLine()) {
-                println("$title: $message")
-            } else {
-                JOptionPane.showMessageDialog(
-                    Frame(), message, title,
-                    JOptionPane.INFORMATION_MESSAGE
-                )
-            }
-        }
-
-
-        /**
-         * Non-fatal error message with optional stack trace side dish.
-         */
-        /**
-         * Non-fatal error message.
-         */
-        @JvmStatic
-        @JvmOverloads
-        fun showWarning(title: String = "Warning", message: String, e: Throwable? = null) {
-            if (Base.isCommandLine()) {
-                println("$title: $message")
-            } else {
-                JOptionPane.showMessageDialog(
-                    Frame(), message, title,
-                    JOptionPane.WARNING_MESSAGE
-                )
-            }
-            e?.printStackTrace()
-        }
-
         /**
          * Non-fatal error message with two levels of formatting.
          * Unlike the others, this is non-blocking and will run later on the EDT.
@@ -92,26 +57,6 @@ class Messages {
         }
 
 
-        /**
-         * Show an error message that's actually fatal to the program.
-         * This is an error that can't be recovered. Use showWarning()
-         * for errors that allow P5 to continue running.
-         */
-        @JvmStatic
-        fun showError(title: String = "Error", message: String, e: Throwable?) {
-            if (Base.isCommandLine()) {
-                System.err.println("$title: $message")
-            } else {
-                JOptionPane.showMessageDialog(
-                    Frame(), message, title,
-                    JOptionPane.ERROR_MESSAGE
-                )
-            }
-            e?.printStackTrace()
-            System.exit(1)
-        }
-
-
         /**
          * Warning window that includes the stack trace.
          */
@@ -218,56 +163,6 @@ class Messages {
             return -1
         }
 
-
-        // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-        @JvmStatic
-        @Deprecated("Use log() instead")
-        fun log(from: Any, message: String) {
-            if (Base.DEBUG) {
-                val callingClass = Throwable()
-                    .stackTrace[2]
-                    .className
-                    .formatClassName()
-                println("$callingClass: $message")
-            }
-        }
-
-        @JvmStatic
-        fun log(message: String?) {
-            if (Base.DEBUG) {
-                val callingClass = Throwable()
-                    .stackTrace[2]
-                    .className
-                    .formatClassName()
-                println("$callingClass$message")
-            }
-        }
-
-        @JvmStatic
-        fun logf(message: String?, vararg args: Any?) {
-            if (Base.DEBUG) {
-                val callingClass = Throwable()
-                    .stackTrace[2]
-                    .className
-                    .formatClassName()
-                System.out.printf("$callingClass$message", *args)
-            }
-        }
-
-        @JvmStatic
-        @JvmOverloads
-        fun err(message: String?, e: Throwable? = null) {
-            if (Base.DEBUG) {
-                if (message != null) {
-                    val callingClass = Throwable()
-                        .stackTrace[4]
-                        .className
-                        .formatClassName()
-                    System.err.println("$callingClass$message")
-                }
-                e?.printStackTrace()
-            }
-        }
     }
 }
 

app/src/processing/app/AppPreferences.java

@@ -0,0 +1,30 @@
+package processing.app;
+
+import processing.utils.Preferences;
+import processing.app.ui.Toolkit;
+
+import java.awt.*;
+
+public class AppPreferences extends Preferences {
+
+    static public void init() {
+        Preferences.init();
+
+        // For CJK users, enable IM support by default
+        if (Language.useInputMethod() && !getBoolean("editor.input_method_support")) {
+            setBoolean("editor.input_method_support", true);
+        }
+    }
+
+
+    static public Font getFont(String familyAttr, String sizeAttr, int style) {
+        int fontSize = getInteger(sizeAttr);
+
+        String fontFamily = get(familyAttr);
+        if ("processing.mono".equals(fontFamily) ||
+                Toolkit.getMonoFontName().equals(fontFamily)) {
+            return Toolkit.getMonoFont(fontSize, style);
+        }
+        return new Font(fontFamily, style, fontSize);
+    }
+}