settings editor: fix recently used, update old state on save

Author: Ahli

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/SettingsEditorApplication.java

@@ -345,6 +345,7 @@ public void saveUiMpq() {
 			}
 			hasUnsavedFileChanges = false;
 			updateAppTitle();
+			updateValueDefsUnchangedState();
 			log.trace("opened mpq within {}ms.", (System.nanoTime() - time) / 1_000_000);
 		} catch (final InterruptedException e) {
 			Thread.currentThread().interrupt();
@@ -354,6 +355,10 @@ public void saveUiMpq() {
 		}
 	}
 
+	private void updateValueDefsUnchangedState() {
+		this.layoutExtReader.updateValueDefsUnchangedState();
+	}
+	
 	/**
 	 * Returns true, if the path of the current opened document is valid. Invalid usually means that no document has
 	 * been opened.

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/controllers/TabsController.java

@@ -28,7 +28,7 @@
 public class TabsController {
 
 	private static final Callback<TableColumn<ValueDef, Boolean>, TableCell<ValueDef, Boolean>>
-			ActionColumnCellFactoryReset =
+			ACTION_COLUMN_CELL_FACTORY_RESET =
 			_ -> new ResetDefaultButtonTableCell(Messages.getString("TabsController.ResetDefault"),
 					Messages.getString("TabsController.ResetOldValue"));
 
@@ -102,7 +102,7 @@ public void initialize() {
 		hotkeysKeyCol.setSortable(false);
 		hotkeysActionsCol.setSortable(false);
 		hotkeysActionsCol.setCellValueFactory(hasChangedFac);
-		hotkeysActionsCol.setCellFactory(ActionColumnCellFactoryReset);
+		hotkeysActionsCol.setCellFactory(ACTION_COLUMN_CELL_FACTORY_RESET);
 
 		settingsNameCol.setCellValueFactory(idFac);
 		settingsDescriptionCol.setCellValueFactory(descFac);
@@ -113,7 +113,7 @@ public void initialize() {
 		settingsValueCol.setSortable(false);
 		settingsActionsCol.setSortable(false);
 		settingsActionsCol.setCellValueFactory(hasChangedFac);
-		settingsActionsCol.setCellFactory(ActionColumnCellFactoryReset);
+		settingsActionsCol.setCellFactory(ACTION_COLUMN_CELL_FACTORY_RESET);
 
 		hotkeysTable.setItems(hotkeysData);
 		settingsTable.setItems(settingsData);

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/galaxy/ext/LayoutExtensionReader.java

@@ -369,4 +369,13 @@ public boolean hasChanges() {
 		}
 		return false;
 	}
+	
+	public void updateValueDefsUnchangedState() {
+		for (final ValueDef setting : settings) {
+			setting.setOldValueToCurrent();
+		}
+		for (final TextValueDef hotkey : hotkeys) {
+			hotkey.setOldValueToCurrent();
+		}
+	}
 }

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/integration/RecentlyUsed.java

@@ -18,21 +18,23 @@
 @Slf4j
 public class RecentlyUsed {
 	private static final int MAX_RECENT_ELEMENTS = 5;
+	private static final String GALAXY_OBS_UI_SETTINGS_EDITOR_RECENT_BIN = ".GalaxyObsUiSettingsEditor/recent.bin";
+	private static final String USER_HOME = "user.home";
 
 	private final ArrayDeque<Path> recent = new ArrayDeque<>(MAX_RECENT_ELEMENTS);
 	private final Kryo kryo;
 
 	public RecentlyUsed() {
 		kryo = new Kryo(new ListReferenceResolver());
 		kryo.setRegistrationRequired(true);
-		loadItems(Path.of(System.getProperty("user.home"), ".GalaxyObsUiSettingsEditor/recent.bin"));
+		loadItems(Path.of(System.getProperty(USER_HOME), GALAXY_OBS_UI_SETTINGS_EDITOR_RECENT_BIN));
 	}
 
 	private void loadItems(final Path recentSaveFile) {
 		if (Files.exists(recentSaveFile)) {
 			try (final InflaterInputStream in = new InflaterInputStream(Files.newInputStream(recentSaveFile))) {
 				try (final Input input = new Input(in)) {
-					while (input.position() < input.limit()) {
+					while (input.available() > 0) {
 						Path path = Path.of(kryo.readObject(input, String.class));
 						if (Files.exists(path)) {
 							recent.add(path);
@@ -59,7 +61,7 @@ public void addRecent(final Path path) {
 			recent.pollFirst();
 		}
 		recent.add(path);
-		save(Path.of(System.getProperty("user.home"), ".GalaxyObsUiSettingsEditor/recent.bin"));
+		save(Path.of(System.getProperty("user.home"), GALAXY_OBS_UI_SETTINGS_EDITOR_RECENT_BIN));
 	}
 
 	private void save(final Path path) {

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/model/OptionValueDef.java

@@ -3,15 +3,19 @@
 import com.ahli.hotkey_ui.application.model.abstracts.ValueDef;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.value.ChangeListener;
+import lombok.Getter;
 
 import java.util.Arrays;
 import java.util.Locale;
 
 public class OptionValueDef extends ValueDef {
 
+	@Getter
 	protected final OptionValueDefType type;
 	private final String[] allowedValues;
+	@Getter
 	private final String[] allowedDisplayValues;
+	@Getter
 	private final String gamestringsAdd;
 	private final SimpleIntegerProperty selectedIndex;
 	private final SimpleIntegerProperty defaultSelectedIndex;
@@ -115,14 +119,6 @@ public void setSelectedIndex(final int selectedIndex) {
 		this.selectedIndex.set(selectedIndex);
 	}
 
-	public String getGamestringsAdd() {
-		return gamestringsAdd;
-	}
-	
-	public String[] getAllowedDisplayValues() {
-		return allowedDisplayValues;
-	}
-	
 	/**
 	 * Returns whether the value is the default value.
 	 *
@@ -133,10 +129,6 @@ public boolean isDefaultValue() {
 		return selectedIndex.get() == defaultSelectedIndex.get();
 	}
 
-	public OptionValueDefType getType() {
-		return type;
-	}
-	
 	@Override
 	public void addListener(final ChangeListener<Object> changeListener) {
 		selectedIndex.addListener(changeListener);
@@ -207,6 +199,11 @@ public String getDisplayValue() {
 		return allowedDisplayValues[selectedIndex.get()];
 	}
 
+	@Override
+	public void setOldValueToCurrent() {
+		oldSelectedIndex.set(selectedIndex.get());
+	}
+	
 	public SimpleIntegerProperty getSelectedIndexProperty() {
 		return selectedIndex;
 	}

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/model/TextValueDef.java

@@ -3,12 +3,14 @@
 import com.ahli.hotkey_ui.application.model.abstracts.ValueDef;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.value.ChangeListener;
+import lombok.Getter;
 
 import java.util.Locale;
 
 public class TextValueDef extends ValueDef {
 
 	private final SimpleStringProperty oldValue;
+	@Getter
 	private final TextValueDefType type;
 
 	public TextValueDef(final String id, final String description, final String defaultValue, final String typeStr) {
@@ -49,10 +51,6 @@ public void addListener(final ChangeListener<Object> changeListener) {
 		displayValue.addListener(changeListener);
 	}
 
-	public TextValueDefType getType() {
-		return type;
-	}
-	
 	@Override
 	public void resetToDefault() {
 		displayValue.set(defaultDisplayValue.get());
@@ -77,6 +75,11 @@ public String getDisplayValue() {
 		return displayValue.get();
 	}
 
+	@Override
+	public void setOldValueToCurrent() {
+		setOldValue(getValue());
+	}
+	
 	public void setOldValue(final String oldValue) {
 		this.oldValue.set(oldValue);
 	}

tools/observerUiSettingsEditor/project/src/main/java/com/ahli/hotkey_ui/application/model/abstracts/ValueDef.java

@@ -83,4 +83,6 @@ public SimpleBooleanProperty hasChangedProperty() {
 		return hasChanged;
 	}
 
+	// update old value, e.g. after saving
+	public abstract void setOldValueToCurrent();
 }