OOP-Projects-Java

commit 6bf00e7af52c1b5cdca21c0ecf62348aa49de4ab
parent f9c5c72f1f9f5aad5c7eca831456211b04d92a20
Author: TranLili <tranlili96@gmail.com>
Date:   Wed, 15 Feb 2023 16:36:53 +0100

Changed var names for uniform and consistent naming format.

Diffstat:
M
OOP2023_a22willi_a21liltr_assignment2/src/assignment2/GUI.java
 | 
19
+++++++++----------
M
OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java
 | 
6
+++---

2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/GUI.java b/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/GUI.java
@@ -3,7 +3,6 @@ package assignment2;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.*;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,8 +42,8 @@ public class GUI implements ActionListener {
 		frame.add(menu, BorderLayout.NORTH);
 		
 		taskHandler = new TaskHandler();
-		frame.add(taskHandler.GetScrollPane());
-		frame.add(taskHandler.GetTaskProgress(), BorderLayout.SOUTH);
+		frame.add(taskHandler.getScrollPane());
+		frame.add(taskHandler.getTaskProgress(), BorderLayout.SOUTH);
 		
 		frame.setVisible(true);
 	}
@@ -63,13 +62,13 @@ public class GUI implements ActionListener {
 	
 	
 	/*
-	 * Used to create generic dialogueboxes
+	 * Used to create generic dialogue boxes
 	 * 
 	 * @param 	String[] options List of options available to the user.
 	 * @param 	String label 	 Title shown to user during selection process.
 	 * @return	String 			 value of selected option.
 	 */
-	public String SelectionBox(String label, String[] options) {
+	public String selectionBox(String label, String[] options) {
 		Object selected = JOptionPane.showInputDialog(null, "Choose sorting type", "Selection", JOptionPane.DEFAULT_OPTION, null, options, "0");
 		if ( selected != null ) {
 		    return selected.toString(); //return selected option.
@@ -80,18 +79,18 @@ public class GUI implements ActionListener {
 	
 	
 	/*
-	 * Handles actions performed by the user eg buttonclicks.
+	 * Handles actions performed by the user e.g. button clicks.
 	 * 
-	 * @param ActionEvent e tracks all occuring events.
+	 * @param ActionEvent e tracks all occurring events.
 	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		
 		if (e.getSource().equals(buttons.get("sort"))) {
-			//Open dialoguebox where user can choose sorting algorithm
+			//Open dialogue box where user can choose sorting algorithm
 			String[] sortingOptions = {"Alphabetical", "Type", "Completed"};
-			String selectedOption = SelectionBox("Choose Sorting type", sortingOptions);
-			taskHandler.Sort(selectedOption);
+			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
@@ -33,15 +33,15 @@ public class TaskHandler implements TaskListener {
 		updateTaskProgress();
 	}
 	
-	public JScrollPane GetScrollPane() {
+	public JScrollPane getScrollPane() {
 		return scrollPane;
 	}
 	
-	public JLabel GetTaskProgress() {
+	public JLabel getTaskProgress() {
 		return taskProgress;
 	}
 	
-	public void Sort(String sortingOption) {
+	public void sort(String sortingOption) {
 		List<Task> sortedList = new ArrayList<Task>();
 		for (int i = 0; i < taskList.getComponentCount(); i++) {
 			sortedList.add((Task)taskList.getComponent(i));