From b27f786c559aef349c78bc788242d620aace5f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Thu, 5 Oct 2023 14:07:18 +0200
Subject: [PATCH] Use java 17.
Use simple implementation for equals.
---
pom.xml | 14 ++----------
src/main/java/cz/jezek/lab11/Player.java | 29 +++++++-----------------
src/main/java/module-info.java | 3 ---
3 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 36e736a..ed459b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,20 +8,10 @@
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-controls</artifactId>
- <version>11</version>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>11</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/src/main/java/cz/jezek/lab11/Player.java b/src/main/java/cz/jezek/lab11/Player.java
index e31b539..743165f 100644
--- a/src/main/java/cz/jezek/lab11/Player.java
+++ b/src/main/java/cz/jezek/lab11/Player.java
@@ -1,5 +1,7 @@
package cz.jezek.lab11;
+import java.util.Objects;
+
public class Player {
private String firstName;
@@ -34,33 +36,18 @@ public class Player {
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((firstName == null) ? 0 : firstName.hashCode());
- result = prime * result + ((lastName == null) ? 0 : lastName.hashCode());
- return result;
+ return Objects.hash(firstName, lastName);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Player other = (Player) obj;
- if (firstName == null) {
- if (other.firstName != null)
- return false;
- } else if (!firstName.equals(other.firstName))
- return false;
- if (lastName == null) {
- if (other.lastName != null)
- return false;
- } else if (!lastName.equals(other.lastName))
- return false;
- return true;
+ if (obj instanceof Player other) {
+ return Objects.equals(firstName, other.firstName) && Objects.equals(lastName, other.lastName);
+ }
+ return false;
+
}
@Override
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index edc025f..019bbf4 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,6 +1,3 @@
module cz.jezek.lab10 {
- requires transitive javafx.controls;
- requires javafx.fxml;
- opens cz.jezek.lab11 to javafx.fxml;
exports cz.jezek.lab11;
}
\ No newline at end of file
--
GitLab