OOP-Projects-Java

commit 903704067a719f4a0cd110046dac3607fbf4d8fc
parent 6bf00e7af52c1b5cdca21c0ecf62348aa49de4ab
Author: TranLili <tranlili96@gmail.com>
Date:   Wed, 15 Feb 2023 17:01:30 +0100

Change sort method to only sort when a task exists.

Diffstat:
M
OOP2023_a22willi_a21liltr_assignment2/src/assignment2/GUI.java
 | 
10
++++++----
M
OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java
 | 
4
++++

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/GUI.java b/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/GUI.java
@@ -87,10 +87,12 @@ public class GUI implements ActionListener {
 	public void actionPerformed(ActionEvent e) {
 		
 		if (e.getSource().equals(buttons.get("sort"))) {
-			//Open dialogue box where user can choose sorting algorithm
-			String[] sortingOptions = {"Alphabetical", "Type", "Completed"};
-			String selectedOption = selectionBox("Choose Sorting type", sortingOptions);
-			taskHandler.sort(selectedOption);
+			if (taskHandler.getTaskList().getComponentCount() != 0) {
+				//Open dialogue box where user can choose sorting algorithm
+				String[] sortingOptions = {"Alphabetical", "Type", "Completed"};
+				String selectedOption = selectionBox("Choose Sorting type", sortingOptions);
+				taskHandler.sort(selectedOption);
+			}
 		}
 		else {
 			Task t;	
diff --git a/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java b/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java
@@ -41,6 +41,10 @@ public class TaskHandler implements TaskListener {
 		return taskProgress;
 	}
 	
+	public JPanel getTaskList() {
+		return taskList;
+	}
+	
 	public void sort(String sortingOption) {
 		List<Task> sortedList = new ArrayList<Task>();
 		for (int i = 0; i < taskList.getComponentCount(); i++) {