diff --git a/build.gradle b/build.gradle index 23a8be830bdd28954692ee01e78bcc16f635a9d6..2cd018bdff9daf25fcefd3520a3706f1b4a6c778 100644 --- a/build.gradle +++ b/build.gradle @@ -36,23 +36,23 @@ repositories { } dependencies { - compile "com.github.penemue:keap:0.3.0" + - compile 'org.kordamp.ikonli:ikonli-javafx:11.1.0' - compile 'org.kordamp.ikonli:ikonli-fontawesome5-pack:11.1.0' - compile 'org.kordamp.ikonli:ikonli-material-pack:11.1.0' - compile 'org.codehaus.griffon:griffon-javafx:2.15.1' - compile 'org.controlsfx:controlsfx:11.0.0-RC2' + implementation 'org.kordamp.ikonli:ikonli-javafx:11.1.0' + implementation 'org.kordamp.ikonli:ikonli-fontawesome5-pack:11.1.0' + implementation 'org.kordamp.ikonli:ikonli-material-pack:11.1.0' + implementation 'org.codehaus.griffon:griffon-javafx:2.15.1' + implementation 'org.controlsfx:controlsfx:11.0.0-RC2' - testCompile "org.junit.jupiter:junit-jupiter-api:5.4.0" - testRuntime "org.junit.jupiter:junit-jupiter-engine:5.4.0" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.0" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.0" - testCompile "org.testfx:testfx-junit5:4.0.15-alpha" - testRuntime "org.testfx:openjfx-monocle:jdk-11+26" + testImplementation "org.testfx:testfx-junit5:4.0.15-alpha" + testRuntimeOnly "org.testfx:openjfx-monocle:jdk-11+26" } task(runCLI, dependsOn: 'classes', type: JavaExec) { - main = 'app.appmeteo.AppMeteoCLI' + main = 'app.foodapp.FoodAppCLI' classpath = sourceSets.main.runtimeClasspath standardInput = System.in args "list" @@ -60,7 +60,7 @@ task(runCLI, dependsOn: 'classes', type: JavaExec) { } application { - mainClassName = 'app.appmeteo.AppMeteo' + mainClassName = 'app.foodapp.FoodApp' applicationDefaultJvmArgs = [ '--add-opens=javafx.base/com.sun.javafx.event=ALL-UNNAMED' ] diff --git a/settings.gradle b/settings.gradle index c087ddefaa50b0237a8a009623afed94306d3505..eb66f3ed9d3bcb33f9509f75d6b6daf9f339edb7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'appmeteo' +rootProject.name = 'foodapp' diff --git a/src/main/java/app/appmeteo/AppMeteo.java b/src/main/java/app/foodapp/FoodApp.java similarity index 75% rename from src/main/java/app/appmeteo/AppMeteo.java rename to src/main/java/app/foodapp/FoodApp.java index e5bedec1b85d17d958a56518c99e6189110f561e..f6282f108f88a86293b74dec93d2ec778fb58f0b 100644 --- a/src/main/java/app/appmeteo/AppMeteo.java +++ b/src/main/java/app/foodapp/FoodApp.java @@ -1,4 +1,4 @@ -package app.appmeteo; +package app.foodapp; import javafx.application.Application; import javafx.fxml.FXMLLoader; @@ -7,12 +7,12 @@ import javafx.scene.Scene; import javafx.stage.Stage; -public class AppMeteo extends Application { +public class FoodApp extends Application { @Override public void start(Stage primaryStage) throws Exception { - Parent root = FXMLLoader.load(getClass().getResource("/app/appmeteo/view/appmeteo.fxml")); - primaryStage.setTitle("AppMeteo"); + Parent root = FXMLLoader.load(getClass().getResource("/app/foodapp/view/foodapp.fxml")); + primaryStage.setTitle("FoodApp"); primaryStage.setScene(new Scene(root)); primaryStage.show(); } diff --git a/src/main/java/app/appmeteo/AppMeteoCLI.java b/src/main/java/app/foodapp/FoodAppCLI.java similarity index 90% rename from src/main/java/app/appmeteo/AppMeteoCLI.java rename to src/main/java/app/foodapp/FoodAppCLI.java index 6dac6e2301ffd585838b2a5ee2398dd9a6fcec5a..e9a20307e17cef04c1f3323283a79f0c241b37fc 100644 --- a/src/main/java/app/appmeteo/AppMeteoCLI.java +++ b/src/main/java/app/foodapp/FoodAppCLI.java @@ -1,8 +1,8 @@ -package app.appmeteo; +package app.foodapp; import java.util.Scanner; -public class AppMeteoCLI { +public class FoodAppCLI { public static void main(String[] args) { System.out.println("Welcome to the weather app"); diff --git a/src/main/java/app/appmeteo/controller/AppMeteoController.java b/src/main/java/app/foodapp/controller/FoodAppController.java similarity index 93% rename from src/main/java/app/appmeteo/controller/AppMeteoController.java rename to src/main/java/app/foodapp/controller/FoodAppController.java index 0e52a0d8bf97cae2319a5fd398abf1353c021867..eb96019f19fc12f6ae931b98cd87b4854c100eb2 100644 --- a/src/main/java/app/appmeteo/controller/AppMeteoController.java +++ b/src/main/java/app/foodapp/controller/FoodAppController.java @@ -8,7 +8,7 @@ import javafx.scene.control.Label; import java.net.URL; import java.util.ResourceBundle; -public class AppMeteoController implements Initializable { +public class FoodAppController implements Initializable { @FXML private Button helloWorldButton; @FXML private Button goodByeWorldButton; diff --git a/src/main/java/app/appmeteo/model/Authors.java b/src/main/java/app/foodapp/model/Authors.java similarity index 91% rename from src/main/java/app/appmeteo/model/Authors.java rename to src/main/java/app/foodapp/model/Authors.java index 905cb4159fdc538cc9c78978cbbb4f0f5d235909..40e9f2e2b43c95018042a28d67ccd638a1ce4fc0 100644 --- a/src/main/java/app/appmeteo/model/Authors.java +++ b/src/main/java/app/foodapp/model/Authors.java @@ -1,4 +1,4 @@ -package app.appmeteo.model; +package app.foodapp.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/resources/app/appmeteo/view/appmeteo.fxml b/src/main/resources/app/foodapp/view/foodapp.fxml similarity index 91% rename from src/main/resources/app/appmeteo/view/appmeteo.fxml rename to src/main/resources/app/foodapp/view/foodapp.fxml index 9cffe2354bce9a8bee3b33d68fa0bceb8757a98e..8118e594320ad385cd03ebbc49a5d0a8b0604d13 100644 --- a/src/main/resources/app/appmeteo/view/appmeteo.fxml +++ b/src/main/resources/app/foodapp/view/foodapp.fxml @@ -4,7 +4,7 @@ <?import javafx.scene.control.Label?> <?import javafx.scene.layout.AnchorPane?> -<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.appmeteo.controller.AppMeteoController"> +<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.foodapp.controller.FoodAppController"> <children> <Button fx:id="helloWorldButton" layoutX="45.0" layoutY="87.0" mnemonicParsing="false" onMouseClicked="#displayHelloWorld" text="Hello World" /> <Button fx:id="goodByeWorldButton" layoutX="175.0" layoutY="87.0" mnemonicParsing="false" onMouseClicked="#goodByeWorld" text="Good Bye World" /> diff --git a/src/test/java/app/appmeteo/model/AuthorsTest.java b/src/test/java/app/foodapp/model/AuthorsTest.java similarity index 100% rename from src/test/java/app/appmeteo/model/AuthorsTest.java rename to src/test/java/app/foodapp/model/AuthorsTest.java