From 492a3b4a873c23a5ed1afe87d9921faca742618f Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 30 Apr 2025 22:43:46 +0200 Subject: improve separation of concerns between view and controller --- .../dk/biks/bachelorizer/Controller.java | 17 +++++------------ .../dk/biks/bachelorizer/Window.java | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java index 63eac9d..64eeabc 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java @@ -92,17 +92,17 @@ class Controller { /// callback when activity has been selected /// - /// @param combo involved activity box - /// @param select selected item - /// @param area whole text area + /// @param combo involved activity box + /// @param item selected activity + /// @param area whole text area void onActivitySelected( final ComboBox combo, - final ComboBox select, + final String item, final TextArea area ) { // pass the value chosen in the box - addActivity(select.getValue(), area); + store.addParticipation(store.getActivityIndeks(item)); // update text area based on category choice // @@ -134,13 +134,6 @@ class Controller { } } - /// add participation to database - /// @param s activity identifier - /// @param textArea whole text area - void addActivity(final String s, final TextArea textArea) { - store.addParticipation(store.getActivityIndeks(s)); - } - /// update text area for an activity box /// /// Clears the text area diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java index 6c21db5..ba3033a 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java @@ -97,7 +97,7 @@ public final class Window extends Application { col.activitySelect.setOnAction(event -> { control.onActivitySelected( col.categoryCombo, - col.activitySelect, + col.activitySelect.getValue(), col.area); control.updateEcts( col.ectsLabel, -- cgit v1.2.3