From 5d636bac030ae94ca8b7862f5e01123f43fefc71 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Sun, 8 Apr 2018 23:20:59 +0400 Subject: [PATCH 1/3] move javafx code to a separate module --- javafx/pom.xml | 15 +++++++++++++++ .../src/main/java/com/baeldung}/Main.java | 2 +- .../src/main/java/com/baeldung}/model/Person.java | 2 +- .../java/com/baeldung}/view/SearchController.java | 5 ++--- .../src/main/resources/SearchController.fxml | 2 +- .../src/main/resources/search.css | 0 pom.xml | 1 + 7 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 javafx/pom.xml rename {core-java/src/main/java/com/baeldung/javafx => javafx/src/main/java/com/baeldung}/Main.java (96%) rename {core-java/src/main/java/com/baeldung/javafx => javafx/src/main/java/com/baeldung}/model/Person.java (97%) rename {core-java/src/main/java/com/baeldung/javafx => javafx/src/main/java/com/baeldung}/view/SearchController.java (96%) rename {core-java => javafx}/src/main/resources/SearchController.fxml (94%) rename {core-java => javafx}/src/main/resources/search.css (100%) diff --git a/javafx/pom.xml b/javafx/pom.xml new file mode 100644 index 0000000000..bcad64aca5 --- /dev/null +++ b/javafx/pom.xml @@ -0,0 +1,15 @@ + + + + parent-modules + com.baeldung + 1.0.0-SNAPSHOT + + 4.0.0 + + javafx + + + \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/javafx/Main.java b/javafx/src/main/java/com/baeldung/Main.java similarity index 96% rename from core-java/src/main/java/com/baeldung/javafx/Main.java rename to javafx/src/main/java/com/baeldung/Main.java index f68121b394..59e24209b5 100644 --- a/core-java/src/main/java/com/baeldung/javafx/Main.java +++ b/javafx/src/main/java/com/baeldung/Main.java @@ -1,4 +1,4 @@ -package com.baeldung.javafx; +package com.baeldung; import javafx.application.Application; import javafx.fxml.FXMLLoader; diff --git a/core-java/src/main/java/com/baeldung/javafx/model/Person.java b/javafx/src/main/java/com/baeldung/model/Person.java similarity index 97% rename from core-java/src/main/java/com/baeldung/javafx/model/Person.java rename to javafx/src/main/java/com/baeldung/model/Person.java index dd473e84b4..0b915832ce 100644 --- a/core-java/src/main/java/com/baeldung/javafx/model/Person.java +++ b/javafx/src/main/java/com/baeldung/model/Person.java @@ -1,4 +1,4 @@ -package com.baeldung.javafx.model; +package com.baeldung.model; import javafx.beans.property.*; diff --git a/core-java/src/main/java/com/baeldung/javafx/view/SearchController.java b/javafx/src/main/java/com/baeldung/view/SearchController.java similarity index 96% rename from core-java/src/main/java/com/baeldung/javafx/view/SearchController.java rename to javafx/src/main/java/com/baeldung/view/SearchController.java index f506981714..430580f8b5 100644 --- a/core-java/src/main/java/com/baeldung/javafx/view/SearchController.java +++ b/javafx/src/main/java/com/baeldung/view/SearchController.java @@ -1,7 +1,7 @@ -package com.baeldung.javafx.view; +package com.baeldung.view; -import com.baeldung.javafx.model.Person; +import com.baeldung.model.Person; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.concurrent.Task; @@ -11,7 +11,6 @@ import javafx.scene.control.*; import javafx.scene.input.KeyCode; import javafx.scene.layout.VBox; -import java.util.List; import java.util.stream.Collectors; public class SearchController { diff --git a/core-java/src/main/resources/SearchController.fxml b/javafx/src/main/resources/SearchController.fxml similarity index 94% rename from core-java/src/main/resources/SearchController.fxml rename to javafx/src/main/resources/SearchController.fxml index a894b0260b..5e83024d03 100644 --- a/core-java/src/main/resources/SearchController.fxml +++ b/javafx/src/main/resources/SearchController.fxml @@ -7,7 +7,7 @@ diff --git a/core-java/src/main/resources/search.css b/javafx/src/main/resources/search.css similarity index 100% rename from core-java/src/main/resources/search.css rename to javafx/src/main/resources/search.css diff --git a/pom.xml b/pom.xml index 49643b8324..35de3b3898 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,7 @@ javax-servlets javaxval jaxb + javafx jgroups jee-7 From 80c2c8c8838c74819d0ea3cfe565f887d11d4d5c Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Sun, 8 Apr 2018 23:54:17 +0400 Subject: [PATCH 2/3] move javafx code to a separate module --- javafx/.gitignore | 6 ++++++ javafx/README.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 javafx/.gitignore create mode 100644 javafx/README.md diff --git a/javafx/.gitignore b/javafx/.gitignore new file mode 100644 index 0000000000..dfbd063287 --- /dev/null +++ b/javafx/.gitignore @@ -0,0 +1,6 @@ +# Created by .ignore support plugin (hsz.mobi) +.idea +classes +target +*.iml +out \ No newline at end of file diff --git a/javafx/README.md b/javafx/README.md new file mode 100644 index 0000000000..50a07f9dbf --- /dev/null +++ b/javafx/README.md @@ -0,0 +1,2 @@ +### Relevant Articles: +- From 560421c5b2053be32797de676ae3de5622547c21 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Mon, 9 Apr 2018 12:59:17 +0300 Subject: [PATCH 3/3] Update README.md --- javafx/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/javafx/README.md b/javafx/README.md index 50a07f9dbf..483c556ca7 100644 --- a/javafx/README.md +++ b/javafx/README.md @@ -1,2 +1,3 @@ ### Relevant Articles: - +