split class HelloApplication into classes Main and Window

4 files changed, 27 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index ca6bf7a..2220379 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ JAVA_MODULEPATHS_portfolio2 = \
  /usr/share/openjfx/lib /usr/share/java/sqlite-jdbc.jar
 JAVA_MODULES_portfolio2 = $(addprefix javafx.,base controls graphics)
 JAVA_ROOT_portfolio2 = src/com.example.portfolio2
-JAVA_MAINCLASSES_portfolio2 = HelloApplication
-JAVA_EXTRACLASSES_portfolio2 = Controller Model MyDB
+JAVA_MAINCLASSES_portfolio2 = Main
+JAVA_EXTRACLASSES_portfolio2 = Controller Model MyDB Window
 JAVA_ROOT_portfolio3 = src/com.example.portfolio3
 JAVA_EXTRACLASSES_portfolio3 = AbstractGraph AdjListGraph AdjMapGraph \
  Edge EdgeGraph GraphAlgorithms Graph Graphs MatrixGraph Vertex
diff --git a/src/com.example.portfolio2/com/example/portfolio2/Controller.java b/src/com.example.portfolio2/com/example/portfolio2/Controller.java
index f38a3ca..2212396 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/Controller.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/Controller.java
@@ -18,7 +18,7 @@ class Controller{
 	private Model model;
 
 	/// Application view
-	private HelloApplication view;
+	private Window view;
 
 	/// clear the participation database at program launch
 	void initialize() {
@@ -29,7 +29,7 @@ class Controller{
 	///
 	/// @param model  Application model
 	/// @param view   Application view
-	Controller(Model model, HelloApplication view){
+	Controller(Model model, Window view){
 		this.model=model; this.view=view;
 	}
 
diff --git a/src/com.example.portfolio2/com/example/portfolio2/Main.java b/src/com.example.portfolio2/com/example/portfolio2/Main.java
new file mode 100644
index 0000000..da6524a
--- /dev/null
+++ b/src/com.example.portfolio2/com/example/portfolio2/Main.java
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: <Alexander Marthin Klemensen stud-marthin@ruc.dk>
+// SPDX-FileCopyrightText: <Ian Valentin Christensen stud-ianc@ruc.dk>
+// SPDX-FileCopyrightText: <Zahed Noos zahed@ruc.dk>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.example.portfolio2;
+
+/// Bachelorizer - bachelor programme registrar
+public final class Main {
+
+	/// Default constructor
+	// (declared explicitly only to silence javadoc)
+	public Main() {}
+
+	/// JVM entry point
+	///
+	/// @param args  command-line arguments
+	public static void main(String[] args) {
+		Window.main(args);
+	}
+}
diff --git a/src/com.example.portfolio2/com/example/portfolio2/HelloApplication.java b/src/com.example.portfolio2/com/example/portfolio2/Window.java
index e79dbda..730741a 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/HelloApplication.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/Window.java
@@ -20,11 +20,11 @@ import java.util.List;
 /// Bachelorizer - JavaFX Window view
 // Class is final to forbid subclassing,
 // because object is passed to controller during instantiation
-public final class HelloApplication extends Application {
+public final class Window extends Application {
 
 	/// Default constructor
 	// (declared explicitly only to silence javadoc)
-	public HelloApplication(){}
+	public Window() {}
 
 	/// Label styling
 	public static final String LABEL_STYLE =