OOP-Projects-Java

commit ff3ebd978a68e3b68988c22c78085670563470df
parent 07a4a634521dd39c93d61aef14f808586d89f667
Author: TranLili <tranlili96@gmail.com>
Date:   Tue, 14 Mar 2023 21:59:49 +0100

Fixed grid.

Diffstat:
M
OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java
 | 
10
++++++++--
M
OOP2023_a22willi_a21liltr_assignment4/src/blocks/Cell.java
 | 
1
+
M
OOP2023_a22willi_a21liltr_assignment4/src/game/Board.java
 | 
5
+++--

3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java b/OOP2023_a22willi_a21liltr_assignment2/src/assignment2/TaskHandler.java
@@ -2,6 +2,7 @@ package assignment2;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.swing.BoxLayout;
@@ -13,7 +14,7 @@ import javax.swing.SwingUtilities;
 import se.his.it401g.todo.Task;
 import se.his.it401g.todo.TaskListener;
 
-public class TaskHandler implements TaskListener {
+public class TaskHandler implements TaskListener, Comparator<Task> {
 	private JPanel taskList;
 	private JScrollPane scrollPane;
 	private JLabel taskProgress;
@@ -65,6 +66,12 @@ public class TaskHandler implements TaskListener {
 	 * Sorts components in taskList according to specific requirements.
 	 * @param sortingOption
 	 */
+	@Override
+	public int compare(Object o1, Object o2) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	
 	public void sort(String sortingOption) {
 		List<Task> sortedList = new ArrayList<Task>();
 		for (int i = 0; i < taskList.getComponentCount(); i++) {
@@ -182,5 +189,4 @@ public class TaskHandler implements TaskListener {
 		// TODO Auto-generated method stub
 		
 	}
-
 }
diff --git a/OOP2023_a22willi_a21liltr_assignment4/src/blocks/Cell.java b/OOP2023_a22willi_a21liltr_assignment4/src/blocks/Cell.java
@@ -13,6 +13,7 @@ public class Cell {
 	public Cell(Graphics g, int x, int y, Dimension size) {
 		this.g = g;
 		this.size = size;
+		g.setColor(Color.black);
 		g.drawRect(x, y, size.width, size.height);
 	}
 	
diff --git a/OOP2023_a22willi_a21liltr_assignment4/src/game/Board.java b/OOP2023_a22willi_a21liltr_assignment4/src/game/Board.java
@@ -13,8 +13,10 @@ import blocks.Cell;
 public class Board extends JPanel {
 	//size of window
 	private final Dimension size = new Dimension(595, 797);
+	
 	//size of each individual tile
 	private final int tileSize = 20;
+	private final Dimension tileDim = new Dimension(tileSize, tileSize);
 	
 	private Cell[][] grid;
 	
@@ -33,14 +35,13 @@ public class Board extends JPanel {
 		g.setColor(Color.gray);
 		g.fillRect(0, 0, size.width, size.height);
 		generateGrid(g);
-		
 	}
 	
 	
 	private void generateGrid(Graphics g) {
 		for (int x = 0; x < Math.abs(size.width / tileSize); x++) {
 			for (int y = 0; y < Math.abs(size.height / tileSize); y++) {
-				grid[y][x] = new Cell(g, y, x, size);
+				grid[x][y] = new Cell(g, (x*tileSize), (y*tileSize), tileDim);
 			}
 		}
 	}