From 48a27aa36bd8f26d6e835f7deca44afd2e851b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hallvard=20Tr=C3=A6tteberg?= <hal@ntnu.no> Date: Mon, 5 Oct 2020 13:45:15 +0000 Subject: [PATCH] Some fixes --- .../java/todolist/ui/TodoModelStorage.java | 6 +++++ .../main/resources/todolist/ui/TodoApp.fxml | 2 -- .../todolist/ui/TodoDocumentApp.fxml | 2 -- .../main/resources/todolist/ui/TodoList.fxml | 4 +-- .../main/resources/todolist/ui/TodoModel.fxml | 7 ----- .../resources/todolist/ui/test-todomodel.json | 27 ++++++++----------- .../fxutil/doc/AbstractDocumentStorage.java | 8 +++--- 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java b/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java index 73fac71..4c98718 100644 --- a/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java +++ b/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java @@ -3,6 +3,7 @@ package todolist.ui; import fxutil.doc.AbstractDocumentStorage; import java.io.File; import java.io.FileWriter; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; @@ -33,4 +34,9 @@ public class TodoModelStorage extends AbstractDocumentStorage<TodoModel, File> { todoPersistence.writeTodoModel(todoModel, writer); } } + + @Override + protected InputStream toInputStream(final File location) throws IOException { + return toFileInputStream((File) location); + } } diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml index ee9e796..94e4e55 100644 --- a/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml +++ b/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml @@ -3,8 +3,6 @@ <?import java.lang.String?> <?import javafx.scene.layout.VBox?> -<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?> - <VBox xmlns:fx="http://javafx.com/fxml/1" fx:controller="todolist.ui.TodoAppController"> <fx:define> <String fx:id="userTodoModelPath" fx:value="todomodel.json"/> diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml index 614c1fd..8c81f6c 100644 --- a/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml +++ b/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml @@ -4,8 +4,6 @@ <?import javafx.scene.layout.BorderPane?> <?import javafx.scene.control.MenuBar?> -<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?> - <BorderPane xmlns:fx="http://javafx.com/fxml/1" fx:controller="todolist.ui.TodoDocumentAppController"> <fx:define> <String fx:id="userAppConfigPath" fx:value="todo-config.toml"/> diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml index 483bb84..9250b43 100644 --- a/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml +++ b/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml @@ -18,10 +18,10 @@ <FontAwesomeIconView glyphName="PLUS" size="18px" glyphStyle="-fx-fill: green" /> </graphic> <tooltip> - <Tooltip text="New Item"/> + <Tooltip text="New item"/> </tooltip> </Button> - <TextField fx:id="newTodoItemText" promptText="Skriv inn tekst her" onAction="#handleNewTodoItemAction"/> + <TextField fx:id="newTodoItemText" promptText="Skriv inn tekst for nytt element" onAction="#handleNewTodoItemAction"/> </HBox> <ListView fx:id="todoItemsView"> </ListView> diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml index 5e5d5f9..cd4a3fb 100644 --- a/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml +++ b/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml @@ -1,15 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import java.lang.String?> <?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.VBox?> <?import javafx.scene.control.ComboBox?> -<?import javafx.scene.control.Button?> -<?import javafx.scene.control.Tooltip?> -<?import javafx.scene.control.TextField?> -<?import javafx.scene.control.ListView?> - -<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?> <VBox xmlns:fx="http://javafx.com/fxml/1" fx:controller="todolist.ui.TodoModelController"> <HBox> diff --git a/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json b/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json index b30d9b3..d9977e3 100644 --- a/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json +++ b/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json @@ -1,18 +1,13 @@ { - "lists": [ - { - "name": "todo", - "deadline": "2020-10-01T14:53:11", - "items": [ - { - "text": "Item 1", - "checked": true - }, - { - "text": "Item 2", - "checked": false - } - ] - } - ] + "lists" : [ { + "name" : "todo", + "deadline" : "2020-10-01T14:53:11", + "items" : [ { + "text" : "Item 1", + "checked" : true + }, { + "text" : "Item 2", + "checked" : false + } ] + } ] } \ No newline at end of file diff --git a/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java b/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java index 06fded2..fe6eab3 100644 --- a/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java +++ b/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java @@ -116,16 +116,16 @@ public abstract class AbstractDocumentStorage<D, L> implements DocumentStorage<L */ protected abstract InputStream toInputStream(L location) throws IOException; - protected InputStream toInputStream(final File location) throws IOException { + protected InputStream toFileInputStream(final File location) throws IOException { return new FileInputStream(location); } - protected InputStream toInputStream(final URL location) throws IOException { + protected InputStream toUrlInputStream(final URL location) throws IOException { return location.openStream(); } - protected InputStream toInputStream(final URI location) throws IOException { - return toInputStream(location.toURL()); + protected InputStream toUrlInputStream(final URI location) throws IOException { + return toUrlInputStream(location.toURL()); } @Override -- GitLab