summaryrefslogtreecommitdiffstats
path: root/src/se
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2021-01-28 11:07:46 +0100
committerGustav Sörnäs <gustav@sornas.net>2021-01-28 11:07:46 +0100
commit9010b4aaa07a11572c4002abd2bcf289171cc4d2 (patch)
treee024f02d6dbc3359999dfd366e28b24d7af943e0 /src/se
parent1e3bffa3502ad6fdc93f6ec5d6cf2c6138b6929a (diff)
downloadtdde30-9010b4aaa07a11572c4002abd2bcf289171cc4d2.tar.gz
code analysis
Diffstat (limited to 'src/se')
-rw-r--r--src/se/liu/gusso230/calendar/Month.java28
-rw-r--r--src/se/liu/gusso230/tetris/Board.java2
-rw-r--r--src/se/liu/gusso230/tetris/BoardTester.java2
-rw-r--r--src/se/liu/gusso230/tetris/Point.java4
-rw-r--r--src/se/liu/gusso230/tetris/Poly.java4
-rw-r--r--src/se/liu/gusso230/tetris/TetrominoMaker.java2
6 files changed, 12 insertions, 30 deletions
diff --git a/src/se/liu/gusso230/calendar/Month.java b/src/se/liu/gusso230/calendar/Month.java
index c793e92..8f863c6 100644
--- a/src/se/liu/gusso230/calendar/Month.java
+++ b/src/se/liu/gusso230/calendar/Month.java
@@ -28,7 +28,7 @@ public class Month {
* @param name the name of the month
* @return the index, starting at 1. -1 if the name is unknown
*/
- static int getMonthNumber(String name) {
+ public static int getMonthNumber(String name) {
switch (name) {
case "January":
return 1;
@@ -64,32 +64,14 @@ public class Month {
* @param name the name of the month
* @return the amount of days. -1 if the name is unknown
*/
- static int getMonthDays(String name) {
+ public static int getMonthDays(String name) {
switch (name) {
- case "January":
+ case "January", "March", "May", "July", "August", "October", "December":
return 31;
+ case "April", "June", "September", "November":
+ return 30;
case "February":
return 28;
- case "March":
- return 31;
- case "April":
- return 30;
- case "May":
- return 31;
- case "June":
- return 30;
- case "July":
- return 31;
- case "August":
- return 31;
- case "September":
- return 30;
- case "October":
- return 31;
- case "November":
- return 30;
- case "December":
- return 31;
default:
return -1;
}
diff --git a/src/se/liu/gusso230/tetris/Board.java b/src/se/liu/gusso230/tetris/Board.java
index 947877a..7a70673 100644
--- a/src/se/liu/gusso230/tetris/Board.java
+++ b/src/se/liu/gusso230/tetris/Board.java
@@ -7,7 +7,7 @@ public class Board {
private int width;
private int height;
- private Poly falling;
+ private Poly falling = null;
private int fallingX;
private int fallingY;
diff --git a/src/se/liu/gusso230/tetris/BoardTester.java b/src/se/liu/gusso230/tetris/BoardTester.java
index 487107a..a8dc257 100644
--- a/src/se/liu/gusso230/tetris/BoardTester.java
+++ b/src/se/liu/gusso230/tetris/BoardTester.java
@@ -14,7 +14,7 @@ public class BoardTester {
System.out.println(converter.toText(board));
System.out.println("-".repeat(board.getWidth()));
- board.getFalling().rotateCW();
+ board.getFalling().rotateClockWise();
System.out.println(converter.toText(board));
System.out.println("-".repeat(board.getWidth()));
diff --git a/src/se/liu/gusso230/tetris/Point.java b/src/se/liu/gusso230/tetris/Point.java
index 2b6e3a7..abae6af 100644
--- a/src/se/liu/gusso230/tetris/Point.java
+++ b/src/se/liu/gusso230/tetris/Point.java
@@ -21,9 +21,9 @@ public class Point {
* Rotates this point one step clockwise.
* @param boundingBoxSize the size of the bounding box this point should be rotated with respect to.
*/
- public void rotateCW(int boundingBoxSize) {
+ public void rotateClockWise(int boundingBoxSize) {
int prevX = x;
x = boundingBoxSize - y;
- y = prevX; // IntelliJ marks this as suspiscious but I assure you, it is intended.
+ y = prevX; // This looks suspicious but it's intended. (x, y) => (s - y, x)
}
}
diff --git a/src/se/liu/gusso230/tetris/Poly.java b/src/se/liu/gusso230/tetris/Poly.java
index 4de957c..8d9778b 100644
--- a/src/se/liu/gusso230/tetris/Poly.java
+++ b/src/se/liu/gusso230/tetris/Poly.java
@@ -40,9 +40,9 @@ public class Poly {
/**
* Rotates all the poly's points one step clockwise.
*/
- public void rotateCW() {
+ public void rotateClockWise() {
for (Point point : points) {
- point.rotateCW(boundingBoxSize);
+ point.rotateClockWise(boundingBoxSize);
}
}
diff --git a/src/se/liu/gusso230/tetris/TetrominoMaker.java b/src/se/liu/gusso230/tetris/TetrominoMaker.java
index b24c00e..33e709c 100644
--- a/src/se/liu/gusso230/tetris/TetrominoMaker.java
+++ b/src/se/liu/gusso230/tetris/TetrominoMaker.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
public class TetrominoMaker {
- List<Poly> polys;
+ private List<Poly> polys;
public TetrominoMaker() {
polys = new ArrayList<>();