#178: transform settings table to key-value table for easier extesion (not all done yet)

Author: Death111

src/main/java/de/doubleslash/keeptime/App.java

@@ -78,6 +78,7 @@ public class App extends Application {
    private ViewController viewController;
 
    private GlobalScreenListener globalScreenListener;
+   private Settings settings;
 
    @Override
    public void init() throws Exception {
@@ -95,6 +96,7 @@ public void init() throws Exception {
 
       model = springContext.getBean(Model.class);
       controller = springContext.getBean(Controller.class);
+      settings = springContext.getBean(Settings.class);
       controller.enableAutoSave();
       model.setSpringContext(springContext);
    }
@@ -183,11 +185,8 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
    private void readSettings() {
       LOG.debug("Reading configuration");
 
-      final List<Settings> settingsList = model.getSettingsRepository().findAll();
-      final Settings settings;
-      if (settingsList.isEmpty()) {
+      if (false) {
          LOG.info("Empty settings. Set default");
-         settings = new Settings();
          settings.setTaskBarColor(model.taskBarColor.get());
 
          settings.setDefaultBackgroundColor(Model.ORIGINAL_DEFAULT_BACKGROUND_COLOR);
@@ -198,10 +197,8 @@ private void readSettings() {
          settings.setUseHotkey(false);
          settings.setDisplayProjectsRight(false);
          settings.setHideProjectsOnMouseExit(false);
-         model.getSettingsRepository().save(settings);
       } else {
          LOG.info("Got settings from database");
-         settings = settingsList.get(0);
       }
 
       model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -44,11 +44,13 @@ public class Controller {
    private Interval autoSaveInterval;
 
    private final Model model;
+   private final Settings settings;
 
    private final DateProvider dateProvider;
 
-   public Controller(final Model model, final DateProvider dateProvider) {
+   public Controller(final Model model, Settings settings, final DateProvider dateProvider) {
       this.model = model;
+      this.settings = settings;
       this.dateProvider = dateProvider;
    }
 
@@ -118,7 +120,6 @@ public void addNewProject(final Project project) {
    }
 
    public void updateSettings(final Settings newValuedSettings) {
-      Settings settings = model.getSettingsRepository().findAll().get(0);
 
       settings.setTaskBarColor(newValuedSettings.getTaskBarColor());
       settings.setDefaultBackgroundColor(newValuedSettings.getDefaultBackgroundColor());
@@ -136,8 +137,6 @@ public void updateSettings(final Settings newValuedSettings) {
       settings.setRemindIfNotesAreEmptyOnlyForWorkEntry(newValuedSettings.isRemindIfNotesAreEmptyOnlyForWorkEntry());
       settings.setConfirmClose(newValuedSettings.isConfirmClose());
 
-      settings = model.getSettingsRepository().save(settings);
-
       model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());
       model.defaultFontColor.set(settings.getDefaultFontColor());
       model.hoverBackgroundColor.set(settings.getHoverBackgroundColor());
@@ -163,14 +162,14 @@ public void shutdown() {
       changeProject(model.getIdleProject(), 0);
 
       LOG.info("Updating settings to persist local changes on shutdown.");
-      final Settings newSettings = new Settings(model.hoverBackgroundColor.get(), model.hoverFontColor.get(),
+      /*final Settings newSettings = new Settings(model.hoverBackgroundColor.get(), model.hoverFontColor.get(),
             model.defaultBackgroundColor.get(), model.defaultFontColor.get(), model.taskBarColor.get(),
             model.useHotkey.get(), model.displayProjectsRight.get(), model.hideProjectsOnMouseExit.get(),
             model.screenSettings.proportionalX.get(), model.screenSettings.proportionalY.get(),
             model.screenSettings.screenHash.get(), model.screenSettings.saveWindowPosition.get(),
             model.remindIfNotesAreEmpty.get(), model.remindIfNotesAreEmptyOnlyForWorkEntry.get(),
             model.confirmClose.get());
-      updateSettings(newSettings);
+      updateSettings(newSettings);*/
    }
 
    public void deleteProject(final Project p) {

src/main/java/de/doubleslash/keeptime/model/Setting.java

@@ -0,0 +1,41 @@
+package de.doubleslash.keeptime.model;
+
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = "Settings")
+public class Setting {
+
+   @Id
+   @Column(nullable = false, unique = true)
+   private String setting;
+
+   @Lob
+   private String settingValue;
+
+   public Setting(){
+      // for hibernate
+   }
+
+   public Setting(final String setting, final String settingValue) {
+      this.setting = setting;
+      this.settingValue = settingValue;
+   }
+
+   public String getSetting() {
+      return setting;
+   }
+
+   public void setSetting(final String setting) {
+      this.setting = setting;
+   }
+
+   public String getSettingValue() {
+      return settingValue;
+   }
+
+   public void setSettingValue(final String settingValue) {
+      this.settingValue = settingValue;
+   }
+
+}