From 67ee871464f9a6f7493cfb4399b79a38e216820d Mon Sep 17 00:00:00 2001 From: PiisRational Date: Tue, 18 Nov 2025 20:59:07 +0100 Subject: [PATCH 1/2] save proof independent settings, that are not used by the configuration --- .../uka/ilkd/key/settings/Configuration.java | 4 +-- .../settings/ProofIndependentSettings.java | 27 ++++++++++++------- .../key/gui/plugins/javac/JavacExtension.java | 3 +++ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/key.core/src/main/java/de/uka/ilkd/key/settings/Configuration.java b/key.core/src/main/java/de/uka/ilkd/key/settings/Configuration.java index 8efef1a3e1b..b6dbb981ecd 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/settings/Configuration.java +++ b/key.core/src/main/java/de/uka/ilkd/key/settings/Configuration.java @@ -525,7 +525,7 @@ private ConfigurationWriter printMap(Map value) { } indent -= 4; newline().printIndent(); - out.format(" }"); + out.format("}"); return this; } @@ -555,7 +555,7 @@ private ConfigurationWriter printSeq(Collection value) { } indent -= 4; newline().printIndent(); - out.format(" ]"); + out.format("]"); return this; } diff --git a/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java b/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java index 0646074f4af..12b64dadf06 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java +++ b/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java @@ -53,8 +53,8 @@ public class ProofIndependentSettings { private final List settings = new LinkedList<>(); private final PropertyChangeListener settingsListener = e -> saveSettings(); - private Properties lastReadedProperties; - private Configuration lastReadedConfiguration; + private Properties lastReadProperties; + private Configuration lastReadConfiguration; private ProofIndependentSettings() { addSettings(smtSettings); @@ -74,11 +74,11 @@ public void addSettings(Settings settings) { if (!this.settings.contains(settings)) { this.settings.add(settings); settings.addPropertyChangeListener(settingsListener); - if (lastReadedProperties != null) { - settings.readSettings(lastReadedProperties); + if (lastReadProperties != null) { + settings.readSettings(lastReadProperties); } - if (lastReadedConfiguration != null) { - settings.readSettings(lastReadedConfiguration); + if (lastReadConfiguration != null) { + settings.readSettings(lastReadConfiguration); } } } @@ -106,19 +106,22 @@ private void load(File file) throws IOException { for (Settings settings : settings) { settings.readSettings(properties); } - lastReadedProperties = properties; + lastReadProperties = properties; } } else { - this.lastReadedConfiguration = Configuration.load(file); + this.lastReadConfiguration = Configuration.load(file); for (Settings settings : settings) { - settings.readSettings(lastReadedConfiguration); + settings.readSettings(lastReadConfiguration); } } } public void saveSettings() { if (!filename.getName().endsWith(".json")) { - Properties result = new Properties(); + Properties result = lastReadProperties == null + ? new Properties() + : new Properties(lastReadProperties); + for (Settings settings : settings) { settings.writeSettings(result); } @@ -135,6 +138,10 @@ public void saveSettings() { } Configuration config = new Configuration(); + if (lastReadConfiguration != null) { + config.overwriteWith(lastReadConfiguration); + } + for (var settings : settings) settings.writeSettings(config); if (!filename.exists()) { diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java index 009a53a28de..622024a97e4 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java @@ -162,6 +162,9 @@ private void loadProof(Proof selectedProof) throws RuntimeException { updateLabel(data); })).get(); } catch (InterruptedException | ExecutionException ex) { + lblStatus.setForeground(COLOR_ERROR.get()); + lblStatus.setIcon(ICON_ERROR.get(16)); + lblStatus.setText("Javac error"); throw new RuntimeException(ex); } } From ba0945ce2dd4b521ec483c9c2c6fde5bfe219d03 Mon Sep 17 00:00:00 2001 From: PiisRational Date: Tue, 13 Jan 2026 11:39:41 +0100 Subject: [PATCH 2/2] run formatter --- .../de/uka/ilkd/key/settings/ProofIndependentSettings.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java b/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java index 12b64dadf06..482e3460675 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java +++ b/key.core/src/main/java/de/uka/ilkd/key/settings/ProofIndependentSettings.java @@ -118,9 +118,9 @@ private void load(File file) throws IOException { public void saveSettings() { if (!filename.getName().endsWith(".json")) { - Properties result = lastReadProperties == null - ? new Properties() - : new Properties(lastReadProperties); + Properties result = lastReadProperties == null + ? new Properties() + : new Properties(lastReadProperties); for (Settings settings : settings) { settings.writeSettings(result);