diff --git a/java2-lab02-common-v3/.gitignore b/java2-lab02-common-v3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..98b99a551e28559528e090cbfc676dcff9bd7def
--- /dev/null
+++ b/java2-lab02-common-v3/.gitignore
@@ -0,0 +1,16 @@
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
diff --git a/java2-lab02-common-v3/pom.xml b/java2-lab02-common-v3/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b171bf29b9be1dbe741d1da5c486afce8df2e551
--- /dev/null
+++ b/java2-lab02-common-v3/pom.xml
@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-common-v3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>java2-lab02-common-v3</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.release>21</maven.compiler.release>
+ <JUnit.version>5.11.0</JUnit.version>
+ <log4j.version>2.23.1</log4j.version>
+ <lombok.version>1.18.34</lombok.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${JUnit.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/main/java/lab/Score.java b/java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/Score.java
similarity index 98%
rename from src/main/java/lab/Score.java
rename to java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/Score.java
index 70d137ac13f30db887a2a8be3cbfafd2ff41ee73..cb962bdf72e3ae81b92bd0e20bd87ff74d9be3f5 100644
--- a/src/main/java/lab/Score.java
+++ b/java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/Score.java
@@ -1,4 +1,4 @@
-package lab;
+package cz.vsb.fei.java2.lab02.common;
import java.util.Random;
diff --git a/java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/ScoreStorageInterface.java b/java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/ScoreStorageInterface.java
new file mode 100644
index 0000000000000000000000000000000000000000..deb19b3972a81ffa7a3dbc68a512ac96666c4f7c
--- /dev/null
+++ b/java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/ScoreStorageInterface.java
@@ -0,0 +1,15 @@
+package cz.vsb.fei.java2.lab02.common;
+
+import java.util.List;
+
+public interface ScoreStorageInterface {
+
+ List<Score> getAll();
+
+ List<Score> getFirstTen();
+
+ void init();
+
+ void insertScore(Score score);
+
+}
\ No newline at end of file
diff --git a/java2-lab02-common-v3/src/main/java/module-info.java b/java2-lab02-common-v3/src/main/java/module-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..e9edf40111700e7315c7992a3c5f0eee930fb438
--- /dev/null
+++ b/java2-lab02-common-v3/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module cz.vsb.fei.java2.lab02.common_module {
+ requires static lombok;
+ requires org.apache.logging.log4j;
+ exports cz.vsb.fei.java2.lab02.common;
+}
\ No newline at end of file
diff --git a/java2-lab02-common-v3/src/test/java/cz/vsb/fei/java2/lab01/AppTest.java b/java2-lab02-common-v3/src/test/java/cz/vsb/fei/java2/lab01/AppTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9102a3af357bbfe62c176afc996a511c63fde18c
--- /dev/null
+++ b/java2-lab02-common-v3/src/test/java/cz/vsb/fei/java2/lab01/AppTest.java
@@ -0,0 +1,19 @@
+package cz.vsb.fei.java2.lab01;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit test for simple App.
+ */
+class AppTest {
+
+ /**
+ * Rigorous Test :-)
+ */
+ @Test
+ void shouldAnswerWithTrue() {
+ assertTrue(true);
+ }
+}
diff --git a/java2-lab02-db-v3/.gitignore b/java2-lab02-db-v3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..98b99a551e28559528e090cbfc676dcff9bd7def
--- /dev/null
+++ b/java2-lab02-db-v3/.gitignore
@@ -0,0 +1,16 @@
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
diff --git a/java2-lab02-db-v3/pom.xml b/java2-lab02-db-v3/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3fb125618cbcccf91394ed31e251693838c5fdb
--- /dev/null
+++ b/java2-lab02-db-v3/pom.xml
@@ -0,0 +1,90 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-db-v3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>java2-lab02-db-v3</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.release>21</maven.compiler.release>
+ <JUnit.version>5.11.0</JUnit.version>
+ <log4j.version>2.23.1</log4j.version>
+ <lombok.version>1.18.34</lombok.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${JUnit.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-common-v3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>2.3.232</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/main/java/lab/DbConnector.java b/java2-lab02-db-v3/src/main/java/cz/vsb/fei/java2/lab02/db/DbConnector.java
similarity index 86%
rename from src/main/java/lab/DbConnector.java
rename to java2-lab02-db-v3/src/main/java/cz/vsb/fei/java2/lab02/db/DbConnector.java
index d7a0594cf69ca3baa2910308fc4b8b8d1cb5b0bb..4f8c076a132951c88211aa4b5739bab926841461 100644
--- a/src/main/java/lab/DbConnector.java
+++ b/java2-lab02-db-v3/src/main/java/cz/vsb/fei/java2/lab02/db/DbConnector.java
@@ -1,4 +1,4 @@
-package lab;
+package cz.vsb.fei.java2.lab02.db;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -9,14 +9,19 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
-public class DbConnector {
+import cz.vsb.fei.java2.lab02.common.Score;
+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+
+public class DbConnector implements ScoreStorageInterface {
private static final String JDBC_CONECTIN_STRING = "jdbc:h2:file:./scoreDB";
+ @Override
public List<Score> getAll() {
return queryScore("select * from scores;");
}
+ @Override
public List<Score> getFirstTen() {
return queryScore("select * from scores order by points desc limit 10;");
}
@@ -35,6 +40,7 @@ public class DbConnector {
return result;
}
+ @Override
public void init() {
try (Connection con = DriverManager.getConnection(JDBC_CONECTIN_STRING);
Statement stm = con.createStatement();) {
@@ -44,6 +50,7 @@ public class DbConnector {
}
}
+ @Override
public void insertScore(Score score) {
try (Connection con = DriverManager.getConnection(JDBC_CONECTIN_STRING);
PreparedStatement stm = con.prepareStatement("INSERT INTO scores VALUES (?, ?)");) {
diff --git a/java2-lab02-db-v3/src/main/java/module-info.java b/java2-lab02-db-v3/src/main/java/module-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..b10ea8f1684ce4bf06a27bf5cb036b4515a18ee8
--- /dev/null
+++ b/java2-lab02-db-v3/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+import cz.vsb.fei.java2.lab02.db.DbConnector;
+
+module cz.vsb.fei.java2.lab02.db_module {
+ requires static lombok;
+ requires org.apache.logging.log4j;
+ requires transitive cz.vsb.fei.java2.lab02.common_module;
+ requires java.sql;
+ exports cz.vsb.fei.java2.lab02.db;
+ provides ScoreStorageInterface with cz.vsb.fei.java2.lab02.db.DbConnector;
+}
\ No newline at end of file
diff --git a/java2-lab02-db-v3/src/main/resources/log4j2.xml b/java2-lab02-db-v3/src/main/resources/log4j2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..acb3514078f6fb73f4f09ffd7a172b47f184e961
--- /dev/null
+++ b/java2-lab02-db-v3/src/main/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<Configuration>
+ <Appenders>
+ <Console name="Console">
+ <PatternLayout
+ pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="info">
+ <AppenderRef ref="Console"></AppenderRef>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/java2-lab02-file-v3/.gitignore b/java2-lab02-file-v3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..98b99a551e28559528e090cbfc676dcff9bd7def
--- /dev/null
+++ b/java2-lab02-file-v3/.gitignore
@@ -0,0 +1,16 @@
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
diff --git a/java2-lab02-file-v3/pom.xml b/java2-lab02-file-v3/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..667061c330b38f8cac9c629918e0cb2c9e27481b
--- /dev/null
+++ b/java2-lab02-file-v3/pom.xml
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-file-v3</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>java2-lab02-file-v3</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.release>21</maven.compiler.release>
+ <JUnit.version>5.11.0</JUnit.version>
+ <log4j.version>2.23.1</log4j.version>
+ <lombok.version>1.18.34</lombok.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${JUnit.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-common-v3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.5.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/java2-lab02-file-v3/src/main/java/cz/vsb/fei/file/FileStorage.java b/java2-lab02-file-v3/src/main/java/cz/vsb/fei/file/FileStorage.java
new file mode 100644
index 0000000000000000000000000000000000000000..291811e791de17b965a9b609bfdbaaf53dad998e
--- /dev/null
+++ b/java2-lab02-file-v3/src/main/java/cz/vsb/fei/file/FileStorage.java
@@ -0,0 +1,57 @@
+package cz.vsb.fei.file;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Stream;
+
+import cz.vsb.fei.java2.lab02.common.Score;
+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+
+public class FileStorage implements ScoreStorageInterface {
+
+ private static final String SCORE_FILE_NAME = "scores.csv";
+
+ @Override
+ public List<Score> getAll() {
+ if (Files.exists(Paths.get(SCORE_FILE_NAME))) {
+ try (Stream<String> lines = Files.lines(Paths.get(SCORE_FILE_NAME))) {
+ List<Score> result = lines.map(line -> line.split(";"))
+ .map(parts -> new Score(parts[0], Integer.parseInt(parts[1]))).toList();
+ return new ArrayList<>(result);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public List<Score> getFirstTen() {
+ List<Score> all = getAll();
+ Collections.sort(all, Comparator.comparing(Score::getPoints).reversed());
+ return all.subList(0, 10);
+ }
+
+ @Override
+ public void init() {
+ /* noting to do */
+ }
+
+ @Override
+ public void insertScore(Score score) {
+ List<Score> all = getAll();
+ all.add(score);
+ List<String> lines = all.stream().map(s -> String.format("%s;%d", s.getName(), s.getPoints())).toList();
+ try {
+ Files.write(Paths.get(SCORE_FILE_NAME), lines, StandardOpenOption.CREATE);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/java2-lab02-file-v3/src/main/java/module-info.java b/java2-lab02-file-v3/src/main/java/module-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..cff2f09f3af4cba1cb0d9b11015f44f32c3a0f8a
--- /dev/null
+++ b/java2-lab02-file-v3/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+
+module cz.vsb.fei.file_module {
+ requires static lombok;
+ requires org.apache.logging.log4j;
+ requires transitive cz.vsb.fei.java2.lab02.common_module;
+ exports cz.vsb.fei.file;
+ provides ScoreStorageInterface with cz.vsb.fei.file.FileStorage;
+}
\ No newline at end of file
diff --git a/java2-lab02-v3/.gitignore b/java2-lab02-v3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d
--- /dev/null
+++ b/java2-lab02-v3/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/java2-lab02-v3/pom.xml b/java2-lab02-v3/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b82a9f7eb766124f79573176231631fb0205742f
--- /dev/null
+++ b/java2-lab02-v3/pom.xml
@@ -0,0 +1,171 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-v3</artifactId>
+ <version>0.0.1-SNAPHOST</version>
+ <packaging>jar</packaging>
+ <name>java2-lab02-v3</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>21</maven.compiler.source>
+ <maven.compiler.target>21</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-common-v3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-db-v3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cz.vsb.fei.java2</groupId>
+ <artifactId>java2-lab02-file-v3</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-controls</artifactId>
+ <version>23</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-fxml</artifactId>
+ <version>23</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-media</artifactId>
+ <version>23</version>
+ </dependency>
+ <dependency>
+ <groupId>org.controlsfx</groupId>
+ <artifactId>controlsfx</artifactId>
+ <version>11.2.1</version>
+ </dependency>
+ <!--
+ https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.11.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.11.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>5.11.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.10.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.8.1</version>
+ <executions>
+ <!-- Setup that goal copy-dependencies should be
+ automatically executed during phase package-->
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <!--Specify where should be dependencies (libraries) copied-->
+ <outputDirectory>${project.build.directory}/libs</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.4.2</version>
+ <configuration>
+ <archive>
+ <!--Automatically create and add file MANIFEST.MF into jar and set specified properties-->
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>libs/</classpathPrefix>
+ <mainClass>lab.gui.App</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- Ignore/Execute plugin execution in Eclipse (error of m2e
+ eclipse plugin) -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <!-- copy-dependency plugin -->
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
diff --git a/java2-lab02-v3/scores.csv b/java2-lab02-v3/scores.csv
new file mode 100644
index 0000000000000000000000000000000000000000..290f751b941bbe7cff9b60143e3e6fa74def2d94
--- /dev/null
+++ b/java2-lab02-v3/scores.csv
@@ -0,0 +1,3 @@
+RobotRanger;280
+PixelPioneer;82
+DigitalDynamo;58
diff --git a/java2-lab02-v3/src/main/java/lab/ScoreStorageFactory.java b/java2-lab02-v3/src/main/java/lab/ScoreStorageFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..b613d07f62f9d822b12b7f943d596e6e0adfee2f
--- /dev/null
+++ b/java2-lab02-v3/src/main/java/lab/ScoreStorageFactory.java
@@ -0,0 +1,39 @@
+package lab;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.ServiceLoader;
+
+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import javafx.stage.Modality;
+import javafx.scene.control.Alert.AlertType;
+
+public class ScoreStorageFactory {
+
+ private static ScoreStorageInterface instance;
+
+ private ScoreStorageFactory() {
+ /* hide public one constructor */
+ }
+
+ public static ScoreStorageInterface getInstance() {
+ if (instance == null) {
+ List<ScoreStorageInterface> availableImplementations = new ArrayList<>();
+ ServiceLoader.load(ScoreStorageInterface.class).forEach(availableImplementations::add);
+ if (availableImplementations.isEmpty()) {
+ throw new NoSuchElementException(
+ "Service loader did not find any implementation of interface ScoreStorageInterface.");
+ }
+ instance = availableImplementations.get(new Random().nextInt(availableImplementations.size()));
+ Alert info = new Alert(AlertType.INFORMATION,
+ String.format("Storage %s selected.", instance.getClass().getName()), ButtonType.OK);
+ info.initModality(Modality.WINDOW_MODAL);
+ info.showAndWait();
+ }
+ return instance;
+ }
+}
diff --git a/src/main/java/lab/Background.java b/java2-lab02-v3/src/main/java/lab/game/Background.java
similarity index 99%
rename from src/main/java/lab/Background.java
rename to java2-lab02-v3/src/main/java/lab/game/Background.java
index 295f423892a1462e6abe8dc98b1df072c772b1b5..56db1d7547e0505a7677e620cbed97a2260bb369 100644
--- a/src/main/java/lab/Background.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Background.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import javafx.geometry.Point2D;
import javafx.scene.canvas.GraphicsContext;
diff --git a/src/main/java/lab/Boat.java b/java2-lab02-v3/src/main/java/lab/game/Boat.java
similarity index 98%
rename from src/main/java/lab/Boat.java
rename to java2-lab02-v3/src/main/java/lab/game/Boat.java
index b39b8345905b50ee5e7bb8bdbedfdf2de4539389..a5e088df33c379f2f2ae19109b27f6781f08c126 100644
--- a/src/main/java/lab/Boat.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Boat.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import java.util.Random;
diff --git a/src/main/java/lab/Collisionable.java b/java2-lab02-v3/src/main/java/lab/game/Collisionable.java
similarity index 91%
rename from src/main/java/lab/Collisionable.java
rename to java2-lab02-v3/src/main/java/lab/game/Collisionable.java
index 40a81570906acfe0a433fcda9f2bd47757b7cdf6..cf0bcdf8d4599ae18a428362a81c16c429fc1b8b 100644
--- a/src/main/java/lab/Collisionable.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Collisionable.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import javafx.geometry.Rectangle2D;
diff --git a/src/main/java/lab/DeadListener.java b/java2-lab02-v3/src/main/java/lab/game/DeadListener.java
similarity index 76%
rename from src/main/java/lab/DeadListener.java
rename to java2-lab02-v3/src/main/java/lab/game/DeadListener.java
index e1e00b14dbe490cce23e337750f5fdb80cc0a9ef..b6c163f020677dbc50e3b203027bbed33382a7e5 100644
--- a/src/main/java/lab/DeadListener.java
+++ b/java2-lab02-v3/src/main/java/lab/game/DeadListener.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
public interface DeadListener {
void lochnessDead();
diff --git a/src/main/java/lab/Difficult.java b/java2-lab02-v3/src/main/java/lab/game/Difficult.java
similarity index 93%
rename from src/main/java/lab/Difficult.java
rename to java2-lab02-v3/src/main/java/lab/game/Difficult.java
index 6186f2776225b25fed0029b5a39512e3ea6d8149..df2ee98f588b87503563f8da79cb2f6a1062ef79 100644
--- a/src/main/java/lab/Difficult.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Difficult.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
public enum Difficult {
EASY(2), MEDIUM(5), HARD(10);
diff --git a/src/main/java/lab/DrawableSimulable.java b/java2-lab02-v3/src/main/java/lab/game/DrawableSimulable.java
similarity index 90%
rename from src/main/java/lab/DrawableSimulable.java
rename to java2-lab02-v3/src/main/java/lab/game/DrawableSimulable.java
index 7f8c22a749382ab2fb696abf6f596655d16a75bd..3ad8e6023c919764661f13cdcc02bae77e16cf1a 100644
--- a/src/main/java/lab/DrawableSimulable.java
+++ b/java2-lab02-v3/src/main/java/lab/game/DrawableSimulable.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import javafx.scene.canvas.GraphicsContext;
diff --git a/src/main/java/lab/DrawingThread.java b/java2-lab02-v3/src/main/java/lab/game/DrawingThread.java
similarity index 98%
rename from src/main/java/lab/DrawingThread.java
rename to java2-lab02-v3/src/main/java/lab/game/DrawingThread.java
index cf32ffe0d802a87a7cfe90f2cf5be072b5b42d59..bad9febb40479a0c7a65e4e9d2c92e119faff185 100644
--- a/src/main/java/lab/DrawingThread.java
+++ b/java2-lab02-v3/src/main/java/lab/game/DrawingThread.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import javafx.animation.AnimationTimer;
import javafx.scene.canvas.Canvas;
diff --git a/src/main/java/lab/LochNess.java b/java2-lab02-v3/src/main/java/lab/game/LochNess.java
similarity index 99%
rename from src/main/java/lab/LochNess.java
rename to java2-lab02-v3/src/main/java/lab/game/LochNess.java
index ccf4850e1ad3d2778a8dc340cf30517fce87aea3..19769fb474e268e2e6f00839c30a8f65553855bb 100644
--- a/src/main/java/lab/LochNess.java
+++ b/java2-lab02-v3/src/main/java/lab/game/LochNess.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/lab/Rock.java b/java2-lab02-v3/src/main/java/lab/game/Rock.java
similarity index 98%
rename from src/main/java/lab/Rock.java
rename to java2-lab02-v3/src/main/java/lab/game/Rock.java
index 199878543970a8186f2a00d4a086de3b2e29d56c..a1e755a0d29c4c2940391dd6778e343cc10eb5c5 100644
--- a/src/main/java/lab/Rock.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Rock.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import java.util.Random;
diff --git a/src/main/java/lab/Routines.java b/java2-lab02-v3/src/main/java/lab/game/Routines.java
similarity index 94%
rename from src/main/java/lab/Routines.java
rename to java2-lab02-v3/src/main/java/lab/game/Routines.java
index 89fcce7f1e20229e95fbdc50c69e2b0bb695f060..47e508c666c9eee42ab601836b4706e8ff9b83e9 100644
--- a/src/main/java/lab/Routines.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Routines.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
public class Routines {
diff --git a/src/main/java/lab/Scene.java b/java2-lab02-v3/src/main/java/lab/game/Scene.java
similarity index 99%
rename from src/main/java/lab/Scene.java
rename to java2-lab02-v3/src/main/java/lab/game/Scene.java
index 96eefa98abfa2123a0fe1e33597b7230d18d046c..c81a7960c1cdd0ae57f12f891f43eddbdafa6b9c 100644
--- a/src/main/java/lab/Scene.java
+++ b/java2-lab02-v3/src/main/java/lab/game/Scene.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/src/main/java/lab/WorldEntity.java b/java2-lab02-v3/src/main/java/lab/game/WorldEntity.java
similarity index 97%
rename from src/main/java/lab/WorldEntity.java
rename to java2-lab02-v3/src/main/java/lab/game/WorldEntity.java
index 926a7daefe7ba61e6501796734bf6e82052e2678..d1fdcfe20d35a48f82b14820733a4e547e26deb4 100644
--- a/src/main/java/lab/WorldEntity.java
+++ b/java2-lab02-v3/src/main/java/lab/game/WorldEntity.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.game;
import javafx.geometry.Point2D;
import javafx.scene.canvas.GraphicsContext;
diff --git a/src/main/java/lab/App.java b/java2-lab02-v3/src/main/java/lab/gui/App.java
similarity index 96%
rename from src/main/java/lab/App.java
rename to java2-lab02-v3/src/main/java/lab/gui/App.java
index d9b260928b49e77c2ae47234b841b5ffbcad7609..fe54e7bfeb7cc1fb7d21f0292bf25e6934ffcb2b 100644
--- a/src/main/java/lab/App.java
+++ b/java2-lab02-v3/src/main/java/lab/gui/App.java
@@ -1,4 +1,4 @@
-package lab;
+package lab.gui;
import java.io.IOException;
import java.net.URL;
@@ -42,7 +42,7 @@ public class App extends Application {
public void switchToGame(String name, int numberOfMonsters) throws IOException {
// Construct a main window with a canvas.
- FXMLLoader gameLoader = new FXMLLoader(getClass().getResource("/lab/gameWindow.fxml"));
+ FXMLLoader gameLoader = new FXMLLoader(getClass().getResource("/lab/gui/gameWindow.fxml"));
Parent root = gameLoader.load();
gameController = gameLoader.getController();
Scene scene = new Scene(root);
@@ -53,7 +53,7 @@ public class App extends Application {
}
private void switchToMenu() throws IOException {
// Construct a main window with a canvas.
- FXMLLoader menuLoader = new FXMLLoader(getClass().getResource("/lab/mainScreen.fxml"));
+ FXMLLoader menuLoader = new FXMLLoader(getClass().getResource("/lab/gui/mainScreen.fxml"));
Parent root = menuLoader.load();
MainScreenController menuController = menuLoader.getController();
menuController.setApp(this);
diff --git a/src/main/java/lab/GameController.java b/java2-lab02-v3/src/main/java/lab/gui/GameController.java
similarity index 94%
rename from src/main/java/lab/GameController.java
rename to java2-lab02-v3/src/main/java/lab/gui/GameController.java
index 7e5b0b9fc514dab18015fd89f7771f77b7abf52c..0669518585ea522d3f6e3e2812318cdce4ed8138 100644
--- a/src/main/java/lab/GameController.java
+++ b/java2-lab02-v3/src/main/java/lab/gui/GameController.java
@@ -1,7 +1,8 @@
-package lab;
+package lab.gui;
import java.util.List;
+import cz.vsb.fei.java2.lab02.common.Score;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.event.ActionEvent;
@@ -12,6 +13,10 @@ import javafx.scene.control.Label;
import javafx.scene.control.Slider;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
+import lab.ScoreStorageFactory;
+import lab.game.DrawingThread;
+import lab.game.LochNess;
+import lab.game.Scene;
public class GameController {
diff --git a/src/main/java/lab/MainScreenController.java b/java2-lab02-v3/src/main/java/lab/gui/MainScreenController.java
similarity index 95%
rename from src/main/java/lab/MainScreenController.java
rename to java2-lab02-v3/src/main/java/lab/gui/MainScreenController.java
index 56d87154f200b48229f3e3fdd048c667754f3e9f..277f4ad1f53dfb173c09d1741276b636a20f9b50 100644
--- a/src/main/java/lab/MainScreenController.java
+++ b/java2-lab02-v3/src/main/java/lab/gui/MainScreenController.java
@@ -1,8 +1,9 @@
-package lab;
+package lab.gui;
import java.io.IOException;
import java.util.List;
+import cz.vsb.fei.java2.lab02.common.Score;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
@@ -12,6 +13,8 @@ import javafx.scene.control.TextField;
import javafx.scene.control.ToggleButton;
import javafx.scene.control.ToggleGroup;
import javafx.scene.control.cell.PropertyValueFactory;
+import lab.ScoreStorageFactory;
+import lab.game.Difficult;
/**
*
@@ -100,7 +103,6 @@ public class MainScreenController {
}
private void initDB() {
- // Stream.generate(Score::generate).limit(10).toList();
ScoreStorageFactory.getInstance().init();
scores.getItems().addAll(ScoreStorageFactory.getInstance().getAll());
}
diff --git a/java2-lab02-v3/src/main/java/module-info.java b/java2-lab02-v3/src/main/java/module-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c2c40525b44b240aa4d87336ce170c826b6f226
--- /dev/null
+++ b/java2-lab02-v3/src/main/java/module-info.java
@@ -0,0 +1,11 @@
+import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
+
+module lab01 {
+ requires transitive javafx.controls;
+ requires javafx.fxml;
+ requires javafx.base;
+ requires cz.vsb.fei.java2.lab02.common_module;
+ opens lab.gui to javafx.fxml;
+ exports lab.gui to javafx.fxml,javafx.graphics;
+ uses ScoreStorageInterface;
+}
\ No newline at end of file
diff --git a/src/main/resources/lab/LochNess.gif b/java2-lab02-v3/src/main/resources/lab/game/LochNess.gif
similarity index 100%
rename from src/main/resources/lab/LochNess.gif
rename to java2-lab02-v3/src/main/resources/lab/game/LochNess.gif
diff --git a/src/main/resources/lab/cityclose400.png b/java2-lab02-v3/src/main/resources/lab/game/cityclose400.png
similarity index 100%
rename from src/main/resources/lab/cityclose400.png
rename to java2-lab02-v3/src/main/resources/lab/game/cityclose400.png
diff --git a/src/main/resources/lab/cityfar400.png b/java2-lab02-v3/src/main/resources/lab/game/cityfar400.png
similarity index 100%
rename from src/main/resources/lab/cityfar400.png
rename to java2-lab02-v3/src/main/resources/lab/game/cityfar400.png
diff --git a/src/main/resources/lab/citymid400.png b/java2-lab02-v3/src/main/resources/lab/game/citymid400.png
similarity index 100%
rename from src/main/resources/lab/citymid400.png
rename to java2-lab02-v3/src/main/resources/lab/game/citymid400.png
diff --git a/src/main/resources/lab/cityreflection400.png b/java2-lab02-v3/src/main/resources/lab/game/cityreflection400.png
similarity index 100%
rename from src/main/resources/lab/cityreflection400.png
rename to java2-lab02-v3/src/main/resources/lab/game/cityreflection400.png
diff --git a/src/main/resources/lab/ship-boat.gif b/java2-lab02-v3/src/main/resources/lab/game/ship-boat.gif
similarity index 100%
rename from src/main/resources/lab/ship-boat.gif
rename to java2-lab02-v3/src/main/resources/lab/game/ship-boat.gif
diff --git a/src/main/resources/lab/application.css b/java2-lab02-v3/src/main/resources/lab/gui/application.css
similarity index 100%
rename from src/main/resources/lab/application.css
rename to java2-lab02-v3/src/main/resources/lab/gui/application.css
diff --git a/src/main/resources/lab/gameWindow.fxml b/java2-lab02-v3/src/main/resources/lab/gui/gameWindow.fxml
similarity index 97%
rename from src/main/resources/lab/gameWindow.fxml
rename to java2-lab02-v3/src/main/resources/lab/gui/gameWindow.fxml
index bda0678d5628ac2f9529507c95718b8d0f2dc513..726893537e6ee445bac73b8fb086c9aaf82bc738 100644
--- a/src/main/resources/lab/gameWindow.fxml
+++ b/java2-lab02-v3/src/main/resources/lab/gui/gameWindow.fxml
@@ -10,7 +10,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.text.Font?>
-<BorderPane fx:id="gamePanel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="491.0" prefWidth="824.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="lab.GameController">
+<BorderPane fx:id="gamePanel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="491.0" prefWidth="824.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="lab.gui.GameController">
<bottom>
<HBox alignment="TOP_CENTER" prefHeight="66.0" prefWidth="824.0" BorderPane.alignment="CENTER">
<children>
diff --git a/src/main/resources/lab/lochness-background.jpg b/java2-lab02-v3/src/main/resources/lab/gui/lochness-background.jpg
similarity index 100%
rename from src/main/resources/lab/lochness-background.jpg
rename to java2-lab02-v3/src/main/resources/lab/gui/lochness-background.jpg
diff --git a/src/main/resources/lab/mainScreen.fxml b/java2-lab02-v3/src/main/resources/lab/gui/mainScreen.fxml
similarity index 98%
rename from src/main/resources/lab/mainScreen.fxml
rename to java2-lab02-v3/src/main/resources/lab/gui/mainScreen.fxml
index 63e59ab2a2cea51bc8a1ee7c547c3b765500d751..23b69f83632a03fd4a90dd35c089fc443e28c26a 100644
--- a/src/main/resources/lab/mainScreen.fxml
+++ b/java2-lab02-v3/src/main/resources/lab/gui/mainScreen.fxml
@@ -13,7 +13,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<BorderPane fx:id="menuPanel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="519.0" prefWidth="830.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="lab.MainScreenController">
+<BorderPane fx:id="menuPanel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="519.0" prefWidth="830.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="lab.gui.MainScreenController">
<top>
<HBox prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
diff --git a/src/test/java/jez04/structure/test/ClassStructureTest.java b/java2-lab02-v3/src/test/java/jez04/structure/test/ClassStructureTest.java
similarity index 100%
rename from src/test/java/jez04/structure/test/ClassStructureTest.java
rename to java2-lab02-v3/src/test/java/jez04/structure/test/ClassStructureTest.java
diff --git a/src/test/java/jez04/structure/test/StructureHelper.java b/java2-lab02-v3/src/test/java/jez04/structure/test/StructureHelper.java
similarity index 100%
rename from src/test/java/jez04/structure/test/StructureHelper.java
rename to java2-lab02-v3/src/test/java/jez04/structure/test/StructureHelper.java
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 53176fe98a76b0a14c970153c59045ffb8f913f1..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>cz.vsb.fei.java2</groupId>
- <artifactId>java2-lab02-v3</artifactId>
- <version>0.0.1-SNAPHOST</version>
- <packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>21</maven.compiler.source>
- <maven.compiler.target>21</maven.compiler.target>
- </properties>
- <dependencies>
- <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>2.3.232</version>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-controls</artifactId>
- <version>23</version>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>23</version>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-media</artifactId>
- <version>23</version>
- </dependency>
- <dependency>
- <groupId>org.controlsfx</groupId>
- <artifactId>controlsfx</artifactId>
- <version>11.2.1</version>
- </dependency>
- <!--
- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.11.0</version>
- <scope>test</scope>
- </dependency>
- <!--
- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>5.11.0</version>
- <scope>test</scope>
- </dependency>
- <!--
- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>5.11.0</version>
- <scope>test</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.10.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/src/main/java/lab/ScoreStorageFactory.java b/src/main/java/lab/ScoreStorageFactory.java
deleted file mode 100644
index 3346de6eb41a256e171e1a9bfb3d6af18ad1b464..0000000000000000000000000000000000000000
--- a/src/main/java/lab/ScoreStorageFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package lab;
-
-public class ScoreStorageFactory {
-
- private static DbConnector instance;
-
- public static DbConnector getInstance() {
- if(instance == null) {
- instance = new DbConnector();
- }
- return instance;
- }
-}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
deleted file mode 100644
index 51b9b1c06e53e56d996d38195f8a878b7315b6db..0000000000000000000000000000000000000000
--- a/src/main/java/module-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-module lab01 {
- requires transitive javafx.controls;
- requires javafx.fxml;
- requires javafx.base;
- requires java.sql;
- opens lab to javafx.fxml;
- exports lab;
-}
\ No newline at end of file