From e65ce87ec540a50a879998a18b4bff21763c63f7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 30 Apr 2025 19:49:19 +0200 Subject: rename class Control -> Controller --- Makefile | 2 +- .../dk/biks/bachelorizer/Control.java | 92 ---------------------- .../dk/biks/bachelorizer/Controller.java | 92 ++++++++++++++++++++++ .../dk/biks/bachelorizer/Window.java | 2 +- 4 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java create mode 100644 src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java diff --git a/Makefile b/Makefile index e6a8dc8..00cc814 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ JAVA_EXTRACLASSES_portfolio3 = AbstractGraph AdjListGraph AdjMapGraph \ JAVA_MODULEPATHS_bachelorizer = /usr/share/openjfx/lib JAVA_ROOT_bachelorizer = src/dk.biks.bachelorizer JAVA_MAINCLASSES_bachelorizer = Main Graph Window -JAVA_EXTRACLASSES_bachelorizer = Control GUI Person +JAVA_EXTRACLASSES_bachelorizer = Controller GUI Person JAVA_MODULES_bachelorizer = $(addprefix javafx.,base controls graphics) ZIPNAME = bachelorizer diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java deleted file mode 100644 index 93c0324..0000000 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java +++ /dev/null @@ -1,92 +0,0 @@ -// SPDX-FileCopyrightText: 2025 Jonas Smedegaard -// SPDX-License-Identifier: GPL-3.0-or-later - -package dk.biks.bachelorizer; - -import java.util.List; - -/// Bachelorizer - Controller -public class Control { - - /// Application model - // (declared explicitly only to silence javadoc) - private GUI model; - - /// Application view - private Window view; - - /// Parameters passed on command-line and in JNLP file - private List parameters; - - /// Default constructor - /// - /// @param model Application model - /// @param view Application view - public Control(final GUI model, final Window view) { - this.model = model; - this.view = view; - } - - /// parse application parameters - /// - /// parse parameters as GNU-style options and arguments, - /// i.e. treat dash-prefixed words as options - /// until an optional first bare "--", - /// taking first non-option argument as name of student - /// and remaining ones as activity selections - /// - /// @param parameters Application parameters - public final void setParameters(final List parameters) { - boolean optionsDone = false; - boolean studentAssigned = false; - for (String item: parameters) { - if (!optionsDone && item.matches("--")) { - optionsDone = true; - } else if (!item.startsWith("-")) { - if (!studentAssigned) { - model.addStudent(item); - studentAssigned = true; - showStudent(); - } else { - model.addActivity(item); - showActivities(); - } - } - } - } - - /// Enter activity - /// - /// @param s String entered - public final void enterActivity(final String s) { - model.addActivity(s); - view.clearActivityEntry(); - showActivities(); - } - - /// Display student - public final void showStudent() { - view.setStudentName(model.getStudentName()); - } - - /// Display list of activity entries - public final void showActivities() { - String toarea = ""; - for (String t: model.getActivities()) { - toarea += t + "\n"; - } - view.setArea(toarea); - } - - /// drop last activity entry - public final void delOne() { - model.delOneActivity(); - showActivities(); - } - - /// drop all activity entries - public final void delAll() { - model.delAllActivities(); - showActivities(); - } -} diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java new file mode 100644 index 0000000..ab62bfa --- /dev/null +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Controller.java @@ -0,0 +1,92 @@ +// SPDX-FileCopyrightText: 2025 Jonas Smedegaard +// SPDX-License-Identifier: GPL-3.0-or-later + +package dk.biks.bachelorizer; + +import java.util.List; + +/// Bachelorizer - Controller +public class Controller { + + /// Application model + // (declared explicitly only to silence javadoc) + private GUI model; + + /// Application view + private Window view; + + /// Parameters passed on command-line and in JNLP file + private List parameters; + + /// Default constructor + /// + /// @param model Application model + /// @param view Application view + public Controller(final GUI model, final Window view) { + this.model = model; + this.view = view; + } + + /// parse application parameters + /// + /// parse parameters as GNU-style options and arguments, + /// i.e. treat dash-prefixed words as options + /// until an optional first bare "--", + /// taking first non-option argument as name of student + /// and remaining ones as activity selections + /// + /// @param parameters Application parameters + public final void setParameters(final List parameters) { + boolean optionsDone = false; + boolean studentAssigned = false; + for (String item: parameters) { + if (!optionsDone && item.matches("--")) { + optionsDone = true; + } else if (!item.startsWith("-")) { + if (!studentAssigned) { + model.addStudent(item); + studentAssigned = true; + showStudent(); + } else { + model.addActivity(item); + showActivities(); + } + } + } + } + + /// Enter activity + /// + /// @param s String entered + public final void enterActivity(final String s) { + model.addActivity(s); + view.clearActivityEntry(); + showActivities(); + } + + /// Display student + public final void showStudent() { + view.setStudentName(model.getStudentName()); + } + + /// Display list of activity entries + public final void showActivities() { + String toarea = ""; + for (String t: model.getActivities()) { + toarea += t + "\n"; + } + view.setArea(toarea); + } + + /// drop last activity entry + public final void delOne() { + model.delOneActivity(); + showActivities(); + } + + /// drop all activity entries + public final void delAll() { + model.delAllActivities(); + showActivities(); + } +} diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java index fd1feb6..c129aad 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java @@ -40,7 +40,7 @@ public final class Window extends Application { private GUI model = new GUI(); /// Application controller - private Control control = new Control(model, this); + private Controller control = new Controller(model, this); /// Name of student private TextField nameEntry = new TextField(); -- cgit v1.2.3