diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2025-04-27 17:05:42 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2025-04-27 17:05:42 +0200 |
| commit | bb7d195e0167b08d3f5ed59dc28e72b3a298a3f6 (patch) | |
| tree | 51c3073fc37e4df7d4815d2c698b25162a048821 /src/dk.biks.bachelorizer/dk | |
| parent | 6a6df49297419b38182e876183c59379677a13ae (diff) | |
simplify: merge subpackage model into main package
Diffstat (limited to 'src/dk.biks.bachelorizer/dk')
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java (renamed from src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Combi.java) | 2 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java | 2 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java (renamed from src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/GUI.java) | 4 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Person.java (renamed from src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Person.java) | 2 | ||||
| -rw-r--r-- | src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Combi.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java index 371eb79..78a1ee0 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Combi.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.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.model; +package dk.biks.bachelorizer; import java.util.Collection; import java.util.Set; diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java index 985c026..320b36c 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Control.java @@ -5,8 +5,6 @@ package dk.biks.bachelorizer; import java.util.List; -import dk.biks.bachelorizer.model.GUI; - /// Bachelorizer - Controller public class Control{ diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/GUI.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java index ca9bd86..695c19c 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/GUI.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java @@ -1,12 +1,10 @@ // SPDX-FileCopyrightText: 2025 Jonas Smedegaard <dr@jones.dk> // SPDX-License-Identifier: GPL-3.0-or-later -package dk.biks.bachelorizer.model; +package dk.biks.bachelorizer; import java.util.ArrayList; -import dk.biks.bachelorizer.model.Person; - /// Bachelorizer - GUI model public class GUI{ diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Person.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Person.java index 9edb7af..f7eeab3 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/model/Person.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Person.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.model; +package dk.biks.bachelorizer; /// Bachelorizer - Person model public class Person { diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java index 7bdc88a..85638c8 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Window.java @@ -14,8 +14,6 @@ import javafx.scene.layout.VBox; import javafx.scene.Scene; import javafx.stage.Stage; -import dk.biks.bachelorizer.model.GUI; - /// Bachelorizer - JavaFX Window view // Class is final to forbid subclassing, // because object is passed to controller during instatiation |