From dcc2afc9c28fbfaa7483fe3f536baca55fdc1bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hallvard=20Tr=C3=A6tteberg?= <hal@ntnu.no>
Date: Wed, 5 May 2021 22:31:23 +0000
Subject: [PATCH] Use text blocks and fix checkstyle issues
---
.../java/todolist/json/TodoModuleTest.java | 21 ++++++++++++++++++-
todolist/fxui/pom.xml | 8 +++----
.../java/fxutil/doc/DocumentPersistence.java | 4 ++--
.../java/fxutil/doc/FileMenuController.java | 2 +-
todolist/pom.xml | 2 +-
5 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/todolist/core/src/test/java/todolist/json/TodoModuleTest.java b/todolist/core/src/test/java/todolist/json/TodoModuleTest.java
index cda1436..88248d6 100644
--- a/todolist/core/src/test/java/todolist/json/TodoModuleTest.java
+++ b/todolist/core/src/test/java/todolist/json/TodoModuleTest.java
@@ -27,7 +27,26 @@ public class TodoModuleTest {
mapper.registerModule(new TodoModule());
}
- private final static String todoListWithTwoItems = "{\"lists\":[{\"name\":\"todo\",\"items\":[{\"text\":\"item1\",\"checked\":false},{\"text\":\"item2\",\"checked\":true,\"deadline\":\"2020-10-01T14:53:11\"}]}]}";
+ private final static String todoListWithTwoItems = """
+ {
+ "lists": [
+ {
+ "name": "todo",
+ "items": [
+ {
+ "text": "item1",
+ "checked": false
+ },
+ {
+ "text": "item2",
+ "checked": true,
+ "deadline": "2020-10-01T14:53:11"
+ }
+ ]
+ }
+ ]
+ }
+ """;
@Test
public void testSerializers() {
diff --git a/todolist/fxui/pom.xml b/todolist/fxui/pom.xml
index 0b7d799..70d43d8 100644
--- a/todolist/fxui/pom.xml
+++ b/todolist/fxui/pom.xml
@@ -93,7 +93,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.5</version>
+ <version>0.0.6</version>
<configuration>
<mainClass>de.jensd.fx.glyphs.fontawesome.demo.FontAwesomeIconsDemoApp</mainClass>
</configuration>
@@ -108,7 +108,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.5</version>
+ <version>0.0.6</version>
<configuration>
<mainClass>todolist.ui.TodoDocumentApp</mainClass>
</configuration>
@@ -123,7 +123,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.5</version>
+ <version>0.0.6</version>
<configuration>
<mainClass>todolist.ui.TodoRemoteApp</mainClass>
</configuration>
@@ -177,7 +177,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.5</version>
+ <version>0.0.6</version>
<configuration>
<mainClass>todolist.ui.TodoApp</mainClass>
</configuration>
diff --git a/todolist/fxutil/src/main/java/fxutil/doc/DocumentPersistence.java b/todolist/fxutil/src/main/java/fxutil/doc/DocumentPersistence.java
index 3b879ae..63c80dc 100644
--- a/todolist/fxutil/src/main/java/fxutil/doc/DocumentPersistence.java
+++ b/todolist/fxutil/src/main/java/fxutil/doc/DocumentPersistence.java
@@ -4,8 +4,8 @@ package fxutil.doc;
* Interface for the documents that can be loaded and saved,
* so they can support the operations of a file menu.
*
- * @param <D>
- * @param <L>
+ * @param <D> The type of the document content
+ * @param <L> The type of the location
*/
public interface DocumentPersistence<D, L> extends DocumentLoader<D>, DocumentSaver<D, L> {
}
diff --git a/todolist/fxutil/src/main/java/fxutil/doc/FileMenuController.java b/todolist/fxutil/src/main/java/fxutil/doc/FileMenuController.java
index bbc8aba..d00c1c7 100644
--- a/todolist/fxutil/src/main/java/fxutil/doc/FileMenuController.java
+++ b/todolist/fxutil/src/main/java/fxutil/doc/FileMenuController.java
@@ -24,7 +24,7 @@ import javafx.scene.control.TextInputDialog;
import javafx.stage.FileChooser;
/**
- * Controller for the file menu
+ * Controller for the file menu.
*/
public class FileMenuController {
diff --git a/todolist/pom.xml b/todolist/pom.xml
index 6d85b39..d1cfc40 100644
--- a/todolist/pom.xml
+++ b/todolist/pom.xml
@@ -66,7 +66,7 @@
<version>3.8.1</version>
<configuration>
<encoding>UTF-8</encoding>
- <release>14</release>
+ <release>16</release>
</configuration>
</plugin>
<plugin>
--
GitLab