migrating Preferences and Messages to stand-alone version

.gitignore

@@ -102,6 +102,7 @@ processing-examples
 core/build/
 build/publish/
 app/build
+app/utils/build
 java/build/
 /build/reports
 /java/bin

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/Base.java

@@ -43,6 +43,7 @@
 import processing.app.ui.Toolkit;
 import processing.core.*;
 import processing.data.StringList;
+import processing.utils.Util;
 
 /**
  * The base class for the main processing application.
@@ -67,8 +68,6 @@ public class Base {
    */
   static public boolean DEBUG = System.getenv().containsKey("DEBUG");
 
-  /** True if running via Commander. */
-  static private boolean commandLine;
 
   /**
    * If settings.txt is present inside lib, it will be used to override
@@ -472,12 +471,12 @@ static public String getVersionName() {
 
 
   public static void setCommandLine() {
-    commandLine = true;
+    System.setProperty("processing.cli", "true");
   }
 
 
   static public boolean isCommandLine() {
-    return commandLine;
+    return Boolean.getBoolean("processing.cli");
   }
 
 

app/src/processing/app/Language.java

@@ -26,6 +26,7 @@
 
 import processing.core.PApplet;
 import processing.data.StringList;
+import processing.utils.Util;
 
 
 /**

app/src/processing/app/Library.java

@@ -8,6 +8,7 @@
 import processing.core.*;
 import processing.data.StringDict;
 import processing.data.StringList;
+import processing.utils.Util;
 
 
 public class Library extends LocalContribution {

app/src/processing/app/Messages.kt

@@ -26,45 +26,8 @@ import java.io.StringWriter
 import javax.swing.JFrame
 import javax.swing.JOptionPane
 
-class Messages {
+class Messages : processing.utils.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 +55,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 +161,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/Mode.java

@@ -40,6 +40,7 @@
 import processing.app.ui.Recent;
 import processing.app.ui.Toolkit;
 import processing.core.PApplet;
+import processing.utils.Util;
 
 
 public abstract class Mode {

app/src/processing/app/Platform.java

@@ -36,6 +36,8 @@
 import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.data.StringDict;
+import processing.utils.SettingsResolver;
+import processing.utils.Util;
 
 
 public class Platform {
@@ -129,7 +131,12 @@ static public float getSystemZoom() {
 
 
   static public File getSettingsFolder() throws Exception {
-    return inst.getSettingsFolder();
+    File override = Base.getSettingsOverride();
+    if (override != null) {
+      return override;
+    }
+
+    return SettingsResolver.getSettingsFolder();
   }