release: VisuStruct 1.2.4

Fix the code-generator Generate button, element-editor Apply text, and over-escaped hints. Make the code dialog resizable and document the output concatenation example.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: code4teaching

README.md

@@ -10,7 +10,7 @@
 
 **VisuStruct** is a **structure-chart editor** for **Nassi–Shneiderman** diagrams (desktop, Kotlin / Swing).
 
-Under **Settings → Languages** the **user interface** can be set to any of **21 languages** aligned with **VisuStruct-swift** (English, German, Spanish, French, Italian, Polish, Turkish, Korean, Japanese, Greek, Ukrainian, Arabic, Russian, Hebrew, Dutch, Swedish, Danish, Norwegian Bokmål, Chinese Simplified/Traditional, European Portuguese). Stored as `uilanguage` in `visustruct.properties` (e.g. `zh_Hans`, `pt_PT`). UI strings are synced from the Swift app where keys overlap: `python3 tools/sync_java_messages_from_swift.py` (map: `VisuStruct-swift/tools/java_swift_i18n_map.json`). Desktop-only labels may still fall back to English.
+Under **Settings → Languages** the **user interface** can be set to any of **21 languages** aligned with **VisuStruct-swift** (English, German, Spanish, French, Italian, Polish, Turkish, Korean, Japanese, Greek, Ukrainian, Arabic, Russian, Hebrew, Dutch, Swedish, Danish, Norwegian Bokmål, Chinese Simplified/Traditional, European Portuguese). Stored as `uilanguage` in `visustruct.properties` (e.g. `zh_Hans`, `pt_PT`). UI strings are synced from the Swift app where keys overlap: `python3 tools/sync_java_messages_from_swift.py` (map: `tools/java_swift_i18n_map.json`, or `VisuStruct-swift/tools/java_swift_i18n_map.json` if that sibling clone exists). Desktop-only labels may still fall back to English.
 
 *Lineage:* Based on the open-source project [kekru/struktogrammeditor](https://github.com/kekru/struktogrammeditor) (Kevin Krummenauer, MIT). Copyright and terms: [LICENSE](LICENSE).
 
@@ -22,6 +22,13 @@ git clone https://github.com/code4teaching/VisuStruct.git
 
 ---
 
+## Changes in 1.2.4 (summary)
+
+- **Fixes:** code generator **Generate** button (invalid number-field regex); element editor **Apply text** (`split` limit); over-escaped editor hints; palette generate applies pending editor text.
+- **UI:** resizable code-generator dialog; output hint with `"Result: " + result` / `"Ergebnis: " + ergebnis`.
+
+Full notes: [`release-notes/v1.2.4.md`](release-notes/v1.2.4.md).
+
 ## Changes in 1.2.3 (summary)
 
 - **Kotlin:** full migration of production code; Java reference under `src/main/java-reference/`; tests still Java.
@@ -156,7 +163,7 @@ This release aligns **branding and technical identity** with **VisuStruct**. **`
 - **Java 17** target (build and run with JDK 17+).
 - **FlatLaf** light/dark themes; **JDOM2**; no legacy AppleJavaExtensions.
 - **Motif** look-and-feel removed; **Metal** and FlatLaf available.
-- Current fat JAR name follows **`pom.xml`** **`version`** (e.g. **`visustruct-1.2.3.jar`**).
+- Current fat JAR name follows **`pom.xml`** **`version`** (e.g. **`visustruct-1.2.4.jar`**).
 
 ---
 
@@ -231,13 +238,13 @@ chmod +x mvnw
 Output (version from `pom.xml`):
 
 ```text
-target/visustruct-1.2.3.jar
+target/visustruct-1.2.4.jar
 ```
 
 ## Run
 
 ```bash
-java -jar target/visustruct-1.2.3.jar
+java -jar target/visustruct-1.2.4.jar
 ```
 
 Double-click may work if `.jar` is associated with Java.

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.visustruct</groupId>
 	<artifactId>visustruct</artifactId>
-	<version>1.2.3</version>
+	<version>1.2.4</version>
 	<name>VisuStruct</name>
 
 	<properties>

release-notes/v1.2.4.md

@@ -0,0 +1,29 @@
+# VisuStruct 1.2.4
+
+Patch release **after** **1.2.3**.
+
+## Fixes
+
+- **Code generator:** **Generate** did nothing after the Kotlin port because `JNumberField.isNumeric()` compiled an invalid regex (`PatternSyntaxException`). Indent fields now parse numbers with `toDoubleOrNull()`.
+- **Element editor:** **Apply text** crashed on `Regex.split(…, -1)` (Java’s “keep empties” limit is not valid in Kotlin).
+- **Hints:** editor example strings showed long backslash runs after i18n sync doubled `.properties` escapes. Sync/resync now unescape before rewriting.
+- **Palette → Generate code** applies pending editor text first (same as **File → Generate code**).
+
+## UI
+
+- **Code generator** dialog is **resizable**; the old fixed 498×458 absolute layout no longer clips buttons on HiDPI or with long translations.
+- **Output** hint includes a concatenation example (`output: "Ergebnis: " + ergebnis` / `output: "Result: " + result`).
+
+## Internationalization
+
+- Further **Swift** string sync for editor/dialog keys; `tools/java_swift_i18n_map.json` is kept in this repo as a fallback map.
+
+## Tests
+
+- `CodeGenRulesJavaTest`: Java input/output lines and numeric indent fields.
+
+## Build
+
+- Maven: **`de.visustruct:visustruct:1.2.4`**
+- Fat JAR: **`visustruct-1.2.4.jar`** (`./mvnw package` → `target/`)
+- Release also ships **`visustruct.jar`**.

src/main/kotlin/de/visustruct/control/Controlling.kt

@@ -349,10 +349,7 @@ class Controlling(params: Array<String>?) : Konstanten, ActionListener, WindowLi
             XActionCommands.bildInZwischenAblage ->
                 copyImagetoClipBoard(gibAktuellesStruktogramm()!!.generateImage(false))
 
-            XActionCommands.quellcodeErzeugen -> {
-                flushPendingDiagramEdits()
-                CodeErzeuger(gui, I18n.tr("menu.file.generateCode"), true, gibAktuellesStruktogramm()!!)
-            }
+            XActionCommands.quellcodeErzeugen -> openCodeGenerator()
 
             XActionCommands.struktogrammSchliessen -> gui.gibTabbedpane().aktuellesStruktogrammschliessen()
             XActionCommands.programmBeenden -> programmBeendenGeklickt()
@@ -519,6 +516,14 @@ class Controlling(params: Array<String>?) : Konstanten, ActionListener, WindowLi
         onSimulationToggle()
     }
 
+    /** Menü „Quellcode erzeugen“ und Paletten-Button: Editortext übernehmen, dann Dialog. */
+    fun openCodeGenerator() {
+        if (gui.gibTabbedpane().tabCount <= 0) return
+        flushPendingDiagramEdits()
+        val str = gibAktuellesStruktogramm() ?: return
+        CodeErzeuger(gui, I18n.tr("menu.file.generateCode"), true, str)
+    }
+
     private fun onSimulationToggle() {
         if (simulationMode) {
             endSimulationInternal()

src/main/kotlin/de/visustruct/other/JNumberField.kt

@@ -21,23 +21,7 @@ class JNumberField @JvmOverloads constructor() : JTextField() {
 
     fun getLong(): Long = getDouble().toLong()
 
-    fun isNumeric(): Boolean {
-        val digits = "(\\p{Digit}+)"
-        val hexDigits = "(\\p{XDigit}+)"
-        val exp = "[eE][+-]?$digits"
-        val fpRegex = (
-            "[\\x00-\\x20]*" +
-                "[+-]?(" +
-                "NaN|" +
-                "Infinity|" +
-                "(($digits(\\.)?($digits?)(($exp)?))|" +
-                "(\\.($digits)($exp)?)|" +
-                "((0[xX]$hexDigits(\\.)?)|(0[xX]$hexDigits?(\\.)$hexDigits))[pP][+-]?$digits)" +
-                "[fFdD]?))" +
-                "[\\x00-\\x20]*"
-            )
-        return fpRegex.toRegex().matches(text)
-    }
+    fun isNumeric(): Boolean = text.trim().toDoubleOrNull() != null
 
     fun setDouble(d: Double) {
         text = d.toString()

src/main/kotlin/de/visustruct/struktogrammelemente/CodeGenRules.kt

@@ -373,7 +373,7 @@ object CodeGenRules {
     @JvmStatic
     fun javaScriptForLoopHeader(lines: Array<String>?): String {
         val header = cStyleForLoopHeader(lines)
-        val parts = ";".toRegex().split(header, -1).toMutableList()
+        val parts = header.split(";").toMutableList()
         if (parts.isNotEmpty()) {
             val init = javaScriptForInitializerFromJavaTypedDeclaration(parts[0])
             if (init != null) {

src/main/kotlin/de/visustruct/view/AuswahlPanel.kt

@@ -132,15 +132,7 @@ class AuswahlPanel(private val controlling: Controlling) :
                 wendePaletteAktionsIconAn(this, "code")
                 toolTipText = I18n.tr("menu.file.generateCode")
                 accessibleContext.accessibleName = I18n.tr("palette.generateCode")
-                addActionListener {
-                    val str = controlling.gibAktuellesStruktogramm() ?: return@addActionListener
-                    CodeErzeuger(
-                        controlling.getGUI(),
-                        I18n.tr("menu.file.generateCode"),
-                        true,
-                        str,
-                    )
-                }
+                addActionListener { controlling.openCodeGenerator() }
             }
         add(paletteCodeGenButton, c)