merge project portfolio2 into bachelorizer, except class myDB

1 files changed, 27 insertions, 39 deletions

diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
index f3a399c..66c2565 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/GUI.java
@@ -3,58 +3,46 @@
 
 package dk.biks.bachelorizer;
 
-import java.util.ArrayList;
-
-/// Bachelorizer - GUI model
-public class GUI {
+/// Bachelorizer - graphical user interface model
+public class GUI extends UI {
 
 	/// Default constructor
 	// (declared explicitly only to silence javadoc)
 	public GUI() { }
 
-	/// Activity list
-	private Person student;
+	/// structural sections of user interface
+	public enum Section {
 
-	/// Activity list
-	private ArrayList<String> list = new ArrayList<>();
+		/// main programme
+		PROGRAM("Program", 0),
 
-	/// Add student
-	///
-	/// @param name  Name of student
-	public final void addStudent(final String name) {
-		student = new Person(name);
-	}
+		/// first subject module
+		SUBJECT1("Subject 1", 1),
 
-	/// Get student name
-	///
-	/// @return  name of student
-	public final String getStudentName() {
-		return student.name;
-	}
+		/// second subject module
+		SUBJECT2("Subject 2", 2),
 
-	/// Add activity to list
-	///
-	/// @param s  Activity to add
-	public final void addActivity(final String s) {
-		list.add(s);
-	}
+		/// elective courses
+		ELECTIVE("Elective", 3);
 
-	/// Get list of activities
-	///
-	/// @return  activity list
-	public final ArrayList<String> getActivities() {
-		return list;
-	}
+		/// text label
+		final String label;
+
+		/// column position
+		final int column;
 
-	/// Delete last activity from list
-	public final void delOneActivity() {
-		if (list.size() > 0) {
-			list.remove(list.size() - 1);
+		/// instantiation
+		///
+		/// @param label   text label
+		/// @param column  column position
+		Section(final String label, final int column) {
+			this.label = label;
+			this.column = column;
 		}
 	}
 
-	/// Delete all activities from list
-	public final void delAllActivities() {
-		list.clear();
+/*	public static UI.Section asUISection () {
+		return UI.Section.valueOf(this);
 	}
+*/
 }