Release 1.1.4: canvas view zoom, tab close prompts, maintenance

Diagram canvas scales with platform shortcuts (⌘/Ctrl + and −); mouse-wheel
block resize and its setting are removed. Closing a dirty tab offers save,
discard, or cancel, with unsaved state on the tab header. Legacy commented-out
code is trimmed. Version bumps for Maven, macOS packaging scripts, README,
and release-notes/v1.1.4.md. Ignore local VisuStruct-swift/ clone in .gitignore.

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

Author: code4teaching

.gitignore

@@ -26,4 +26,7 @@ visustruct.properties
 dist/
 
 # Abhängigkeitsordner irrtümlich im Projektroot (z. B. entpackte JARs)
-com/
+com/
+
+# Lokaler Klon des SwiftUI-Repos (nicht ins Java-Projekt einchecken)
+VisuStruct-swift/

README.md

@@ -22,6 +22,14 @@ git clone https://github.com/code4teaching/VisuStruct.git
 
 ---
 
+## Changes in 1.1.4 (summary)
+
+- **Diagram:** canvas **view zoom** with **⌘+ / ⌘−** (macOS) or **Ctrl+ / Ctrl−** (Windows/Linux); **no** block resize via mouse wheel anymore.
+- **Tabs:** prompt to **save / discard / cancel** when closing a diagram with unsaved changes; dirty state shown in the tab header (not as `*` in the title).
+- **Code:** removed long blocks of commented-out legacy code (especially `Struktogramm`, `StrTabbedPane`, `XMLLeser`, palette/trash setup) for easier maintenance.
+
+Full notes: [`release-notes/v1.1.4.md`](release-notes/v1.1.4.md).
+
 ## Changes in 1.1.3 (summary)
 
 - **Tabs:** close tabs via middle-click, context menu, and **Ctrl+W** / **Cmd+W**; clicking the tab header switches diagrams reliably (close “×” is a label, not a button).
@@ -119,7 +127,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.1.3.jar`**).
+- Current fat JAR name follows **`pom.xml`** **`version`** (e.g. **`visustruct-1.1.4.jar`**).
 
 ---
 
@@ -194,13 +202,13 @@ chmod +x mvnw
 Output (version from `pom.xml`):
 
 ```text
-target/visustruct-1.1.3.jar
+target/visustruct-1.1.4.jar
 ```
 
 ## Run
 
 ```bash
-java -jar target/visustruct-1.1.3.jar
+java -jar target/visustruct-1.1.4.jar
 ```
 
 Double-click may work if `.jar` is associated with Java.

packaging/macos/build-lightweight-app.sh

@@ -4,7 +4,7 @@
 set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-VER="${PROJECT_VERSION:-1.1.3}"
+VER="${PROJECT_VERSION:-1.1.4}"
 JAR_NAME="visustruct-${VER}.jar"
 OUT="${ROOT}/dist/macos-app-light"
 APP="${OUT}/VisuStruct.app"

packaging/macos/build-macos-app.sh

@@ -4,7 +4,7 @@
 # Voraussetzung: JDK 17+ mit jpackage (im PATH oder JAVA_HOME).
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-VER="${PROJECT_VERSION:-1.1.3}"
+VER="${PROJECT_VERSION:-1.1.4}"
 JAR="visustruct-${VER}.jar"
 INPUT="${ROOT}/target"
 OUT="${ROOT}/dist/macos-app"

pom.xml

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

release-notes/v1.1.4.md

@@ -0,0 +1,22 @@
+# VisuStruct 1.1.4
+
+Release **after** **1.1.3** (GitHub `master`).
+
+## Diagram canvas
+
+- **View zoom** for the diagram: **⌘+ / ⌘−** on macOS, **Strg+ / Strg−** on Windows/Linux (root-pane shortcuts). The logical block layout is unchanged; only the on-screen scale changes.
+- **Removed:** resizing blocks with the **mouse wheel** (and the related setting / menu entry / persisted option).
+
+## Tabs
+
+- **Unsaved changes:** closing a tab (×, middle-click, context menu, or **Diagramm schließen**) asks to **save**, **discard**, or **cancel** when the diagram is dirty.
+- **Dirty indicator** is shown on the tab chrome (no `*` suffix in the title text).
+
+## Code maintenance
+
+- Removed large sections of **commented-out legacy code** (obsolete helpers, unused fields, dead branches) in **`Struktogramm`**, **`StrTabbedPane`**, **`AuswahlPanel`**, **`Fallauswahl`**, **`StruktogrammElementListe`**, **`XMLLeser`**, and related classes to reduce noise and merge conflicts.
+
+## Build
+
+- Maven: **`de.visustruct:visustruct:1.1.4`**
+- Fat JAR: **`visustruct-1.1.4.jar`** (`./mvnw package` → `target/`)

src/main/java/de/visustruct/control/Controlling.java

@@ -22,6 +22,8 @@
 import java.awt.print.Printable;
 import java.awt.print.PrinterException;
 import java.awt.print.PrinterJob;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JEditorPane;
@@ -56,6 +58,8 @@
 
 public class Controlling implements Konstanten, ActionListener, WindowListener, KeyListener {
 
+	private static final Logger LOG = Logger.getLogger(Controlling.class.getName());
+
 	private GUI gui;
 	private enum Betriebssysteme {Windows, Mac, Linux};
 
@@ -88,7 +92,7 @@ public void handleOSSettingsAndTheme(){
 			}
 
 		}catch(Exception e){
-			e.printStackTrace();
+			LOG.log(Level.SEVERE, "Theme/OS-Initialisierung fehlgeschlagen", e);
 		}
 	}
 
@@ -102,14 +106,9 @@ private void applyConfiguredTheme() {
 			case lookAndFeelOSStandard:
 				try {
 					UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-				} catch (ClassNotFoundException e1) {
-					e1.printStackTrace();
-				} catch (InstantiationException e1) {
-					e1.printStackTrace();
-				} catch (IllegalAccessException e1) {
-					e1.printStackTrace();
-				} catch (UnsupportedLookAndFeelException e1) {
-					e1.printStackTrace();
+				} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+						| UnsupportedLookAndFeelException e1) {
+					LOG.log(Level.WARNING, "System-Look-and-Feel konnte nicht gesetzt werden", e1);
 				}
 				break;
 
@@ -121,7 +120,7 @@ private void applyConfiguredTheme() {
 						UIManager.setLookAndFeel(new FlatLightLaf());
 					}
 				} catch (UnsupportedLookAndFeelException e) {
-					e.printStackTrace();
+					LOG.log(Level.WARNING, "FlatLight-Look-and-Feel konnte nicht gesetzt werden", e);
 				}
 				break;
 
@@ -133,7 +132,7 @@ private void applyConfiguredTheme() {
 						UIManager.setLookAndFeel(new FlatDarkLaf());
 					}
 				} catch (UnsupportedLookAndFeelException e) {
-					e.printStackTrace();
+					LOG.log(Level.WARNING, "FlatDark-Look-and-Feel konnte nicht gesetzt werden", e);
 				}
 				break;
 
@@ -150,14 +149,14 @@ private void applyConfiguredTheme() {
 				try {
 					UIManager.setLookAndFeel(lookAndFeel);
 				} catch (UnsupportedLookAndFeelException e) {
-					e.printStackTrace();
+					LOG.log(Level.WARNING, "Look-and-Feel (Metal/Nimbus) konnte nicht gesetzt werden", e);
 				}
 			}
 
 			UiTheme.applyAfterTheme();
 			I18n.applyFileChooserStrings();
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.log(Level.SEVERE, "Look-and-Feel-Konfiguration fehlgeschlagen", e);
 		}
 	}
 
@@ -209,8 +208,13 @@ public void speichern(boolean neuenSpeicherpfadAuswaehlenLassen){
 
 		if(str != null){
 			GlobalSettings.setzeSpeicherpfad(str.speichern(neuenSpeicherpfadAuswaehlenLassen,GlobalSettings.getZuletztGenutzterSpeicherpfad()));//Struktogramm wird gespeichert (zuletztGenutzterSpeicherpfad wird dabei übergeben, damit der JFileChooser, sofern er genutzt wird, dort startet) und der neue Speicherpfad wird gesichert
+			String p = str.gibAktuellenSpeicherpfad();
+			if (!p.isEmpty()) {
+				GlobalSettings.rememberRecentStruktogrammPath(p);
+			}
 			GlobalSettings.saveSettings();
 			titelleisteAktualisieren();
+			gui.rebuildMenuBar();
 		}
 	}
 
@@ -230,8 +234,28 @@ private void openStruktogramm(String pfad) {
 		str.graphicsInitialisieren();
 		str.laden(pfad);
 		GlobalSettings.setzeSpeicherpfad(pfad);
+		GlobalSettings.rememberRecentStruktogrammPath(pfad);
 		GlobalSettings.saveSettings();
 		titelleisteAktualisieren();
+		gui.rebuildMenuBar();
+	}
+
+
+	/** Öffnet eine gespeicherte Datei aus dem Menü „Zuletzt geöffnet“. */
+	public void oeffneStruktogrammAusZuletztListe(String pfad) {
+		if (pfad == null || pfad.isBlank()) {
+			return;
+		}
+		File f = new File(pfad);
+		if (!f.isFile()) {
+			GlobalSettings.removeRecentStruktogrammPath(pfad);
+			GlobalSettings.saveSettings();
+			gui.rebuildMenuBar();
+			JOptionPane.showMessageDialog(gui, I18n.trf("dialog.recentMissing.message", pfad),
+					I18n.tr("dialog.recentMissing.title"), JOptionPane.WARNING_MESSAGE);
+			return;
+		}
+		openStruktogramm(pfad);
 	}
 
 
@@ -384,10 +408,6 @@ public void actionPerformed(ActionEvent e) {
 			new FontChooser(this,true);
 			break;
 
-		case groesseAendernMitMausrad:
-			mitMausradElementeVergroessernGeklickt(e.getSource());
-			break;
-
 		case zoomeinstellungen:
 			new ZoomEinstellungen(gui);
 			break;
@@ -555,16 +575,6 @@ private void letzteElementeStreckenGeklickt(Object source){
 	}
 
 
-	private void mitMausradElementeVergroessernGeklickt(Object source){
-		boolean einOderAus = ((JCheckBoxMenuItem)source).isSelected();
-		GlobalSettings.setBeiMausradGroesseAendern(einOderAus);
-		GlobalSettings.saveSettings();
-		gibAktuellesStruktogramm().mausradScrollEinOderAusschalten(einOderAus);
-		gibAktuellesStruktogramm().zeichenbereichAktualisieren();
-		gibAktuellesStruktogramm().zeichne();
-	}
-
-
 	private void elementEinfuegenShortcutsVerwendenGeklickt(Object source){
 		boolean einOderAus = ((JCheckBoxMenuItem)source).isSelected();
 		GlobalSettings.setElementShortcutsVerwenden(einOderAus);
@@ -642,18 +652,6 @@ public void windowDeactivated(WindowEvent e) {
 
 	@Override
 	public void keyTyped(KeyEvent e) {
-		if(e.getSource() == gui.gibTabbedpane() && (e.getModifiersEx() & GlobalSettings.strgOderApfelMask) == 0){
-
-			switch(e.getKeyChar()){
-			case '+':
-				gibAktuellesStruktogramm().zoomAktuellesElement(true);
-				break;
-
-			case '-':
-				gibAktuellesStruktogramm().zoomAktuellesElement(false);
-				break;
-			}
-		}
 	}