diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java | 1 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Main.java | 10 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java (renamed from src/dk.biks.bachelorizer/dk/biks/bachelorizer/view/Window.java) | 5 |
4 files changed, 5 insertions, 15 deletions
@@ -7,8 +7,8 @@ JAVA_MODULEPATHS_bachelorizer = /usr/share/openjfx/lib # TODO: fix properly declare and resolve local interdependencies JAVA_MODULEPATHS_bachelorizer = /usr/share/openjfx/lib mods/com.example.portfolio3 JAVA_ROOT_bachelorizer = src/dk.biks.bachelorizer -JAVA_MAINCLASSES_bachelorizer = Main model/Combi view/Window -JAVA_EXTRACLASSES_bachelorizer = model/GUI model/Person view/Window Control +JAVA_MAINCLASSES_bachelorizer = Main model/Combi Window +JAVA_EXTRACLASSES_bachelorizer = model/GUI model/Person Control JAVA_MODULES_bachelorizer = $(addprefix javafx.,base controls graphics) DOCUMENTS = delivery1 delivery2 diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java index b53fb9f..985c026 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java @@ -6,7 +6,6 @@ package dk.biks.bachelorizer; import java.util.List; import dk.biks.bachelorizer.model.GUI; -import dk.biks.bachelorizer.view.Window; /// Bachelorizer - Controller public class Control{ diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Main.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Main.java index 2efd5b8..55ae0c1 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Main.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Main.java @@ -6,14 +6,6 @@ package dk.biks.bachelorizer; import java.lang.UnsupportedOperationException; import java.util.Arrays; -/* TODO -import dk.biks.bachelorizer.view.Oneshot; -import dk.biks.bachelorizer.view.Prompt; -import dk.biks.bachelorizer.view.Pipe; -import dk.biks.bachelorizer.view.Screen; -*/ -import dk.biks.bachelorizer.view.Window; - /// Bachelorizer - bachelor programme registrar /// /// Tool for registering students @@ -41,7 +33,7 @@ public class Main { switch (uiFromArgs(args)) { case "gui" -> { Window.main(args); } // TODO case "tui" -> { Screen.main(args); } -// TODO case "cli" -> { Line.main(args); } +// TODO case "cli" -> { Prompt.main(args); } default -> { throw new UnsupportedOperationException( "Not yet implemented."); diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/view/Window.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java index c75e290..7bdc88a 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/view/Window.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2025 Jonas Smedegaard <dr@jones.dk> // SPDX-License-Identifier: GPL-3.0-or-later -package dk.biks.bachelorizer.view; +package dk.biks.bachelorizer; import java.util.List; import javafx.application.Application; @@ -14,13 +14,12 @@ import javafx.scene.layout.VBox; import javafx.scene.Scene; import javafx.stage.Stage; -import dk.biks.bachelorizer.Control; import dk.biks.bachelorizer.model.GUI; /// Bachelorizer - JavaFX Window view // Class is final to forbid subclassing, // because object is passed to controller during instatiation -public final class Window extends Application { // the View +public final class Window extends Application { /// Default constructor // (declared explicitly only to silence javadoc) |