From 772567c54074c59485e0c19a8ba0ffddf7c4252f Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Wed, 2 Jul 2025 20:34:37 +0200 Subject: [PATCH] Build system indicators, Language keys and filtering SLF4J warnings --- app/src/processing/app/gradle/GradleJob.kt | 1 + app/src/processing/app/gradle/GradleService.kt | 1 + app/src/processing/app/ui/EditorConsole.java | 3 +++ build/shared/lib/languages/PDE.properties | 3 +++ java/src/processing/mode/java/Compiler.java | 1 + 5 files changed, 9 insertions(+) diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt index 064915cca..916c7e83f 100644 --- a/app/src/processing/app/gradle/GradleJob.kt +++ b/app/src/processing/app/gradle/GradleJob.kt @@ -49,6 +49,7 @@ class GradleJob{ scope.launch { try { state.value = State.BUILDING + service?.editor?.statusMessage("Building sketch", EditorStatus.NOTICE) GradleConnector.newConnector() .forProjectDirectory(folder) diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt index 40ffc06a2..61e150fba 100644 --- a/app/src/processing/app/gradle/GradleService.kt +++ b/app/src/processing/app/gradle/GradleService.kt @@ -64,6 +64,7 @@ class GradleService( private fun startAction(vararg tasks: String) { if(!active.value) return + editor?.let { println(Language.text("gradle.using_gradle")) } val job = GradleJob() job.service = this diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java index 468b10485..f49283823 100644 --- a/app/src/processing/app/ui/EditorConsole.java +++ b/app/src/processing/app/ui/EditorConsole.java @@ -257,6 +257,9 @@ public class EditorConsole extends JScrollPane { } else if (what.contains("__MOVE__")) { // Don't display the "Move" message that is used to position the sketch window return true; + }else if (what.startsWith("SLF4J: ")) { + // Don't display the SLF4J messages + return true; } } else { // !err diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties index 6ead810aa..8dcc6bae7 100644 --- a/build/shared/lib/languages/PDE.properties +++ b/build/shared/lib/languages/PDE.properties @@ -232,6 +232,7 @@ preferences.launch_programs_in = Launch programs in preferences.launch_programs_in.mode = mode preferences.file = More preferences can be edited directly in the file: preferences.file.hint = (Edit only when Processing is not running.) +preferences.use_modern_build_system = Use modern build system (see Processing GitHub Wiki more details) # Sketchbook Location (Frame) sketchbook_location = Select new sketchbook folder @@ -321,6 +322,8 @@ debugger.type = Type # Gradle gradle.instructions = About this file: \nProcessing creates this file when you run your sketch. \nIt configures the tools needed to build and export your code. \nLearn more: [Gradle Primer link]\n \nTo customize this file: \n1. Delete the line above that begins with '@processing-auto-generated'. \nThis will prevent Processing from overwriting this file in the future. \n2. Make your desired changes. +gradle.using_gradle = Building sketch using the new build system. (See settings to switch to the legacy build system.) +gradle.using_eclipse = Building sketch using the legacy build system. (See settings to switch to the new build system.) # --------------------------------------- # Toolbars diff --git a/java/src/processing/mode/java/Compiler.java b/java/src/processing/mode/java/Compiler.java index 3e9793169..dc76473b0 100644 --- a/java/src/processing/mode/java/Compiler.java +++ b/java/src/processing/mode/java/Compiler.java @@ -52,6 +52,7 @@ public class Compiler { * @throws SketchException Only if there's a problem. Only then. */ static public boolean compile(JavaBuild build) throws SketchException { + System.out.println(Language.text("gradle.using_eclipse")); // This will be filled in if anyone gets angry SketchException exception = null;